Perform a major cleanup of the usr.sbin Makefiles.

[pw-darwin.git] / pw / psdate.c

diff --git a/pw/psdate.c b/pw/psdate.c
index 9b9cf78bc9fde534d46ff2baa5285aed376d4e7e..f97253b40a864531c0107450f5e7cc482c32f446 100644 (file)
--- a/pw/psdate.c
+++ b/pw/psdate.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -43,9 +43,9 @@ a2i(char const ** str)
        int             i = 0;
        char const     *s = *str;
 
-       if (isdigit(*s)) {
+       if (isdigit((unsigned char)*s)) {
                i = atoi(s);
-               while (isdigit(*s))
+               while (isdigit((unsigned char)*s))
                        ++s;
                *str = s;
        }
@@ -55,10 +55,10 @@ a2i(char const ** str)
 static int
 numerics(char const * str)
 {
-       int             rc = isdigit(*str);
+       int             rc = isdigit((unsigned char)*str);
 
        if (rc)
-               while (isdigit(*str) || *str == 'x')
+               while (isdigit((unsigned char)*str) || *str == 'x')
                        ++str;
        return rc && !*str;
 }
@@ -72,15 +72,15 @@ aindex(char const * arr[], char const ** str, int len)
        mystr[len] = '\0';
        l = strlen(strncpy(mystr, *str, len));
        for (i = 0; i < l; i++)
-               mystr[i] = (char) tolower(mystr[i]);
+               mystr[i] = (char) tolower((unsigned char)mystr[i]);
        for (i = 0; arr[i] && strcmp(mystr, arr[i]) != 0; i++);
        if (arr[i] == NULL)
                i = -1;
        else {                  /* Skip past it */
-               while (**str && isalpha(**str))
+               while (**str && isalpha((unsigned char)**str))
                        ++(*str);
                /* And any following whitespace */
-               while (**str && (**str == ',' || isspace(**str)))
+               while (**str && (**str == ',' || isspace((unsigned char)**str)))
                        ++(*str);
        }                       /* Return index */
        return i;
@@ -143,7 +143,7 @@ parse_datesub(char const * str, int *day, int *mon, int *year)
 
        while (*str && strchr(nchrs + 10, *str) != NULL)
                ++str;
-       if (isdigit(*str)) {
+       if (isdigit((unsigned char)*str)) {
                *year = atoi(str);
                if (*year > 1900)
                        *year -= 1900;
@@ -176,12 +176,11 @@ parse_date(time_t dt, char const * str)
        if (dt == 0)
                dt = time(NULL);
 
-       while (*str && isspace(*str))
+       while (*str && isspace((unsigned char)*str))
                ++str;
 
        if (numerics(str)) {
-               val = strtol(str, &p, 0);
-               dt = val ? val : dt;
+               dt = strtol(str, &p, 0);
        } else if (*str == '+' || *str == '-') {
                val = strtol(str, &p, 0);
                switch (*p) {
@@ -248,7 +247,7 @@ parse_date(time_t dt, char const * str)
                        else {
                                int             j = 1;
 
-                               while (q[j] && isupper(q[j]))
+                               while (q[j] && isupper((unsigned char)q[j]))
                                        ++j;
                                if (q[j] == '\0')
                                        *q = '\0';