[src/trunk]: src/games/factor PR/55693: Andreas Gustafsson: factor(6) lists f...

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

details:   https://anonhg.NetBSD.org/src/rev/d52ccc2e0f3e
branches:  trunk
changeset: 955562:d52ccc2e0f3e
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Oct 03 22:27:00 2020 +0000

description:
PR/55693: Andreas Gustafsson: factor(6) lists factors in wrong order
Sync with FreeBSD and change their -h (that printed hex) to -x because
we were already using -h.

diffstat:

 games/factor/factor.6 |   10 +-
 games/factor/factor.c |  425 +++++++++++++++++++++++++++----------------------
 2 files changed, 239 insertions(+), 196 deletions(-)

diffs (truncated from 625 to 300 lines):

diff -r cf62c6e7db32 -r d52ccc2e0f3e games/factor/factor.6
--- a/games/factor/factor.6     Sat Oct 03 22:25:04 2020 +0000
+++ b/games/factor/factor.6     Sat Oct 03 22:27:00 2020 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: factor.6,v 1.14 2017/11/11 23:48:44 rin Exp $
+.\"    $NetBSD: factor.6,v 1.15 2020/10/03 22:27:00 christos Exp $
 .\"
 .\" Copyright (c) 1989, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
 .\"
 .\" By Landon Curt Noll, http://www.isthe.com/chongo/index.html /\oo/\
 .\"
-.Dd Nov 12, 2017
+.Dd October 3, 2020
 .Dt FACTOR 6
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Nd factor a number
 .Sh SYNOPSIS
 .Nm
-.Op Fl h
+.Op Fl hx
 .Op Ar number ...
 .Sh DESCRIPTION
 The
@@ -98,6 +98,10 @@
 .Fl h
 flag is specified, factors will be printed in "human-readable" format.
 If a factor x divides a value n (>1) times, it will appear as x^n.
+.It Fl x
+If the
+.Fl x
+flag is specified, factors will be printed int hexadecimal format.
 .El
 .Sh DIAGNOSTICS
 Out of range or invalid input results in
diff -r cf62c6e7db32 -r d52ccc2e0f3e games/factor/factor.c
--- a/games/factor/factor.c     Sat Oct 03 22:25:04 2020 +0000
+++ b/games/factor/factor.c     Sat Oct 03 22:27:00 2020 +0000
@@ -1,5 +1,4 @@
-/*     $NetBSD: factor.c,v 1.29 2018/02/06 16:53:27 christos Exp $     */
-
+/*     $NetBSD: factor.c,v 1.30 2020/10/03 22:27:00 christos Exp $     */
 /*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -32,29 +31,34 @@
  * SUCH DAMAGE.
  */
 
+#ifndef lint
 #include <sys/cdefs.h>
-#ifndef lint
+#ifdef __COPYRIGHT
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
- The Regents of the University of California.  All rights reserved.");
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)factor.c   8.4 (Berkeley) 5/4/95";
-#else
-__RCSID("$NetBSD: factor.c,v 1.29 2018/02/06 16:53:27 christos Exp $");
+       The Regents of the University of California.  All rights reserved.");
+#endif
+#ifdef __SCCSID
+__SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95");
+#endif
+#ifdef __RCSID
+__RCSID("$NetBSD: factor.c,v 1.30 2020/10/03 22:27:00 christos Exp $");
+#endif
+#ifdef __FBSDID
+__FBSDID("$FreeBSD: head/usr.bin/factor/factor.c 356666 2020-01-12 20:25:11Z gad $");
 #endif
 #endif /* not lint */
 
 /*
  * factor - factor a number into primes
  *
- * By Landon Curt Noll, http://www.isthe.com/chongo/index.html /\oo/\
+ * By: Landon Curt Noll   chongo%toad.com@localhost,   ...!{sun,tolsoft}!hoptoad!chongo
+ *
+ *   chongo <for a good prime call: 391581 * 2^216193 - 1> /\oo/\
  *
  * usage:
- *     factor [-h] [number] ...
+ *     factor [-hx] [number] ...
  *
- * By Default, the form of the output is:
+ * The form of the output is:
  *
  *     number: factor1 factor1 factor2 factor3 factor3 factor3 ...
  *
@@ -63,93 +67,80 @@
  * If the -h flag is specified, the output is in "human-readable" format.
  * Duplicate factors are printed in the form of x^n.
  *
+ * If the -x flag is specified numbers are printed in hex.
+ *
  * If no number args are given, the list of numbers are read from stdin.
+ * If no args are given, the list of numbers are read from stdin.
  */
 
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <inttypes.h>
+
+#include "primes.h"
 
 #ifdef HAVE_OPENSSL
+
 #include <openssl/bn.h>
+
+#define        PRIME_CHECKS    5
+
+static void    pollard_pminus1(BIGNUM *, int); /* print factors for big numbers */
+
 #else
+
 typedef long   BIGNUM;
 typedef u_long BN_ULONG;
-static int BN_dec2bn(BIGNUM **a, const char *str);
+
+#define BN_CTX                 int
+#define BN_CTX_new()           NULL
 #define BN_new()               ((BIGNUM *)calloc(sizeof(BIGNUM), 1))
 #define BN_is_zero(v)          (*(v) == 0)
 #define BN_is_one(v)           (*(v) == 1)
 #define BN_mod_word(a, b)      (*(a) % (b))
-#endif
-
-#include "primes.h"
 
