[src/trunk]: src/distrib/utils/sysinst Use strtoul() instead of atoi() and ca...

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

details:   https://anonhg.NetBSD.org/src/rev/0e4bbc36a227
branches:  trunk
changeset: 571147:0e4bbc36a227
user:      dsl <dsl%NetBSD.org@localhost>
date:      Thu Nov 11 20:14:02 2004 +0000

description:
Use strtoul() instead of atoi() and cast arg of remaining ctype fns
to unsigned char.

diffstat:

 distrib/utils/sysinst/txtwalk.c |  28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diffs (88 lines):

diff -r 0faf7bef0eab -r 0e4bbc36a227 distrib/utils/sysinst/txtwalk.c
--- a/distrib/utils/sysinst/txtwalk.c   Thu Nov 11 20:05:23 2004 +0000
+++ b/distrib/utils/sysinst/txtwalk.c   Thu Nov 11 20:14:02 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: txtwalk.c,v 1.10 2003/11/30 14:36:44 dsl Exp $ */
+/*     $NetBSD: txtwalk.c,v 1.11 2004/11/11 20:14:02 dsl Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -131,6 +131,7 @@
        struct data found[MAXDATA];
        size_t numfound = 0;
        const char *p;
+       char *np;
        size_t  i, j;
        int error;
        
@@ -158,8 +159,11 @@
                                p++;
                        if (*p)
                                p++;
-                       while (*p && isdigit(*p)) {
-                               i = atoi(p);
+                       for (;;) {
+                               i = strtoul(p, &np, 10);
+                               if (p == np)
+                                   break;
+                               p = np;
                                switch (found[i].what) {
                                case INT:
                                        *((int *)item->var+j)
@@ -171,8 +175,6 @@
                                                item->size);
                                        break;
                                }
-                               while (isdigit(*p))
-                                       p++;
                                while (*p && *p != '$')
                                        p++;
                                if (*p)
@@ -204,6 +206,8 @@
 {
        const char *fmt;
        size_t len;
+       char *np;
+       int i;
 
        *numfound = 0;
        for (fmt = item->fmt; *fmt; fmt++) {
@@ -223,23 +227,23 @@
                                if (!fmt[1])
                                        return 1;
                                if (fmt[1] == ' ')
-                                       while (*line && !isspace(*line))
+                                       while (*line && !isspace((unsigned char)*line))
                                                line++;
                                else
                                        while (*line && *line != fmt[1])
                                                line++;
                                break;
                        case 'd':  /* Nextoken should be an integer. */
-                               if (!isdigit(*line))
+                               i = strtoul(line, &np, 10);
+                               if (line == np)
                                        return 0;
                                found[*numfound].what = INT;
-                               found[(*numfound)++].u.i_val = atoi(line);
-                               while (*line && isdigit(*line))
-                                       line++;
+                               found[(*numfound)++].u.i_val = i;
+                               line = np;
                                break;
                        case 's':  /* Matches a 'space' separated string. */
                                len = 0;
-                               while (line[len] && !isspace(line[len])
+                               while (line[len] && !isspace((unsigned char)line[len])
                                    && line[len] != fmt[1])
                                        len++;
                                found[*numfound].what = STR;
@@ -254,7 +258,7 @@
 
                }
                if (*fmt == ' ') {
-                       while (*line && isspace(*line))
+                       while (isspace((unsigned char)*line))
                                line++;
                        continue;
                }