Attachment 53825 Details for Bug 127765

[patch] Proposed patch to quilt

quilt-0.42-patch-options.diff (text/plain), 1.48 KB, created by Olaf Dabrunz on 2005-10-12 14:08:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Dabrunz

Created: 2005-10-12 14:08:54 UTC

Size: 1.48 KB

patch

obsolete

>--- scripts/inspect.in
>+++ scripts/inspect.in
>@@ -89,6 +89,9 @@
> cat <<-'EOF' > $tmpdir/bin/wrapper
> 	#! @BASH@
> 
>+	# short options that take no arguments for "patch"
>+	s_opts='[bcefElnNrRsvVYZ]'
>+
> 	# search the path for command $1
> 	path_search() {
> 		local cmd=$1 dir
>@@ -143,19 +146,56 @@
> 		return 1
> 	}
> 
>-	# Extract the -p option from the command line
>+	# Extract the -p|--strip= option from the command line
> 	strip_option() {
>-		while [ $# -ne 0 -a "${1:0:2}" != -p ]
>+		local opt_p
>+		while [ $# -ne 0 ]
> 		do
>+			case "${1}" in
>+			-p*|-${s_opts}p*|-${s_opts}${s_opts}p*)
>+				opt_p="-p${1#-*p}"
>+				[ "$opt_p" = -p ] && { opt_p="$1$2"; shift; }
>+				;;
>+			--strip=*)
>+				opt_p="-p${1#--strip=}"
>+				;;
>+			esac
> 			shift
> 		done
>-		if [ "${1:0:2}" = -p ]
>-		then
>-			[ "$1" = -p ] && set -- "$1$2"
>-			[ "$1" != -p1 ] && echo $1
>-		fi
>+		[ "$opt_p" -a "$opt_p" != -p1 ] && echo $opt_p
> 	}
> 
>+	# parse -i|--input|--input= and redirect stdin from that file
>+	case "${0##*/}" in
>+	patch)
>+		OPTS=("$@")
>+		while [ "$1" ]
>+		do
>+			case "$1" in
>+			-i*|-${s_opts}i*|-${s_opts}${s_opts}i*)
>+				opt_i="-i${1#-*i}"
>+				if [ "$opt_i" = -i ] ; then
>+					exec <"$2"
>+					shift
>+				else
>+					exec <"${opt_i#-i}"
>+				fi
>+				unset opt_i
>+				shift ;;
>+			--input=*)
>+				exec <"${1#--input=}"
>+				shift ;;
>+			--input)
>+				exec <"${2}"
>+				shift 2 ;;
>+			*)
>+				shift ;;
>+			esac
>+		done
>+		set -- "${OPTS[@]}"
>+		;;
>+	esac
>+
> 	# put data into tmpfile
> 	tmpdir=${RPM_BUILD_DIR%/*}
> 	cat > $tmpdir/data

Actions: View | Diff

Attachments on bug 127765: 53807 | 53825