cgram: fix assertion when substituting at the end of the longest line

[bsdgames-darwin.git] / primes / primes.c

diff --git a/primes/primes.c b/primes/primes.c
index 15bdeadc32e3f568b45232d4d943498a50b1c59f..a022aa96834b8cca45a199a1182439b048320a93 100644 (file)
--- a/primes/primes.c
+++ b/primes/primes.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: primes.c,v 1.20 2014/10/02 21:36:37 ast Exp $  */
+/*     $NetBSD: primes.c,v 1.22 2018/02/03 15:40:29 christos Exp $     */
 
 /*
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
 #if 0
 static char sccsid[] = "@(#)primes.c   8.5 (Berkeley) 5/10/95";
 #else
-__RCSID("$NetBSD: primes.c,v 1.20 2014/10/02 21:36:37 ast Exp $");
+__RCSID("$NetBSD: primes.c,v 1.22 2018/02/03 15:40:29 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -52,13 +52,13 @@ __RCSID("$NetBSD: primes.c,v 1.20 2014/10/02 21:36:37 ast Exp $");
  * By Landon Curt Noll, http://www.isthe.com/chongo/index.html /\oo/\
  *
  * usage:
- *     primes [-d] [-h] [start [stop]]
+ *     primes [-dh] [start [stop]]
  *
  *     Print primes >= start and < stop.  If stop is omitted,
  *     the value SPSPMAX is assumed.  If start is
  *     omitted, start is read from standard input.
- *             -h: print primes in hexadecimal
  *             -d: print difference to previous prime, e.g. 3 (1)
+ *             -h: print primes in hexadecimal
  *
  * validation check: there are 664579 primes between 0 and 10^7
  */
@@ -118,7 +118,7 @@ main(int argc, char *argv[])
        argv += optind;
 
        start = 0;
-       stop = SPSPMAX;
+       stop = (uint64_t)(-1);
 
        /*
         * Convert low and high args.  Strtoumax(3) sets errno to
@@ -145,9 +145,6 @@ main(int argc, char *argv[])
                        err(1, "%s", argv[1]);
                if (*p != '\0')
                        errx(1, "%s: illegal numeric format.", argv[1]);
-               if (stop > SPSPMAX)
-                       errx(1, "%s: stop value too large (>%" PRIu64 ").",
-                               argv[1], (uint64_t) SPSPMAX);
                break;
        case 1:
                /* Start on the command line. */
@@ -338,6 +335,6 @@ primes(uint64_t start, uint64_t stop)
 static void
 usage(void)
 {
-       (void)fprintf(stderr, "usage: primes [-d] [-h] [start [stop]]\n");
+       (void)fprintf(stderr, "usage: primes [-dh] [start [stop]]\n");
        exit(1);
 }