-/*
- * prime[i] is the (i-1)th prime.
- *
- * We are able to sieve 2^32-1 because this byte table yields all primes
- * up to 65537 and 65537^2 > 2^32-1.
- */
+static int     BN_dec2bn(BIGNUM **, const char *);
+static int     BN_hex2bn(BIGNUM **, const char *);
+static BN_ULONG BN_div_word(BIGNUM *, BN_ULONG);
+static void    BN_print_fp(FILE *, const BIGNUM *);
 
-#if 0 /* debugging: limit table use to stress the "pollard" code */
-#define pr_limit &prime[0]
-#endif
-
-#define        PRIME_CHECKS    5
-
-#ifdef HAVE_OPENSSL 
-static BN_CTX *ctx;                    /* just use a global context */
 #endif
 
-static void pr_fact(BIGNUM *, int);    /* print factors of a value */
-static void BN_print_dec_fp(FILE *, const BIGNUM *);
-static void usage(void) __dead;
-#ifdef HAVE_OPENSSL
-static void pollard_rho(BIGNUM *);     /* print factors for big numbers */
-#else
-static char *BN_bn2dec(const BIGNUM *);
-static BN_ULONG BN_div_word(BIGNUM *, BN_ULONG);
-#endif
-
+static void    BN_print_dec_fp(FILE *, const BIGNUM *);
+static void    convert_str2bn(BIGNUM **, char *);
+static bool    is_hex_str(char *);
+static void    pr_fact(BIGNUM *, int, int);    /* print factors of a value */
+static void    pr_print(BIGNUM *, int);        /* print a prime */
+static void    usage(void);
 
-#ifndef HAVE_OPENSSL
-static int
-BN_dec2bn(BIGNUM **a, const char *str)
-{
-       char *p;
-
-       errno = 0;
-       **a = strtoul(str, &p, 10);
-       if (errno)
-               err(1, "%s", str);
-       return (*p == '\n' || *p == '\0');
-}
-#endif
+static BN_CTX  *ctx;                   /* just use a global context */
 
 int
 main(int argc, char *argv[])
 {
        BIGNUM *val;
-       int ch, hflag;
+       int ch, hflag, xflag;
        char *p, buf[LINE_MAX];         /* > max number of digits. */
 
-#ifdef HAVE_OPENSSL 
+       hflag = xflag = 0;
        ctx = BN_CTX_new();
-#endif
        val = BN_new();
        if (val == NULL)
                errx(1, "can't initialise bignum");
 
-       hflag = 0;
-       while ((ch = getopt(argc, argv, "h")) != -1)
+       while ((ch = getopt(argc, argv, "hx")) != -1)
                switch (ch) {
                case 'h':
-                       hflag = 1;
+                       hflag++;
+                       break;
+               case 'x':
+                       xflag++;
                        break;
                case '?':
                default:
@@ -169,20 +160,14 @@
                        for (p = buf; isblank((unsigned char)*p); ++p);
                        if (*p == '\n' || *p == '\0')
                                continue;
-                       if (*p == '-')
-                               errx(1, "negative numbers aren't permitted.");
-                       if (BN_dec2bn(&val, buf) == 0)
-                               errx(1, "%s: illegal numeric format.", argv[0]);
-                       pr_fact(val, hflag);
+                       convert_str2bn(&val, p);
+                       pr_fact(val, hflag, xflag);
                }
        /* Factor the arguments. */
        else
-               for (; *argv != NULL; ++argv) {
-                       if (argv[0][0] == '-')
-                               errx(1, "numbers <= 1 aren't permitted.");
-                       if (BN_dec2bn(&val, argv[0]) == 0)
-                               errx(1, "%s: illegal numeric format.", argv[0]);
-                       pr_fact(val, hflag);
+               for (p = *argv; p != NULL; p = *++argv) {
+                       convert_str2bn(&val, p);
+                       pr_fact(val, hflag, xflag);
                }
        exit(0);
 }
@@ -190,40 +175,45 @@
 /*
  * pr_fact - print the factors of a number
  *
- * If the number is 0 or 1, then print the number and return.
- * If the number is < 0, print -1, negate the number and continue
- * processing.
- *
  * Print the factors of the number, from the lowest to the highest.
- * By default, a factor will be printed numtiple times if it divides
- * the value multiple times.
+ * A factor will be printed multiple times if it divides the value
+ * multiple times.
  *
  * If hflag is specified, duplicate factors are printed in "human-
  * readable" form of x^n.
  *
+ * If the xflag is specified, numbers will be printed in hex.
+ *
  * Factors are printed with leading tabs.
  */
 static void
-pr_fact(BIGNUM *val, int hflag)
+pr_fact(BIGNUM *val, int hflag, int xflag)
 {
-       const uint64_t *fact;           /* The factor found. */
        int i;
+       const uint64_t *fact;   /* The factor found. */
 
        /* Firewall - catch 0 and 1. */
-       if (BN_is_zero(val) || BN_is_one(val))
-               errx(1, "numbers <= 1 aren't permitted.");
+       if (BN_is_zero(val))    /* Historical practice; 0 just exits. */
+               exit(0);
+       if (BN_is_one(val)) {
+               printf("1: 1\n");
+               return;
+       }
 
        /* Factor value. */
 
-       BN_print_dec_fp(stdout, val);
+       if (xflag) {
+               fputs("0x", stdout);
+               BN_print_fp(stdout, val);
+       } else
+               BN_print_dec_fp(stdout, val);
        putchar(':');
        for (fact = &prime[0]; !BN_is_one(val); ++fact) {
                /* Look for the smallest factor. */