BSD 4_4 release

[unix-history] / usr / src / sbin / dump / unctime.c

diff --git a/usr/src/sbin/dump/unctime.c b/usr/src/sbin/dump/unctime.c
index fe535d5..7b3fd4e 100644 (file)
--- a/usr/src/sbin/dump/unctime.c
+++ b/usr/src/sbin/dump/unctime.c
@@ -1,16 +1,53 @@
-/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)unctime.c  5.1 (Berkeley) 6/5/85";
-#endif not lint
+static char sccsid[] = "@(#)unctime.c  8.1 (Berkeley) 6/5/93";
+#endif /* not lint */

 
 #include <sys/types.h>
 
 #include <sys/types.h>

-#include <sys/time.h>
+

 #include <stdio.h>
 #include <stdio.h>

+#include <time.h>
+#ifdef __STDC__
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+#ifndef __P
+#include <sys/cdefs.h>
+#endif
+

 /*
  * Convert a ctime(3) format string into a system format date.
  * Return the date thus calculated.
 /*
  * Convert a ctime(3) format string into a system format date.
  * Return the date thus calculated.


@@ -29,20 +66,23 @@ static char sccsid[] = "@(#)unctime.c       5.1 (Berkeley) 6/5/85";
 #define        E_SECOND        17
 #define        E_YEAR          20
 
 #define        E_SECOND        17
 #define        E_YEAR          20
 

-time_t unctime(str)
+static int dcmp __P((struct tm *, struct tm *));
+static time_t emitl __P((struct tm *));
+static int lookup __P((char *));
+
+
+time_t
+unctime(str)

        char *str;
 {
        struct tm then;
        char *str;
 {
        struct tm then;

-       char dbuf[30];
-       time_t emitl();
-
-       if (strlen(str) != 25)
-               str[25] = 0;
-       strcpy(dbuf, str);
-       dbuf[E_MONTH+3] = 0;
-       if ( (then.tm_mon = lookup(&dbuf[E_MONTH])) < 0) {
-               return(-1);;
-       }
+       char dbuf[26];
+
+       (void) strncpy(dbuf, str, sizeof(dbuf) - 1);
+       dbuf[sizeof(dbuf) - 1] = '\0';
+       dbuf[E_MONTH+3] = '\0';
+       if ((then.tm_mon = lookup(&dbuf[E_MONTH])) < 0)
+               return (-1);

        then.tm_mday = atoi(&dbuf[E_DAY]);
        then.tm_hour = atoi(&dbuf[E_HOUR]);
        then.tm_min = atoi(&dbuf[E_MINUTE]);
        then.tm_mday = atoi(&dbuf[E_DAY]);
        then.tm_hour = atoi(&dbuf[E_HOUR]);
        then.tm_min = atoi(&dbuf[E_MINUTE]);


@@ -54,13 +94,13 @@ time_t unctime(str)
 static char months[] =
        "JanFebMarAprMayJunJulAugSepOctNovDec";
 
 static char months[] =
        "JanFebMarAprMayJunJulAugSepOctNovDec";
 

-static
+static int

 lookup(str)
        char *str;
 {
        register char *cp, *cp2;
 
 lookup(str)
        char *str;
 {
        register char *cp, *cp2;
 

-       for (cp = months, cp2 = str; *cp != 0; cp += 3)
+       for (cp = months, cp2 = str; *cp != '\0'; cp += 3)

                if (strncmp(cp, cp2, 3) == 0)
                        return((cp-months) / 3);
        return(-1);
                if (strncmp(cp, cp2, 3) == 0)
                        return((cp-months) / 3);
        return(-1);


@@ -72,9 +112,8 @@ lookup(str)
  *     Use a binary search.
  */
 
  *     Use a binary search.
  */
 

-struct tm *localtime();
-
-time_t emitl(dp)
+static time_t
+emitl(dp)

        struct tm *dp;
 {
        time_t conv;
        struct tm *dp;
 {
        time_t conv;


@@ -103,7 +142,7 @@ time_t emitl(dp)
        if (dp->a < dp2->a) \
                return(-1)
 
        if (dp->a < dp2->a) \
                return(-1)
 

-static
+static int

 dcmp(dp, dp2)
        register struct tm *dp, *dp2;
 {
 dcmp(dp, dp2)
        register struct tm *dp, *dp2;
 {