-E NONE has *never* worked; it was always -E none. It's a dubious option

value that merits a warning in the manpage and using 2 billion will get
you practically the same effect, so delete the -E none support

diff --git a/bin/pax/options.c b/bin/pax/options.c
index 98ceea9..ac25e61 100644 (file)
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: options.c,v 1.99 2016/08/26 04:33:11 guenther Exp $   */
+/*     $OpenBSD: options.c,v 1.100 2016/08/26 04:40:27 guenther Exp $  */
 /*     $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $  */
 
 /*-
@@ -527,17 +527,13 @@ pax_options(int argc, char **argv)
                        /*
                         * non-standard limit on read faults
                         * 0 indicates stop after first error, values
-                        * indicate a limit, "NONE" try forever
+                        * indicate a limit
                         */
                        flg |= CEF;
-                       if (strcmp("none", optarg) == 0)
-                               maxflt = -1;
-                       else {
-                               maxflt = strtonum(optarg, 0, INT_MAX, &errstr);
-                               if (errstr) {
-                                       paxwarn(1, "Error count value: %s", errstr);
-                                       pax_usage();
-                               }
+                       maxflt = strtonum(optarg, 0, INT_MAX, &errstr);
+                       if (errstr) {
+                               paxwarn(1, "Error count value: %s", errstr);
+                               pax_usage();
                        }
                        break;
                case 'G':

diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index afc4a88..1424256 100644 (file)
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: pax.1,v 1.72 2016/08/16 18:41:06 schwarze Exp $
+.\"    $OpenBSD: pax.1,v 1.73 2016/08/26 04:40:27 guenther Exp $
 .\"    $NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
@@ -34,7 +34,7 @@
 .\"
 .\"    @(#)pax.1       8.4 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: August 16 2016 $
+.Dd $Mdocdate: August 26 2016 $
 .Dt PAX 1
 .Os
 .Sh NAME
@@ -358,23 +358,9 @@ A
 of 0 will cause
 .Nm
 to stop operation after the first read error is detected on an archive volume.
-A
-.Ar limit
-of
-.Li NONE
-will cause
-.Nm
-to attempt to recover from read errors forever.
 The default
 .Ar limit
 is a small positive number of retries.
-.Pp
-.Sy Warning :
-Using this option with
-.Li NONE
-should be used with extreme caution as
-.Nm
-may get stuck in an infinite loop on a very badly flawed archive.
 .It Fl f Ar archive
 Specify
 .Ar archive