convert SBLOCK to SBOFF; generalize use of dev_bsize

[unix-history] / usr / src / sbin / savecore / savecore.c

diff --git a/usr/src/sbin/savecore/savecore.c b/usr/src/sbin/savecore/savecore.c
index a4dd681..e1e272b 100644 (file)
--- a/usr/src/sbin/savecore/savecore.c
+++ b/usr/src/sbin/savecore/savecore.c
@@ -1,17 +1,17 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
+ * Copyright (c) 1980,1986 Regents of the University of California.

  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  */
 
 #ifndef lint
 char copyright[] =
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980,1986 Regents of the University of California.\n\

  All rights reserved.\n";
 #endif not lint
 
 #ifndef lint
  All rights reserved.\n";
 #endif not lint
 
 #ifndef lint

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

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


@@ -25,7 +25,7 @@ static char sccsid[] = "@(#)savecore.c        5.5 (Berkeley) %G%";
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/file.h>

-#include <syslog.h>
+#include <sys/syslog.h>

 
 #define        DAY     (60L*60L*24L)
 #define        LEEWAY  (3*DAY)
 
 #define        DAY     (60L*60L*24L)
 #define        LEEWAY  (3*DAY)


@@ -34,10 +34,12 @@ static char sccsid[] = "@(#)savecore.c      5.5 (Berkeley) %G%";
 #ifdef vax
 #define ok(number) ((number)&0x7fffffff)
 #else
 #ifdef vax
 #define ok(number) ((number)&0x7fffffff)
 #else

+#ifdef tahoe
+#define ok(number) ((number)&~0xc0000000)
+#else

 #define ok(number) (number)
 #endif
 #define ok(number) (number)
 #endif

-
-#define SHUTDOWNLOG "/usr/adm/shutdownlog"
+#endif

 
 struct nlist current_nl[] = {  /* namelist for currently running system */
 #define X_DUMPDEV      0
 
 struct nlist current_nl[] = {  /* namelist for currently running system */
 #define X_DUMPDEV      0


@@ -88,6 +90,8 @@ int   panicstr;
 off_t  lseek();
 off_t  Lseek();
 int    Verbose;
 off_t  lseek();
 off_t  Lseek();
 int    Verbose;

+int    force;
+extern int errno;

 
 main(argc, argv)
        char **argv;
 
 main(argc, argv)
        char **argv;


@@ -99,6 +103,10 @@ main(argc, argv)
        while (argc > 0 && argv[0][0] == '-') {
                for (cp = &argv[0][1]; *cp; cp++) switch (*cp) {
 
        while (argc > 0 && argv[0][0] == '-') {
                for (cp = &argv[0][1]; *cp; cp++) switch (*cp) {
 

+               case 'f':
+                       force++;
+                       break;
+

                case 'v':
                        Verbose++;
                        break;
                case 'v':
                        Verbose++;
                        break;


@@ -106,7 +114,7 @@ main(argc, argv)
                default:
                usage:
                        fprintf(stderr,
                default:
                usage:
                        fprintf(stderr,

-                           "usage: savecore [-v] dirname [ system ]\n");
+                           "usage: savecore [-f] [-v] dirname [ system ]\n");

                        exit(1);
                }
                argc--, argv++;
                        exit(1);
                }
                argc--, argv++;


@@ -116,9 +124,9 @@ main(argc, argv)
        dirname = argv[0];
        if (argc == 2)
                system = argv[1];
        dirname = argv[0];
        if (argc == 2)
                system = argv[1];

-       openlog("savecore", LOG_ODELAY, LOG_USER);
+       openlog("savecore", LOG_ODELAY, LOG_AUTH);

        if (access(dirname, W_OK) < 0) {
        if (access(dirname, W_OK) < 0) {

-               syslog(LOG_ERR, "%s: %m", dirname);
+               Perror(LOG_ERR, "%s: %m", dirname);

                exit(1);
        }
        read_kmem();
                exit(1);
        }
        read_kmem();


@@ -172,7 +180,7 @@ find_dev(dev, type)
                        return (dp);
                }
        }
                        return (dp);
                }
        }

-       syslog(LOG_ERR, "Can't find device %d/%d\n", major(dev), minor(dev));
+       log(LOG_ERR, "Can't find device %d/%d\n", major(dev), minor(dev));

        exit(1);
        /*NOTREACHED*/
 }
        exit(1);
        /*NOTREACHED*/
 }


