BSD 4_3 release

[unix-history] / usr / src / usr.bin / uucp / assert.c

diff --git a/usr/src/usr.bin/uucp/assert.c b/usr/src/usr.bin/uucp/assert.c
index 9c183c3..3aaf18b 100644 (file)
--- a/usr/src/usr.bin/uucp/assert.c
+++ b/usr/src/usr.bin/uucp/assert.c
@@ -1,16 +1,15 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)assert.c   5.2 (Berkeley) 7/2/83";
+static char sccsid[] = "@(#)assert.c   5.5 (Berkeley) 6/19/85";

 #endif
 
 #include "uucp.h"
 #include <sys/time.h>
 #endif
 
 #include "uucp.h"
 #include <sys/time.h>

-#include <sys/types.h>

 #include <errno.h>
 
 #include <errno.h>
 

-/*******
- *     assert - print out assetion error
- *
- *     return code - none
+/*LINTLIBRARY*/
+
+/*
+ *     print out assetion error

  */
 
 assert(s1, s2, i1)
  */
 
 assert(s1, s2, i1)


@@ -19,29 +18,34 @@ char *s1, *s2;
        register FILE *errlog;
        register struct tm *tp;
        extern struct tm *localtime();
        register FILE *errlog;
        register struct tm *tp;
        extern struct tm *localtime();

-       extern time_t time();

        time_t clock;
        int pid;
 
        time_t clock;
        int pid;
 

-       if (Debug)
-               errlog = stderr;
-       else {
+       errlog = NULL;
+       if (!Debug) {

                int savemask;
                savemask = umask(LOGMASK);
                errlog = fopen(ERRLOG, "a");
                umask(savemask);
        }
        if (errlog == NULL)
                int savemask;
                savemask = umask(LOGMASK);
                errlog = fopen(ERRLOG, "a");
                umask(savemask);
        }
        if (errlog == NULL)

-               return;
+               errlog = stderr;

 
        pid = getpid();
        fprintf(errlog, "ASSERT ERROR (%.9s)  ", Progname);
        fprintf(errlog, "pid: %d  ", pid);
 
        pid = getpid();
        fprintf(errlog, "ASSERT ERROR (%.9s)  ", Progname);
        fprintf(errlog, "pid: %d  ", pid);

-       time(&clock);
+       (void) time(&clock);

        tp = localtime(&clock);
        tp = localtime(&clock);

-       fprintf(errlog, "(%d/%d-%d:%02d) ", tp->tm_mon + 1,
+#ifdef USG
+       fprintf(errlog, "(%d/%d-%2.2d:%2.2d) ", tp->tm_mon + 1,

                tp->tm_mday, tp->tm_hour, tp->tm_min);
                tp->tm_mday, tp->tm_hour, tp->tm_min);

-       fprintf(errlog, "%s %s (%d)\n", s1, s2, i1);
-       fclose(errlog);
+#endif
+#ifndef USG
+       fprintf(errlog, "(%d/%d-%02d:%02d) ", tp->tm_mon + 1,
+               tp->tm_mday, tp->tm_hour, tp->tm_min);
+#endif
+       fprintf(errlog, "%s %s (%d)\n", s1 ? s1 : "", s2 ? s2 : "", i1);
+       if (errlog != stderr)
+               (void) fclose(errlog);

        return;
 }
        return;
 }