tags 305920 patch
thanks
Here's a better patch that uses the same technique as fixps in the same
directory. I've confirmed that this does fix the reported problem.
#! /bin/sh /usr/share/dpatch/dpatch-run
## 21_pdiff_stdin.dpatch by <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./contrib/pdiff.in
/tmp/dpep-work.xlGPQI/a2ps-4.13b/contrib/pdiff.in
--- ./contrib/pdiff.in 2005-07-30 19:27:12.000000000 -0700
+++ /tmp/dpep-work.xlGPQI/a2ps-4.13b/contrib/pdiff.in 2005-07-30
19:31:39.391344328 -0700
@@ -123,6 +123,8 @@
a2ps_options="$a2ps_options --output=$1" ;;
-l|--lines) diff_on=lines;;
-w|--words) diff_on=words;;
+ -) # We are working with stdin
+ set dummy "${1+"$@"}" "$1"; shift;;
--) # What remains are not options.
shift
diff -urNad --exclude=CVS --exclude=.svn ./contrib/pdiff.m4
/tmp/dpep-work.xlGPQI/a2ps-4.13b/contrib/pdiff.m4
--- ./contrib/pdiff.m4 2005-07-30 19:28:32.000000000 -0700
+++ /tmp/dpep-work.xlGPQI/a2ps-4.13b/contrib/pdiff.m4 2005-07-30
19:30:25.282610568 -0700
@@ -63,7 +63,9 @@
-o|--output) shift
a2ps_options="$a2ps_options --output=$1" ;;
-l|--lines) diff_on=lines;;
- -w|--words) diff_on=words;;])
+ -w|--words) diff_on=words;;
+ -) # We are working with stdin
+ set dummy "${1+"$@"}" "$1"; shift;;])
# What remains is ORIG NEW [A2PS_OPTIONS...]
if test $# -lt 2; then
--
Russ Allbery ([EMAIL PROTECTED]) <http://www.eyrie.org/~eagle/>
