Module Name: src
Committed By: christos
Date: Mon Oct 5 14:31:30 UTC 2020
Modified Files:
src/games/factor: factor.c
Log Message:
revert previous and don't parse octal
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/games/factor/factor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/factor/factor.c
diff -u src/games/factor/factor.c:1.32 src/games/factor/factor.c:1.33
--- src/games/factor/factor.c:1.32 Mon Oct 5 08:22:49 2020
+++ src/games/factor/factor.c Mon Oct 5 10:31:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: factor.c,v 1.32 2020/10/05 12:22:49 tnn Exp $ */
+/* $NetBSD: factor.c,v 1.33 2020/10/05 14:31:30 christos Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
__SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: factor.c,v 1.32 2020/10/05 12:22:49 tnn Exp $");
+__RCSID("$NetBSD: factor.c,v 1.33 2020/10/05 14:31:30 christos Exp $");
#endif
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/usr.bin/factor/factor.c 356666 2020-01-12 20:25:11Z gad $");
@@ -423,11 +423,8 @@ convert_str2bn(BIGNUM **val, char *p)
if (*p == '+') p++;
if (*p == '-')
errx(1, "negative numbers aren't permitted.");
- if (*p == '0') {
- if (p[1] == 'x' || p[1] == 'X')
- n = BN_hex2bn(val, p + 2);
- else
- n = BN_oct2bn(val, p + 1);
+ if (*p == '0' && (p[1] == 'x' || p[1] == 'X')) {
+ n = BN_hex2bn(val, p + 2);
} else {
n = is_hex_str(p) ? BN_hex2bn(val, p) : BN_dec2bn(val, p);
}