@@ -201,13 +209,13 @@ read_kmem()
         */
        for (i = 0; cursyms[i] != -1; i++)
                if (current_nl[cursyms[i]].n_value == 0) {
         */
        for (i = 0; cursyms[i] != -1; i++)
                if (current_nl[cursyms[i]].n_value == 0) {

-                       syslog(LOG_ERR, "/vmunix: %s not in namelist",
+                       log(LOG_ERR, "/vmunix: %s not in namelist",

                            current_nl[cursyms[i]].n_name);
                        exit(1);
                }
        for (i = 0; dumpsyms[i] != -1; i++)
                if (dump_nl[dumpsyms[i]].n_value == 0) {
                            current_nl[cursyms[i]].n_name);
                        exit(1);
                }
        for (i = 0; dumpsyms[i] != -1; i++)
                if (dump_nl[dumpsyms[i]].n_value == 0) {

-                       syslog(LOG_ERR, "%s: %s not in namelist", dump_sys,
+                       log(LOG_ERR, "%s: %s not in namelist", dump_sys,

                            dump_nl[dumpsyms[i]].n_name);
                        exit(1);
                }
                            dump_nl[dumpsyms[i]].n_name);
                        exit(1);
                }


@@ -222,7 +230,7 @@ read_kmem()
        ddname = find_dev(dumpdev, S_IFBLK);
        fp = fdopen(kmem, "r");
        if (fp == NULL) {
        ddname = find_dev(dumpdev, S_IFBLK);
        fp = fdopen(kmem, "r");
        if (fp == NULL) {

-               syslog(LOG_ERR, "Couldn't fdopen kmem");
+               log(LOG_ERR, "Couldn't fdopen kmem");

                exit(1);
        }
        if (system)
                exit(1);
        }
        if (system)


@@ -239,14 +247,14 @@ check_kmem()
 
        fp = fopen(ddname, "r");
        if (fp == NULL) {
 
        fp = fopen(ddname, "r");
        if (fp == NULL) {

-               syslog(LOG_ERR, "%s: %m", ddname);
+               Perror(LOG_ERR, "%s: %m", ddname);

                exit(1);
        }
        fseek(fp, (off_t)(dumplo+ok(dump_nl[X_VERSION].n_value)), L_SET);
        fgets(core_vers, sizeof (core_vers), fp);
        fclose(fp);
        if (!eq(vers, core_vers) && system == 0)
                exit(1);
        }
        fseek(fp, (off_t)(dumplo+ok(dump_nl[X_VERSION].n_value)), L_SET);
        fgets(core_vers, sizeof (core_vers), fp);
        fclose(fp);
        if (!eq(vers, core_vers) && system == 0)

-               fprintf(stderr,
+               log(LOG_WARNING,

                   "Warning: vmunix version mismatch:\n\t%sand\n\t%s",
                   vers, core_vers);
        fp = fopen(ddname, "r");
                   "Warning: vmunix version mismatch:\n\t%sand\n\t%s",
                   vers, core_vers);
        fp = fopen(ddname, "r");


@@ -273,7 +281,7 @@ get_crashtime()
        close(dumpfd);
        if (dumptime == 0) {
                if (Verbose)
        close(dumpfd);
        if (dumptime == 0) {
                if (Verbose)

-                       printf("Dump time not found.\n");
+                       printf("Dump time is zero.\n");

                return (0);
        }
        printf("System went down at %s", ctime(&dumptime));
                return (0);
        }
        printf("System went down at %s", ctime(&dumptime));


@@ -304,21 +312,21 @@ check_space()
        struct fs fs;
 
        if (stat(dirname, &dsb) < 0) {
        struct fs fs;
 
        if (stat(dirname, &dsb) < 0) {

-               syslog(LOG_ERR, "%s: %m", dirname);
+               Perror(LOG_ERR, "%s: %m", dirname);

                exit(1);
        }
        ddev = find_dev(dsb.st_dev, S_IFBLK);
        dfd = Open(ddev, O_RDONLY);
                exit(1);
        }
        ddev = find_dev(dsb.st_dev, S_IFBLK);
        dfd = Open(ddev, O_RDONLY);

