Split some extra long lines

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

diff --git a/pw/pw_log.c b/pw/pw_log.c
index 4961b2bf93990ccf525789e1bf24f713dac79d67..29038d903747803bc4481295f7ecd979bd131692 100644 (file)
--- a/pw/pw_log.c
+++ b/pw/pw_log.c
@@ -1,26 +1,20 @@
 /*-
- * Copyright (c) 1996 by David L. Nugent <davidn@blaze.net.au>.
- * All rights reserved.
+ * Copyright (C) 1996
+ *     David L. Nugent.  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 as
- *    the first lines of this file unmodified.
+ *    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 David L. Nugent.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE DAVID L. NUGENT ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY DAVID L. NUGENT 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 DAVID L. NUGENT BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL DAVID L. NUGENT 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)
@@ -28,11 +22,16 @@
  * 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.
- *
- *     $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
 #include <fcntl.h>
+#include <string.h>
+#include <stdarg.h>
 
 #include "pw.h"
 
@@ -50,16 +49,15 @@ pw_log(struct userconf * cnf, int mode, int which, char const * fmt,...)
                }
                if (logfile != NULL) {
                        va_list         argp;
-                       int             l;
                        time_t          now = time(NULL);
                        struct tm      *t = localtime(&now);
                        char            nfmt[256];
-                       char           *name;
+                       const char     *name;
 
                        if ((name = getenv("LOGNAME")) == NULL && (name = getenv("USER")) == NULL)
                                name = "unknown";
-                       strftime(nfmt, sizeof nfmt, "%d-%b-%Y %R ", t);
-                       l = strlen(nfmt);
+                       /* ISO 8601 International Standard Date format */
+                       strftime(nfmt, sizeof nfmt, "%Y-%m-%d %T ", t);
                        sprintf(nfmt + strlen(nfmt), "[%s:%s%s] %s\n", name, Which[which], Modes[mode], fmt);
                        va_start(argp, fmt);
                        vfprintf(logfile, nfmt, argp);