Module Name: src Committed By: tls Date: Sun Aug 10 06:58:38 UTC 2014
Modified Files: src/usr.bin/patch [tls-earlyentropy]: backupfile.c patch.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.36.1 src/usr.bin/patch/backupfile.c cvs rdiff -u -r1.16 -r1.16.6.1 src/usr.bin/patch/patch.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/patch/backupfile.c diff -u src/usr.bin/patch/backupfile.c:1.14 src/usr.bin/patch/backupfile.c:1.14.36.1 --- src/usr.bin/patch/backupfile.c:1.14 Fri Sep 19 18:33:34 2008 +++ src/usr.bin/patch/backupfile.c Sun Aug 10 06:58:38 2014 @@ -1,7 +1,7 @@ /* * $OpenBSD: backupfile.c,v 1.19 2006/03/11 19:41:30 otto Exp $ * $DragonFly: src/usr.bin/patch/backupfile.c,v 1.5 2008/08/11 00:05:06 joerg Exp $ - * $NetBSD: backupfile.c,v 1.14 2008/09/19 18:33:34 joerg Exp $ + * $NetBSD: backupfile.c,v 1.14.36.1 2014/08/10 06:58:38 tls Exp $ */ /* @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: backupfile.c,v 1.14 2008/09/19 18:33:34 joerg Exp $"); +__RCSID("$NetBSD: backupfile.c,v 1.14.36.1 2014/08/10 06:58:38 tls Exp $"); #include <ctype.h> #include <dirent.h> @@ -227,11 +227,11 @@ invalid_arg(const char *kind, const char } static const char *backup_args[] = { - "never", "simple", "nil", "existing", "t", "numbered", 0 + "none", "never", "simple", "nil", "existing", "t", "numbered", 0 }; static enum backup_type backup_types[] = { - simple, simple, numbered_existing, + none, simple, simple, numbered_existing, numbered_existing, numbered, numbered }; Index: src/usr.bin/patch/patch.1 diff -u src/usr.bin/patch/patch.1:1.16 src/usr.bin/patch/patch.1:1.16.6.1 --- src/usr.bin/patch/patch.1:1.16 Tue Jan 29 09:30:11 2013 +++ src/usr.bin/patch/patch.1 Sun Aug 10 06:58:38 2014 @@ -1,6 +1,6 @@ .\" $OpenBSD: patch.1,v 1.22 2008/06/06 20:44:00 jmc Exp $ .\" $DragonFly: src/usr.bin/patch/patch.1,v 1.10 2008/08/18 19:15:55 joerg Exp $ -.\" $NetBSD: patch.1,v 1.16 2013/01/29 09:30:11 wiz Exp $ +.\" $NetBSD: patch.1,v 1.16.6.1 2014/08/10 06:58:38 tls Exp $ .\" Copyright 1986, Larry Wall .\" .\" Redistribution and use in source and binary forms, with or without @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 18, 2008 +.Dd April 11, 2014 .Dt PATCH 1 .Os .Sh NAME @@ -38,7 +38,7 @@ .Op Fl o Ar out-file .Op Fl p Ar strip-count .Op Fl r Ar rej-name -.Op Fl V Cm t | nil | never +.Op Fl V Cm t | nil | never | none .Op Fl x Ar number .Op Fl z Ar backup-ext .Op Fl Fl posix @@ -266,7 +266,7 @@ and assume that patches are reversed if Forces .Nm to interpret the patch file as a unified context diff (a unidiff). -.It Fl V Cm t | nil | never , Fl Fl version-control Cm t | nil | never +.It Fl V Cm t | nil | never | none , Fl Fl version-control Cm t | nil | never | none 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