Attachment 53807 Details for Bug 127765

[patch] Proposed patch to the quilt package that implements recognition of patch options -i, --input= and --strip=

quilt-0.42-patch-options.diff (text/plain), 1.09 KB, created by Olaf Dabrunz on 2005-10-12 09:34:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Dabrunz

Created: 2005-10-12 09:34:46 UTC

Size: 1.09 KB

patch

obsolete

>--- scripts/inspect.in
>+++ scripts/inspect.in
>@@ -143,19 +143,52 @@
> 		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 p
>+		while [ $# -ne 0 ]
> 		do
>+			case "${1}" in
>+			-p*)
>+				p="${1}"
>+				[ "$p" = -p ] && { p="$1$2"; shift; }
>+				;;
>+			--strip=*)
>+				p="-p${1#--strip=}"
>+				;;
>+			esac
> 			shift
> 		done
>-		if [ "${1:0:2}" = -p ]
>-		then
>-			[ "$1" = -p ] && set -- "$1$2"
>-			[ "$1" != -p1 ] && echo $1
>-		fi
>+		[ "$p" -a "$p" != -p1 ] && echo $p
> 	}
> 
>+	# parse and remove -i|--input= and redirect stdin from that file
>+	case "${0##*/}" in
>+	patch)
>+		OPTS=()
>+		while [ "$1" ]
>+		do
>+			case "$1" in
>+			-i*)
>+				if [ "$1" = -i ] ; then
>+					exec <"$2"
>+					shift
>+				else
>+					exec <"${1#-i}"
>+				fi
>+				shift ;;
>+			--input=*)
>+				exec <"${1#--input=}"
>+				shift ;;
>+			*)
>+				OPTS=("${OPTS[@]}" "$1")
>+				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