BSD 4_4 release

[unix-history] / usr / src / lib / libc / gen / ctime.c

diff --git a/usr/src/lib/libc/gen/ctime.c b/usr/src/lib/libc/gen/ctime.c
index 134ee00..9526274 100644 (file)
--- a/usr/src/lib/libc/gen/ctime.c
+++ b/usr/src/lib/libc/gen/ctime.c
@@ -1,27 +1,41 @@
 /*
 /*

- * Copyright (c) 1987, 1989 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1987, 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Arthur David Olson of the National Cancer Institute.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Arthur David Olson of the National Cancer Institute.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)ctime.c    5.23 (Berkeley) 6/22/90";
+static char sccsid[] = "@(#)ctime.c    8.1 (Berkeley) 6/4/93";

 #endif /* LIBC_SCCS and not lint */
 
 /*
 #endif /* LIBC_SCCS and not lint */
 
 /*


@@ -39,6 +53,7 @@ static char sccsid[] = "@(#)ctime.c   5.23 (Berkeley) 6/22/90";
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>

+#include <unistd.h>

 
 #ifdef __STDC__
 #include <stdlib.h>
 
 #ifdef __STDC__
 #include <stdlib.h>


@@ -52,8 +67,6 @@ static char sccsid[] = "@(#)ctime.c   5.23 (Berkeley) 6/22/90";
 #else /* !defined __STDC__ */
 
 #define P(s)           ()
 #else /* !defined __STDC__ */
 
 #define P(s)           ()

-#define const
-#define volatile

 
 typedef char *         genericptr_t;
 typedef unsigned       alloc_size_t;
 
 typedef char *         genericptr_t;
 typedef unsigned       alloc_size_t;


@@ -70,7 +83,6 @@ extern char * getenv();
 
 extern time_t  time();
 
 
 extern time_t  time();
 

-#define FILENAME_MAX   MAXPATHLEN

 #define ACCESS_MODE    O_RDONLY
 #define OPEN_MODE      O_RDONLY
 
 #define ACCESS_MODE    O_RDONLY
 #define OPEN_MODE      O_RDONLY
 


@@ -933,7 +945,7 @@ const time_t * const        timep;
 const long             offset;
 struct tm * const      tmp;
 {
 const long             offset;
 struct tm * const      tmp;
 {

-       register const struct state *   sp;
+       register struct state * sp;

        register const struct ttinfo *  ttisp;
        register int                    i;
        const time_t                    t = *timep;
        register const struct ttinfo *  ttisp;
        register int                    i;
        const time_t                    t = *timep;


@@ -1179,12 +1191,8 @@ const int        base;
                *tensptr += *unitsptr / base;
                *unitsptr %= base;
        } else if (*unitsptr < 0) {
                *tensptr += *unitsptr / base;
                *unitsptr %= base;
        } else if (*unitsptr < 0) {

-               --*tensptr;
-               *unitsptr += base;
-               if (*unitsptr < 0) {
-                       *tensptr -= 1 + (-*unitsptr) / base;
-                       *unitsptr = base - (-*unitsptr) % base;
-               }
+               *tensptr -= 1 + (-(*unitsptr + 1)) / base;
+               *unitsptr = base - 1 - (-(*unitsptr + 1)) % base;

        }
 }
 
        }
 }