BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / string / strftime.c

diff --git a/usr/src/lib/libc/string/strftime.c b/usr/src/lib/libc/string/strftime.c
index f7f04af..f50cd49 100644 (file)
--- a/usr/src/lib/libc/string/strftime.c
+++ b/usr/src/lib/libc/string/strftime.c
@@ -2,11 +2,37 @@
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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[] = "@(#)strftime.c 5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)strftime.c 5.11 (Berkeley) 2/24/91";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>


@@ -32,15 +58,16 @@ static char *Bfmt[] = {
 
 static size_t gsize;
 static char *pt;
 
 static size_t gsize;
 static char *pt;

+static int _add(), _conv(), _secs();

 
 size_t
 strftime(s, maxsize, format, t)
        char *s;
 
 size_t
 strftime(s, maxsize, format, t)
        char *s;

-       char *format;

        size_t maxsize;
        size_t maxsize;

-       struct tm *t;
+       const char *format;
+       const struct tm *t;

 {
 {

-       size_t _fmt();
+       static size_t _fmt();

 
        pt = s;
        if ((gsize = maxsize) < 1)
 
        pt = s;
        if ((gsize = maxsize) < 1)


@@ -226,8 +253,11 @@ _secs(t)
        static char buf[15];
        register time_t s;
        register char *p;
        static char buf[15];
        register time_t s;
        register char *p;

+       struct tm tmp;

 
 

-       s = mktime(t);
+       /* Make a copy, mktime(3) modifies the tm struct. */
+       tmp = *t;
+       s = mktime(&tmp);

        for (p = buf + sizeof(buf) - 2; s > 0 && p > buf; s /= 10)
                *p-- = s % 10 + '0';
        return(_add(++p));
        for (p = buf + sizeof(buf) - 2; s > 0 && p > buf; s /= 10)
                *p-- = s % 10 + '0';
        return(_add(++p));