-       Lseek(dfd, (long)(SBLOCK * DEV_BSIZE), L_SET);
+       Lseek(dfd, SBOFF, L_SET);

        Read(dfd, (char *)&fs, sizeof (fs));
        close(dfd);
        spacefree = freespace(&fs, fs.fs_minfree) * fs.fs_fsize / 1024;
        if (spacefree < read_number("minfree")) {
        Read(dfd, (char *)&fs, sizeof (fs));
        close(dfd);
        spacefree = freespace(&fs, fs.fs_minfree) * fs.fs_fsize / 1024;
        if (spacefree < read_number("minfree")) {

-               syslog(LOG_WARNING, "Dump omitted, not enough space on device");
+               log(LOG_WARNING, "Dump omitted, not enough space on device");

                return (0);
        }
        if (freespace(&fs, fs.fs_minfree) < 0)
                return (0);
        }
        if (freespace(&fs, fs.fs_minfree) < 0)

-               syslog(LOG_WARNING,
+               log(LOG_WARNING,

                    "Dump performed, but free space threshold crossed");
        return (1);
 }
                    "Dump performed, but free space threshold crossed");
        return (1);
 }


@@ -366,13 +374,13 @@ save_core()
        sprintf(cp, "vmcore.%d", bounds);
        ofd = Create(path(cp), 0644);
        Lseek(ifd, (off_t)dumplo, L_SET);
        sprintf(cp, "vmcore.%d", bounds);
        ofd = Create(path(cp), 0644);
        Lseek(ifd, (off_t)dumplo, L_SET);

-       printf("Saving %d bytes of image in vmcore.%d\n", NBPG*dumpsize,
-               bounds);
+       log(LOG_NOTICE, "Saving %d bytes of image in vmcore.%d\n",
+           NBPG*dumpsize, bounds);

        while (dumpsize > 0) {
                n = Read(ifd, cp,
                    (dumpsize > BUFPAGES ? BUFPAGES : dumpsize) * NBPG);
                if (n == 0) {
        while (dumpsize > 0) {
                n = Read(ifd, cp,
                    (dumpsize > BUFPAGES ? BUFPAGES : dumpsize) * NBPG);
                if (n == 0) {

-                       printf("WARNING: core may be incomplete\n");
+                       log(LOG_WARNING, "WARNING: vmcore may be incomplete");

                        break;
                }
                Write(ofd, cp, n);
                        break;
                }
                Write(ofd, cp, n);


@@ -386,32 +394,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.
  */


@@ -423,7 +405,7 @@ Open(name, rw)
 
        fd = open(name, rw);
        if (fd < 0) {
 
        fd = open(name, rw);
        if (fd < 0) {

-               syslog(LOG_ERR, "%s: %m", name);
+               Perror(LOG_ERR, "%s: %m", name);

                exit(1);
        }
        return (fd);
                exit(1);
        }
        return (fd);


@@ -437,7 +419,7 @@ Read(fd, buff, size)
 
        ret = read(fd, buff, size);
        if (ret < 0) {
 
        ret = read(fd, buff, size);
        if (ret < 0) {

-               syslog(LOG_ERR, "read: %m");
+               Perror(LOG_ERR, "read: %m");

                exit(1);
        }
        return (ret);
                exit(1);
        }
        return (ret);


@@ -452,7 +434,7 @@ Lseek(fd, off, flag)
 
        ret = lseek(fd, off, flag);
        if (ret == -1) {
 
        ret = lseek(fd, off, flag);
        if (ret == -1) {

-               syslog(LOG_ERR, "lseek: %m");
+               Perror(LOG_ERR, "lseek: %m");

                exit(1);
        }
        return (ret);
                exit(1);
        }
        return (ret);


@@ -466,7 +448,7 @@ Create(file, mode)
 
        fd = creat(file, mode);
        if (fd < 0) {
 
        fd = creat(file, mode);
        if (fd < 0) {

-               syslog(LOG_ERR, "%s: %m", file);
+               Perror(LOG_ERR, "%s: %m", file);

                exit(1);
        }
        return (fd);
                exit(1);
        }
        return (fd);


@@ -478,7 +460,27 @@ Write(fd, buf, size)
 {
 
        if (write(fd, buf, size) < size) {
 {
 
        if (write(fd, buf, size) < size) {

-               syslog(LOG_ERR, "write: %m");
+               Perror(LOG_ERR, "write: %m");

                exit(1);
        }
 }
                exit(1);
        }
 }

+
+log(level, msg, a1, a2)
+       int level;
+       char *msg;
+{
+
+       fprintf(stderr, msg, a1, a2);
+       syslog(level, msg, a1, a2);
+}
+
+Perror(level, msg, s)
+       int level;
+       char *msg;
+{
+       int oerrno = errno;
+       
+       perror(s);
+       errno = oerrno;
+       syslog(level, msg, s);
+}