[src/trunk]: src/usr.bin/cmp Apply patch from PR bin/23836 cmp did not corre...

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

details:   https://anonhg.NetBSD.org/src/rev/89ce5cea817a
branches:  trunk
changeset: 587302:89ce5cea817a
user:      garbled <garbled%NetBSD.org@localhost>
date:      Thu Jan 19 20:44:57 2006 +0000

description:
Apply patch from PR bin/23836  cmp did not correctly parse skip arguments
given in hex or octal, as the manpage states it can.

diffstat:

 usr.bin/cmp/cmp.c |  23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diffs (58 lines):

diff -r 900fd9189f76 -r 89ce5cea817a usr.bin/cmp/cmp.c
--- a/usr.bin/cmp/cmp.c Thu Jan 19 20:15:31 2006 +0000
+++ b/usr.bin/cmp/cmp.c Thu Jan 19 20:44:57 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cmp.c,v 1.14 2005/02/06 20:50:34 dsl Exp $     */
+/*     $NetBSD: cmp.c,v 1.15 2006/01/19 20:44:57 garbled Exp $ */
 
 /*
  * Copyright (c) 1987, 1990, 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)cmp.c      8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: cmp.c,v 1.14 2005/02/06 20:50:34 dsl Exp $");
+__RCSID("$NetBSD: cmp.c,v 1.15 2006/01/19 20:44:57 garbled Exp $");
 #endif
 #endif /* not lint */
 
@@ -47,6 +47,7 @@
 #include <sys/stat.h>
 
 #include <err.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -64,7 +65,7 @@
 main(int argc, char *argv[])
 {
        struct stat sb1, sb2;
-       off_t skip1, skip2;
+       off_t skip1 = 0, skip2 = 0;
        int ch, fd1, fd2, special;
        char *file1, *file2;
 
@@ -117,8 +118,20 @@
                exit(ERR_EXIT);
        }
 
-       skip1 = argc > 2 ? strtoq(argv[2], NULL, 10) : 0;
-       skip2 = argc == 4 ? strtoq(argv[3], NULL, 10) : 0;
+       if (argc > 2) {
+               char *ep;
+
+               errno = 0;
+               skip1 = strtoq(argv[2], &ep, 0);
+               if (errno || ep == argv[2])
+                       usage();
+
+               if (argc == 4) {
+                       skip2 = strtoq(argv[3], &ep, 0);
+                       if (errno || ep == argv[3])
+                               usage();
+               }
+       }
 
        if (!special) {
                if (fstat(fd1, &sb1))