More egcs warning fixes:

[pw-darwin.git] / chpass / util.c

diff --git a/chpass/util.c b/chpass/util.c
index 605a48455fa0a6012c5cd8a87d1dc23ccf29ef42..d8917f51bc965c5de85c0746c6ebf79203dfefa8 100644 (file)
--- a/chpass/util.c
+++ b/chpass/util.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)util.c     8.4 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+       "$Id: util.c,v 1.6 1998/03/23 07:41:49 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -111,9 +115,12 @@ atot(p, store)
        year = atoi(t);
        if (day < 1 || day > 31 || month < 1 || month > 12 || !year)
                goto bad;
-       if (year < 100)
+       /* Allow two digit years 1969-2068 */
+       if (year < 69)
+               year += 2000;
+       else if (year < 100)
                year += 1900;
-       if (year <= 1970)
+       if (year < 1969)
 bad:           return (1);
        lt->tm_year = year - 1900;
        lt->tm_mon = month - 1;
@@ -135,7 +142,7 @@ ok_shell(name)
        char *p, *sh;
 
        setusershell();
-       while (sh = getusershell()) {
+       while ((sh = getusershell())) {
                if (!strcmp(name, sh))
                        return (name);
                /* allow just shell name, but use "real" path */