Support the long options that FSF's patch version has. $OpenBSD$ added

1 files changed, 24 insertions, 24 deletions

diff --git a/usr.bin/patch/patch.1 b/usr.bin/patch/patch.1
index 123937f2336..8fb35d5bf4b 100644
--- a/usr.bin/patch/patch.1
+++ b/usr.bin/patch/patch.1
@@ -1,4 +1,4 @@
-.\"	$Id: patch.1,v 1.1 1995/10/18 08:45:55 deraadt Exp $	-*- nroff -*-
+.\"	$OpenBSD: patch.1,v 1.2 1996/06/10 11:21:30 niklas Exp $	-*- nroff -*-
 .rn '' }`
 .de Sh
 .br
@@ -205,26 +205,26 @@ patch file, however.)
 .I Patch
 recognizes the following switches:
 .TP 5
-.B \-b
+.B \-b or \-\-suffix
 causes the next argument to be interpreted as the backup extension, to be
 used in place of \*(L".orig\*(R" or \*(L"~\*(R".
 .TP 5
-.B \-B
+.B \-B or \-\-prefix
 causes the next argument to be interpreted as a prefix to the backup file
 name. If this argument is specified any argument from -b will be ignored.
 .TP 5
-.B \-c
+.B \-c or \-\-context
 forces
 .I patch
 to interpret the patch file as a context diff.
 .TP 5
-.B \-d
+.B \-d or \-\-directory
 causes
 .I patch
 to interpret the next argument as a directory, and cd to it before doing
 anything else.
 .TP 5
-.B \-D
+.B \-D or \-\-ifdef
 causes
 .I patch
 to use the "#ifdef...#endif" construct to mark changes.
@@ -233,17 +233,17 @@ Note that, unlike the C compiler, there must be a space between the
 .B \-D
 and the argument.
 .TP 5
-.B \-e
+.B \-e or \-\-ed
 forces
 .I patch
 to interpret the patch file as an ed script.
 .TP 5
-.B \-E
+.B \-E or \-\-remove-empty-files
 causes
 .I patch
 to remove output files that are empty after the patches have been applied.
 .TP 5
-.B \-f
+.B \-f or \-\-force
 forces
 .I patch
 to assume that the user knows exactly what he or she is doing, and to not
@@ -255,7 +255,7 @@ This option does not suppress commentary; use
 .B \-s
 for that.
 .TP 5
-.B \-t
+.B \-t or \-\-batch
 similar to
 .BR \-f ,
 in that it suppresses questions, but makes some different assumptions:
@@ -264,7 +264,7 @@ skip patches for which the file has the wrong version for the ``Prereq:'' line
 in the patch; and assume that patches are reversed if they look like
 they are.
 .TP 5
-.B \-F<number>
+.B \-F<number> or \-\-fuzz <number>
 sets the maximum fuzz factor.
 This switch only applies to context diffs, and causes
 .I patch
@@ -273,7 +273,7 @@ Note that a larger fuzz factor increases the odds of a faulty patch.
 The default fuzz factor is 2, and it may not be set to more than
 the number of lines of context in the context diff, ordinarily 3.
 .TP 5
-.B \-l
+.B \-l or \-\-ignore-whitespace
 causes the pattern matching to be done loosely, in case the tabs and
 spaces have been munged in your input file.
 Any sequence of whitespace in the pattern line will match any sequence
@@ -281,22 +281,22 @@ in the input file.
 Normal characters must still match exactly.
 Each line of the context must still match a line in the input file.
 .TP 5
-.B \-n
+.B \-n or \-\-normal
 forces
 .I patch
 to interpret the patch file as a normal diff.
 .TP 5
-.B \-N
+.B \-N or \-\-forward
 causes
 .I patch
 to ignore patches that it thinks are reversed or already applied.
 See also
 .B \-R .
 .TP 5
-.B \-o
+.B \-o or \-\-output
 causes the next argument to be interpreted as the output file name.
 .TP 5
-.B \-p<number>
+.B \-p<number> or \-\-strip <number>
 sets the pathname strip count,
 which controls how pathnames found in the patch file are treated, in case
 the you keep your files in a different directory than the person who sent
@@ -334,10 +334,10 @@ or the directory specified by the
 .B \-d
 switch.
 .TP 5
-.B \-r
+.B \-r or \-\-reject-file
 causes the next argument to be interpreted as the reject file name.
 .TP 5
-.B \-R
+.B \-R or \-\-reverse
 tells
 .I patch
 that this patch was created with the old and new files swapped.
@@ -366,12 +366,12 @@ Luckily, most patches add or change lines rather than delete them, so most
 reversed normal diffs will begin with a delete, which will fail, triggering
 the heuristic.)
 .TP 5
-.B \-s
+.B \-s or \-\-quiet or \-\-silent
 makes
 .I patch
 do its work silently, unless an error occurs.
 .TP 5
-.B \-S
+.B \-S or \-\-skip
 causes
 .I patch
 to ignore this patch from the patch file, but continue on looking
@@ -382,17 +382,17 @@ Thus
 .sp
 will ignore the first and second of three patches.
 .TP 5
-.B \-u
+.B \-u or \-\-unified
 forces
 .I patch
 to interpret the patch file as a unified context diff (a unidiff).
 .TP 5
-.B \-v
+.B \-v or \-\-version
 causes
 .I patch
 to print out its revision header and patch level.
 .TP 5
-.B \-V
+.B \-V or \-\-version-control
 causes the next argument to be interpreted as a method for creating
 backup file names.  The type of backups made can also be given in the
 .B VERSION_CONTROL
@@ -423,7 +423,7 @@ This is the default.
 Always make simple backups.
 .RE
 .TP 5
-.B \-x<number>
+.B \-x<number> or \-\-debug <number>
 sets internal debugging flags, and is of interest only to
 .I patch
 patchers.