mirror of
https://github.com/fish-shell/fish-shell
synced 2024-11-14 08:58:01 +00:00
d83ef07ca7
This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge:11c8a47
7974aab
Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit7974aab6d3
Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commiteb20b43d2d
Merge:1a09e70
5f519cb
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit1a09e709d0
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commita0ec9772cd
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit64c25a01e3
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commitece7f35ec5
Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit9ff7477a92
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitbaf4e096b2
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit896a2c2b27
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commitefd47dcbda
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commited0850e2db
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit9492e7a7e9
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit1a60b93371
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit5f519cb2a2
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit2ecd24f795
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit45b777e4dc
Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit981cbb6ddf
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitddb6a2a8fd
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit1e34e3191b
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit34232e152d
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit00d7e78169
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit4498aa5f57
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit290c58c72e
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
270 lines
5.7 KiB
Bash
Executable file
270 lines
5.7 KiB
Bash
Executable file
#! /bin/sh
|
|
# Wrapper for Microsoft lib.exe
|
|
|
|
me=ar-lib
|
|
scriptversion=2012-03-01.08; # UTC
|
|
|
|
# Copyright (C) 2010-2014 Free Software Foundation, Inc.
|
|
# Written by Peter Rosin <peda@lysator.liu.se>.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2, or (at your option)
|
|
# any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# As a special exception to the GNU General Public License, if you
|
|
# distribute this file as part of a program that contains a
|
|
# configuration script generated by Autoconf, you may include it under
|
|
# the same distribution terms that you use for the rest of that program.
|
|
|
|
# This file is maintained in Automake, please report
|
|
# bugs to <bug-automake@gnu.org> or send patches to
|
|
# <automake-patches@gnu.org>.
|
|
|
|
|
|
# func_error message
|
|
func_error ()
|
|
{
|
|
echo "$me: $1" 1>&2
|
|
exit 1
|
|
}
|
|
|
|
file_conv=
|
|
|
|
# func_file_conv build_file
|
|
# Convert a $build file to $host form and store it in $file
|
|
# Currently only supports Windows hosts.
|
|
func_file_conv ()
|
|
{
|
|
file=$1
|
|
case $file in
|
|
/ | /[!/]*) # absolute file, and not a UNC file
|
|
if test -z "$file_conv"; then
|
|
# lazily determine how to convert abs files
|
|
case `uname -s` in
|
|
MINGW*)
|
|
file_conv=mingw
|
|
;;
|
|
CYGWIN*)
|
|
file_conv=cygwin
|
|
;;
|
|
*)
|
|
file_conv=wine
|
|
;;
|
|
esac
|
|
fi
|
|
case $file_conv in
|
|
mingw)
|
|
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
|
;;
|
|
cygwin)
|
|
file=`cygpath -m "$file" || echo "$file"`
|
|
;;
|
|
wine)
|
|
file=`winepath -w "$file" || echo "$file"`
|
|
;;
|
|
esac
|
|
;;
|
|
esac
|
|
}
|
|
|
|
# func_at_file at_file operation archive
|
|
# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
|
|
# for each of them.
|
|
# When interpreting the content of the @FILE, do NOT use func_file_conv,
|
|
# since the user would need to supply preconverted file names to
|
|
# binutils ar, at least for MinGW.
|
|
func_at_file ()
|
|
{
|
|
operation=$2
|
|
archive=$3
|
|
at_file_contents=`cat "$1"`
|
|
eval set x "$at_file_contents"
|
|
shift
|
|
|
|
for member
|
|
do
|
|
$AR -NOLOGO $operation:"$member" "$archive" || exit $?
|
|
done
|
|
}
|
|
|
|
case $1 in
|
|
'')
|
|
func_error "no command. Try '$0 --help' for more information."
|
|
;;
|
|
-h | --h*)
|
|
cat <<EOF
|
|
Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
|
|
|
|
Members may be specified in a file named with @FILE.
|
|
EOF
|
|
exit $?
|
|
;;
|
|
-v | --v*)
|
|
echo "$me, version $scriptversion"
|
|
exit $?
|
|
;;
|
|
esac
|
|
|
|
if test $# -lt 3; then
|
|
func_error "you must specify a program, an action and an archive"
|
|
fi
|
|
|
|
AR=$1
|
|
shift
|
|
while :
|
|
do
|
|
if test $# -lt 2; then
|
|
func_error "you must specify a program, an action and an archive"
|
|
fi
|
|
case $1 in
|
|
-lib | -LIB \
|
|
| -ltcg | -LTCG \
|
|
| -machine* | -MACHINE* \
|
|
| -subsystem* | -SUBSYSTEM* \
|
|
| -verbose | -VERBOSE \
|
|
| -wx* | -WX* )
|
|
AR="$AR $1"
|
|
shift
|
|
;;
|
|
*)
|
|
action=$1
|
|
shift
|
|
break
|
|
;;
|
|
esac
|
|
done
|
|
orig_archive=$1
|
|
shift
|
|
func_file_conv "$orig_archive"
|
|
archive=$file
|
|
|
|
# strip leading dash in $action
|
|
action=${action#-}
|
|
|
|
delete=
|
|
extract=
|
|
list=
|
|
quick=
|
|
replace=
|
|
index=
|
|
create=
|
|
|
|
while test -n "$action"
|
|
do
|
|
case $action in
|
|
d*) delete=yes ;;
|
|
x*) extract=yes ;;
|
|
t*) list=yes ;;
|
|
q*) quick=yes ;;
|
|
r*) replace=yes ;;
|
|
s*) index=yes ;;
|
|
S*) ;; # the index is always updated implicitly
|
|
c*) create=yes ;;
|
|
u*) ;; # TODO: don't ignore the update modifier
|
|
v*) ;; # TODO: don't ignore the verbose modifier
|
|
*)
|
|
func_error "unknown action specified"
|
|
;;
|
|
esac
|
|
action=${action#?}
|
|
done
|
|
|
|
case $delete$extract$list$quick$replace,$index in
|
|
yes,* | ,yes)
|
|
;;
|
|
yesyes*)
|
|
func_error "more than one action specified"
|
|
;;
|
|
*)
|
|
func_error "no action specified"
|
|
;;
|
|
esac
|
|
|
|
if test -n "$delete"; then
|
|
if test ! -f "$orig_archive"; then
|
|
func_error "archive not found"
|
|
fi
|
|
for member
|
|
do
|
|
case $1 in
|
|
@*)
|
|
func_at_file "${1#@}" -REMOVE "$archive"
|
|
;;
|
|
*)
|
|
func_file_conv "$1"
|
|
$AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
|
|
;;
|
|
esac
|
|
done
|
|
|
|
elif test -n "$extract"; then
|
|
if test ! -f "$orig_archive"; then
|
|
func_error "archive not found"
|
|
fi
|
|
if test $# -gt 0; then
|
|
for member
|
|
do
|
|
case $1 in
|
|
@*)
|
|
func_at_file "${1#@}" -EXTRACT "$archive"
|
|
;;
|
|
*)
|
|
func_file_conv "$1"
|
|
$AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
|
|
;;
|
|
esac
|
|
done
|
|
else
|
|
$AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
|
|
do
|
|
$AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
|
|
done
|
|
fi
|
|
|
|
elif test -n "$quick$replace"; then
|
|
if test ! -f "$orig_archive"; then
|
|
if test -z "$create"; then
|
|
echo "$me: creating $orig_archive"
|
|
fi
|
|
orig_archive=
|
|
else
|
|
orig_archive=$archive
|
|
fi
|
|
|
|
for member
|
|
do
|
|
case $1 in
|
|
@*)
|
|
func_file_conv "${1#@}"
|
|
set x "$@" "@$file"
|
|
;;
|
|
*)
|
|
func_file_conv "$1"
|
|
set x "$@" "$file"
|
|
;;
|
|
esac
|
|
shift
|
|
shift
|
|
done
|
|
|
|
if test -n "$orig_archive"; then
|
|
$AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
|
|
else
|
|
$AR -NOLOGO -OUT:"$archive" "$@" || exit $?
|
|
fi
|
|
|
|
elif test -n "$list"; then
|
|
if test ! -f "$orig_archive"; then
|
|
func_error "archive not found"
|
|
fi
|
|
$AR -NOLOGO -LIST "$archive" || exit $?
|
|
fi
|