[src/netbsd-9]: src/usr.bin/patch Pull up following revision(s) (requested by...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/68a532788868
branches:  netbsd-9
changeset: 964309:68a532788868
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Feb 26 13:29:16 2021 +0000

description:
Pull up following revision(s) (requested by nia in ticket #1215):

        usr.bin/patch/backupfile.c: revision 1.16
        usr.bin/patch/backupfile.h: revision 1.7
        usr.bin/patch/patch.c: revision 1.30

patch: make '-V none' work in the expected way

Internally the code confuses the concept of "the user doesn't want
a backup file" and "the user hasn't defined a type of backup file".

Introduce a new "undefined" backup type to serve the purpose "none"
previously did, and make "none" not generate backup files, as expected.

http://mail-index.netbsd.org/tech-userlevel/2021/02/19/msg012901.html

XXX pullup?

diffstat:

 usr.bin/patch/backupfile.c |   6 +++---
 usr.bin/patch/backupfile.h |   4 +++-
 usr.bin/patch/patch.c      |  19 ++++++++++---------
 3 files changed, 16 insertions(+), 13 deletions(-)

diffs (106 lines):

diff -r d2f25449c576 -r 68a532788868 usr.bin/patch/backupfile.c
--- a/usr.bin/patch/backupfile.c        Thu Feb 25 09:37:33 2021 +0000
+++ b/usr.bin/patch/backupfile.c        Fri Feb 26 13:29:16 2021 +0000
@@ -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.15 2014/04/11 17:30:03 christos Exp $
+ * $NetBSD: backupfile.c,v 1.15.26.1 2021/02/26 13:29:16 martin Exp $
  */
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: backupfile.c,v 1.15 2014/04/11 17:30:03 christos Exp $");
+__RCSID("$NetBSD: backupfile.c,v 1.15.26.1 2021/02/26 13:29:16 martin Exp $");
 
 #include <ctype.h>
 #include <dirent.h>
@@ -38,7 +38,7 @@
 #define ISDIGIT(c) (isascii ((unsigned char)c) && isdigit ((unsigned char)c))
 
 /* Which type of backup file names are generated. */
-enum backup_type backup_type = none;
+enum backup_type backup_type = undefined;
 
 /*
  * The extension added to file names to produce a simple (as opposed to
diff -r d2f25449c576 -r 68a532788868 usr.bin/patch/backupfile.h
--- a/usr.bin/patch/backupfile.h        Thu Feb 25 09:37:33 2021 +0000
+++ b/usr.bin/patch/backupfile.h        Fri Feb 26 13:29:16 2021 +0000
@@ -1,7 +1,7 @@
 /*
  * $OpenBSD: backupfile.h,v 1.6 2003/07/28 18:35:36 otto Exp $
  * $DragonFly: src/usr.bin/patch/backupfile.h,v 1.3 2007/09/29 23:11:10 swildner Exp $
- * $NetBSD: backupfile.h,v 1.6 2008/09/19 18:33:34 joerg Exp $
+ * $NetBSD: backupfile.h,v 1.6.62.1 2021/02/26 13:29:16 martin Exp $
  */
 
 /*
@@ -19,6 +19,8 @@
 
 /* When to make backup files. */
 enum backup_type {
+       undefined,
+
        /* Never make backups. */
        none,
 
diff -r d2f25449c576 -r 68a532788868 usr.bin/patch/patch.c
--- a/usr.bin/patch/patch.c     Thu Feb 25 09:37:33 2021 +0000
+++ b/usr.bin/patch/patch.c     Fri Feb 26 13:29:16 2021 +0000
@@ -1,7 +1,7 @@
 /*
  * $OpenBSD: patch.c,v 1.45 2007/04/18 21:52:24 sobrado Exp $
  * $DragonFly: src/usr.bin/patch/patch.c,v 1.10 2008/08/10 23:39:56 joerg Exp $
- * $NetBSD: patch.c,v 1.29 2011/09/06 18:25:14 joerg Exp $
+ * $NetBSD: patch.c,v 1.29.44.1 2021/02/26 13:29:16 martin Exp $
  */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: patch.c,v 1.29 2011/09/06 18:25:14 joerg Exp $");
+__RCSID("$NetBSD: patch.c,v 1.29.44.1 2021/02/26 13:29:16 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -197,17 +197,18 @@
        else
                simple_backup_suffix = ORIGEXT;
 
+       if ((v = getenv("PATCH_VERSION_CONTROL")) == NULL)
+               v = getenv("VERSION_CONTROL");
+       if (v != NULL)
+               backup_type = get_version(v);
+
        /* parse switches */
        Argc = argc;
        Argv = argv;
        get_some_switches();
 
-       if (backup_type == none) {
-               if ((v = getenv("PATCH_VERSION_CONTROL")) == NULL)
-                       v = getenv("VERSION_CONTROL");
-               if (v != NULL || !posix)
-                       backup_type = get_version(v);   /* OK to pass NULL. */
-       }
+       if (backup_type == undefined)
+               backup_type = posix ? none : numbered_existing;
 
        /* make sure we clean up /tmp in case of disaster */
        set_signals(0);
@@ -493,7 +494,7 @@
        while ((ch = getopt_long(Argc, Argv, options, longopts, NULL)) != -1) {
                switch (ch) {
                case 'b':
-                       if (backup_type == none)
+                       if (backup_type == undefined)
                                backup_type = numbered_existing;
                        if (optarg == NULL)
                                break;