eliminate shutdownlog in favor of syslog

SCCS-vsn: sbin/reboot/halt.c 5.2
SCCS-vsn: sbin/reboot/reboot.c 5.2
SCCS-vsn: sbin/savecore/savecore.c 5.7

diff --git a/usr/src/sbin/reboot/halt.c b/usr/src/sbin/reboot/halt.c
index 10ae2eb..8b79f86 100644 (file)
--- a/usr/src/sbin/reboot/halt.c
+++ b/usr/src/sbin/reboot/halt.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)halt.c     5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)halt.c     5.2 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -23,8 +23,7 @@ static char sccsid[] = "@(#)halt.c    5.1 (Berkeley) %G%";
 #include <sys/time.h>
 #include <errno.h>
 #include <signal.h>
 #include <sys/time.h>
 #include <errno.h>
 #include <signal.h>

-
-#define SHUTDOWNLOG "/usr/adm/shutdownlog"
+#include <syslog.h>

 
 main(argc, argv)
        int argc;
 
 main(argc, argv)
        int argc;


@@ -35,6 +34,7 @@ main(argc, argv)
        register i;
        register qflag = 0;
 
        register i;
        register qflag = 0;
 

+       openlog("halt", 0, LOG_AUTH);

        howto = RB_HALT;
        argc--, argv++;
        while (argc > 0) {
        howto = RB_HALT;
        argc--, argv++;
        while (argc > 0) {


@@ -81,7 +81,7 @@ main(argc, argv)
        }
 
        if ((howto & RB_NOSYNC) == 0)
        }
 
        if ((howto & RB_NOSYNC) == 0)

-               log_entry();
+               syslog(LOG_CRIT, "halted");

        if (!qflag) {
                if ((howto & RB_NOSYNC)==0) {
                        markdown();
        if (!qflag) {
                if ((howto & RB_NOSYNC)==0) {
                        markdown();


@@ -124,30 +124,3 @@ markdown()
                close(f);
        }
 }
                close(f);
        }
 }

-
-char *days[] = {
-       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-char *months[] = {
-       "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep",
-       "Oct", "Nov", "Dec"
-};
-
-log_entry()
-{
-       FILE *fp;
-       struct tm *tm, *localtime();
-       time_t now;
-
-       time(&now);
-       tm = localtime(&now);
-       fp = fopen(SHUTDOWNLOG, "a");
-       if (fp == NULL)
-               return;
-       fseek(fp, 0L, 2);
-       fprintf(fp, "%02d:%02d  %s %s %2d, %4d.  Halted.\n", tm->tm_hour,
-               tm->tm_min, days[tm->tm_wday], months[tm->tm_mon],
-               tm->tm_mday, tm->tm_year + 1900);
-       fclose(fp);
-}

diff --git a/usr/src/sbin/reboot/reboot.c b/usr/src/sbin/reboot/reboot.c
index 9e5fc39..2762b0e 100644 (file)
--- a/usr/src/sbin/reboot/reboot.c
+++ b/usr/src/sbin/reboot/reboot.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)reboot.c   5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)reboot.c   5.2 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -23,8 +23,7 @@ static char sccsid[] = "@(#)reboot.c  5.1 (Berkeley) %G%";
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/time.h>

-
-#define SHUTDOWNLOG "/usr/adm/shutdownlog"
+#include <syslog.h>

 
 main(argc, argv)
        int argc;
 
 main(argc, argv)
        int argc;


@@ -36,6 +35,7 @@ main(argc, argv)
        register ok = 0;
        register qflag = 0;
 
        register ok = 0;
        register qflag = 0;
 

+       openlog("reboot", 0, LOG_AUTH);

        argc--, argv++;
        howto = 0;
        while (argc > 0) {
        argc--, argv++;
        howto = 0;
        while (argc > 0) {


@@ -77,7 +77,7 @@ main(argc, argv)
        }
 
        if ((howto & RB_NOSYNC) == 0)
        }
 
        if ((howto & RB_NOSYNC) == 0)

-               log_entry();
+               syslog(LOG_CRIT, "halted for reboot");

        if (!qflag) {
                if (!(howto & RB_NOSYNC)) {
                        markdown();
        if (!qflag) {
                if (!(howto & RB_NOSYNC)) {
                        markdown();


@@ -122,30 +122,3 @@ markdown()
                close(f);
        }
 }
                close(f);
        }
 }

-
-char *days[] = {
-       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-char *months[] = {
-       "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep",
-       "Oct", "Nov", "Dec"
-};
-
-log_entry()
-{
-       FILE *fp;
-       struct tm *tm, *localtime();
-       time_t now;
-
-       time(&now);
-       tm = localtime(&now);
-       fp = fopen(SHUTDOWNLOG, "a");
-       if (fp == 0)
-               return;
-       fseek(fp, 0L, 2);
-       fprintf(fp, "%02d:%02d  %s %s %2d, %4d.  Halted for reboot.\n", tm->tm_hour,
-               tm->tm_min, days[tm->tm_wday], months[tm->tm_mon],
-               tm->tm_mday, tm->tm_year + 1900);
-       fclose(fp);
-}

diff --git a/usr/src/sbin/savecore/savecore.c b/usr/src/sbin/savecore/savecore.c
index a9b6a88..4e1d79c 100644 (file)
--- a/usr/src/sbin/savecore/savecore.c
+++ b/usr/src/sbin/savecore/savecore.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)savecore.c 5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)savecore.c 5.7 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -384,32 +384,6 @@ save_core()
        free(cp);
 }
 
        free(cp);
 }
 

-char *days[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
-char *months[] = {
-       "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep",
-       "Oct", "Nov", "Dec"
-};
-
-log_entry()
-{
-       FILE *fp;
-       struct tm *tm, *localtime();
-
-       fp = fopen("/usr/adm/shutdownlog", "a");
-       if (fp == 0)
-               return;
-       tm = localtime(&now);
-       fseek(fp, 0L, L_XTND);
-       fprintf(fp, "%02d:%02d  %s %s %2d, %4d.  Reboot", tm->tm_hour,
-               tm->tm_min, days[tm->tm_wday], months[tm->tm_mon],
-               tm->tm_mday, tm->tm_year + 1900);
-       if (panicstr)
-               fprintf(fp, " after panic: %s\n", panic_mesg);
-       else
-               putc('\n', fp);
-       fclose(fp);
-}
-

 /*
  * Versions of std routines that exit on error.
  */
 /*
  * Versions of std routines that exit on error.
  */