lots of mickey-mouse things; use syslog; compress nlist checks

[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 a67d283..a4dd681 100644 (file)
--- a/usr/src/sbin/savecore/savecore.c
+++ b/usr/src/sbin/savecore/savecore.c
@@ -1,4 +1,19 @@
-static char *sccsid = "@(#)savecore.c  4.6 (Berkeley) 81/05/20";
+/*
+ * Copyright (c) 1980 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[] =
+"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif not lint
+
+#ifndef lint
+static char sccsid[] = "@(#)savecore.c 5.5 (Berkeley) %G%";
+#endif not lint
+

 /*
  * savecore
  */
 /*
  * savecore
  */


@@ -8,43 +23,63 @@ static       char *sccsid = "@(#)savecore.c  4.6 (Berkeley) 81/05/20";
 #include <sys/param.h>
 #include <sys/dir.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/dir.h>
 #include <sys/stat.h>

-#include <sys/filsys.h>
-#include <time.h>
+#include <sys/time.h>
+#include <sys/file.h>
+#include <syslog.h>

 
 #define        DAY     (60L*60L*24L)
 #define        LEEWAY  (3*DAY)
 
 #define eq(a,b) (!strcmp(a,b))
 
 #define        DAY     (60L*60L*24L)
 #define        LEEWAY  (3*DAY)
 
 #define eq(a,b) (!strcmp(a,b))

+#ifdef vax

 #define ok(number) ((number)&0x7fffffff)
 #define ok(number) ((number)&0x7fffffff)

+#else
+#define ok(number) (number)
+#endif

 
 #define SHUTDOWNLOG "/usr/adm/shutdownlog"
 
 
 #define SHUTDOWNLOG "/usr/adm/shutdownlog"
 

-struct nlist nl[] = {
+struct nlist current_nl[] = {  /* namelist for currently running system */

 #define X_DUMPDEV      0
        { "_dumpdev" },
 #define X_DUMPLO       1
        { "_dumplo" },
 #define X_TIME         2
        { "_time" },
 #define X_DUMPDEV      0
        { "_dumpdev" },
 #define X_DUMPLO       1
        { "_dumplo" },
 #define X_TIME         2
        { "_time" },

-#define X_PHYSMEM      3
-       { "_physmem" },
+#define        X_DUMPSIZE      3
+       { "_dumpsize" },

 #define X_VERSION      4
        { "_version" },
 #define X_PANICSTR     5
        { "_panicstr" },
 #define X_VERSION      4
        { "_version" },
 #define X_PANICSTR     5
        { "_panicstr" },

-       { 0 },
+#define        X_DUMPMAG       6
+       { "_dumpmag" },
+       { "" },

 };
 
 };
 

+struct nlist dump_nl[] = {     /* name list for dumped system */
+       { "_dumpdev" },         /* entries MUST be the same as */
+       { "_dumplo" },          /*      those in current_nl[]  */
+       { "_time" },
+       { "_dumpsize" },
+       { "_version" },
+       { "_panicstr" },
+       { "_dumpmag" },
+       { "" },
+};
+
+char   *system;

 char   *dirname;                       /* directory to save dumps in */
 char   *ddname;                        /* name of dump device */
 char   *find_dev();
 dev_t  dumpdev;                        /* dump device */
 time_t dumptime;                       /* time the dump was taken */
 int    dumplo;                         /* where dump starts on dumpdev */
 char   *dirname;                       /* directory to save dumps in */
 char   *ddname;                        /* name of dump device */
 char   *find_dev();
 dev_t  dumpdev;                        /* dump device */
 time_t dumptime;                       /* time the dump was taken */
 int    dumplo;                         /* where dump starts on dumpdev */

-int    physmem;                        /* amount of memory in machine */
+int    dumpsize;                       /* amount of memory dumped */
+int    dumpmag;                        /* magic number in dump */

 time_t now;                            /* current date */
 char   *path();
 time_t now;                            /* current date */
 char   *path();

-unsigned malloc();
+char   *malloc();

 char   *ctime();
 char   vers[80];
 char   core_vers[80];
 char   *ctime();
 char   vers[80];
 char   core_vers[80];


@@ -52,28 +87,68 @@ char        panic_mesg[80];
 int    panicstr;
 off_t  lseek();
 off_t  Lseek();
 int    panicstr;
 off_t  lseek();
 off_t  Lseek();

+int    Verbose;

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

+       char *cp;

 
 

-       if (argc != 2) {
-               fprintf(stderr, "usage: savecore dirname\n");
-               exit(1);
+       argc--, argv++;
+       while (argc > 0 && argv[0][0] == '-') {
+               for (cp = &argv[0][1]; *cp; cp++) switch (*cp) {
+
+               case 'v':
+                       Verbose++;
+                       break;
+
+               default:
+               usage:
+                       fprintf(stderr,
+                           "usage: savecore [-v] dirname [ system ]\n");
+                       exit(1);
+               }
+               argc--, argv++;

        }
        }

-       dirname = argv[1];
-       if (access(dirname, 2) < 0) {
-               perror(dirname);
+       if (argc != 1 && argc != 2)
+               goto usage;
+       dirname = argv[0];
+       if (argc == 2)
+               system = argv[1];
+       openlog("savecore", LOG_ODELAY, LOG_USER);
+       if (access(dirname, W_OK) < 0) {
+               syslog(LOG_ERR, "%s: %m", dirname);

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

-       (void) time(&now);

        read_kmem();
        read_kmem();

-       log_entry();
-       if (get_crashtime() && check_space())
-               save_core();
-       else
-               exit(1);
+}
+
+dump_exists()
+{
+       register int dumpfd;
+       int word;
+
+       dumpfd = Open(ddname, O_RDONLY);
+       Lseek(dumpfd, (off_t)(dumplo + ok(dump_nl[X_DUMPMAG].n_value)), L_SET);
+       Read(dumpfd, (char *)&word, sizeof (word));
+       close(dumpfd);
+       if (Verbose && word != dumpmag) {
+               printf("dumplo = %d (%d bytes)\n", dumplo/DEV_BSIZE, dumplo);
+               printf("magic number mismatch: %x != %x\n", word, dumpmag);
+       }
+       return (word == dumpmag);
+}
+
+clear_dump()
+{
+       register int dumpfd;
+       int zero = 0;
+
+       dumpfd = Open(ddname, O_WRONLY);
+       Lseek(dumpfd, (off_t)(dumplo + ok(dump_nl[X_DUMPMAG].n_value)), L_SET);
+       Write(dumpfd, (char *)&zero, sizeof (zero));
+       close(dumpfd);

 }
 
 char *
 }
 
 char *


@@ -81,18 +156,10 @@ find_dev(dev, type)
        register dev_t dev;
        register int type;
 {
        register dev_t dev;
        register int type;
 {

-       register int dfd = Open("/dev", 0);
-       struct direct dir;

        struct stat statb;
        struct stat statb;

-       static char devname[DIRSIZ + 1];

        char *dp;
 
        strcpy(devname, "/dev/");
        char *dp;
 
        strcpy(devname, "/dev/");

-       while(Read(dfd, (char *)&dir, sizeof dir) > 0) {
-               if (dir.d_ino == 0)
-                       continue;
-               strncpy(devname + 5, dir.d_name, DIRSIZ);
-               devname[DIRSIZ] = '\0';

                if (stat(devname, &statb)) {
                        perror(devname);
                        continue;
                if (stat(devname, &statb)) {
                        perror(devname);
                        continue;


@@ -100,145 +167,159 @@ find_dev(dev, type)
                if ((statb.st_mode&S_IFMT) != type)
                        continue;
                if (dev == statb.st_rdev) {
                if ((statb.st_mode&S_IFMT) != type)
                        continue;
                if (dev == statb.st_rdev) {

-                       close(dfd);
-                       dp = (char *)malloc(strlen(devname)+1);
+                       dp = malloc(strlen(devname)+1);

                        strcpy(dp, devname);
                        strcpy(dp, devname);

-                       return dp;
+                       return (dp);

                }
        }
                }
        }

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

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

+int    cursyms[] =
+    { X_DUMPDEV, X_DUMPLO, X_VERSION, X_DUMPMAG, -1 };
+int    dumpsyms[] =
+    { X_TIME, X_DUMPSIZE, X_VERSION, X_PANICSTR, X_DUMPMAG, -1 };

 read_kmem()
 {
 read_kmem()
 {

-       int kmem;
-       FILE *fp;

        register char *cp;
        register char *cp;

-
-       nlist("/vmunix", nl);
-       if (nl[X_DUMPDEV].n_value == 0) {
-               fprintf(stderr, "/vmunix: dumpdev not in namelist\n");
-               exit(1);
-       }
-       if (nl[X_DUMPLO].n_value == 0) {
-               fprintf(stderr, "/vmunix: dumplo not in namelist\n");
-               exit(1);
-       }
-       if (nl[X_TIME].n_value == 0) {
-               fprintf(stderr, "/vmunix: time not in namelist\n");
-               exit(1);
-       }
-       if (nl[X_PHYSMEM].n_value == 0) {
-               fprintf(stderr, "/vmunix: physmem not in namelist\n");
-               exit(1);
-       }
-       if (nl[X_VERSION].n_value == 0) {
-               fprintf(stderr, "/vmunix: version not in namelist\n");
-               exit(1);
-       }
-       if (nl[X_PANICSTR].n_value == 0) {
-               fprintf(stderr, "/vmunix: panicstr not in namelist\n");
-               exit(1);
-       }
-       kmem = Open("/dev/kmem", 0);
-       Lseek(kmem, (long)nl[X_DUMPDEV].n_value, 0);
-       Read(kmem, (char *)&dumpdev, sizeof dumpdev);
-       Lseek(kmem, (long)nl[X_DUMPLO].n_value, 0);
-       Read(kmem, (char *)&dumplo, sizeof dumplo);
-       Lseek(kmem, (long)nl[X_PHYSMEM].n_value, 0);
-       Read(kmem, (char *)&physmem, sizeof physmem);
-       dumplo *= 512L;
+       FILE *fp;
+       char *dump_sys;
+       int kmem, i;
+       
+       dump_sys = system ? system : "/vmunix";
+       nlist("/vmunix", current_nl);
+       nlist(dump_sys, dump_nl);
+       /*
+        * Some names we need for the currently running system,
+        * others for the system that was running when the dump was made.
+        * The values obtained from the current system are used
+        * to look for things in /dev/kmem that cannot be found
+        * in the dump_sys namelist, but are presumed to be the same
+        * (since the disk partitions are probably the same!)
+        */
+       for (i = 0; cursyms[i] != -1; i++)
+               if (current_nl[cursyms[i]].n_value == 0) {
+                       syslog(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) {
+                       syslog(LOG_ERR, "%s: %s not in namelist", dump_sys,
+                           dump_nl[dumpsyms[i]].n_name);
+                       exit(1);
+               }
+       kmem = Open("/dev/kmem", O_RDONLY);
+       Lseek(kmem, (long)current_nl[X_DUMPDEV].n_value, L_SET);
+       Read(kmem, (char *)&dumpdev, sizeof (dumpdev));
+       Lseek(kmem, (long)current_nl[X_DUMPLO].n_value, L_SET);
+       Read(kmem, (char *)&dumplo, sizeof (dumplo));
+       Lseek(kmem, (long)current_nl[X_DUMPMAG].n_value, L_SET);
+       Read(kmem, (char *)&dumpmag, sizeof (dumpmag));
+       dumplo *= DEV_BSIZE;

        ddname = find_dev(dumpdev, S_IFBLK);
        ddname = find_dev(dumpdev, S_IFBLK);

-       if ((fp = fdopen(kmem, "r")) == NULL) {
-               fprintf(stderr, "Couldn't fdopen kmem\n");
+       fp = fdopen(kmem, "r");
+       if (fp == NULL) {
+               syslog(LOG_ERR, "Couldn't fdopen kmem");

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

-       fseek(fp, (long)nl[X_VERSION].n_value, 0);
-       fgets(vers, sizeof vers, fp);
+       if (system)
+               return;
+       fseek(fp, (long)current_nl[X_VERSION].n_value, L_SET);
+       fgets(vers, sizeof (vers), fp);

        fclose(fp);
        fclose(fp);

-       if ((fp = fopen(ddname, "r")) == NULL) {
-               perror(ddname);
+}
+
+check_kmem()
+{
+       FILE *fp;
+       register char *cp;
+
+       fp = fopen(ddname, "r");
+       if (fp == NULL) {
+               syslog(LOG_ERR, "%s: %m", ddname);

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

-       fseek(fp, (off_t)(dumplo+ok(nl[X_VERSION].n_value)), 0);
-       fgets(core_vers, sizeof core_vers, fp);
+       fseek(fp, (off_t)(dumplo+ok(dump_nl[X_VERSION].n_value)), L_SET);
+       fgets(core_vers, sizeof (core_vers), fp);

        fclose(fp);
        fclose(fp);

-       if (!eq(vers, core_vers))
-               fprintf(stderr, "Warning: vmunix version mismatch:\n\t%sand\n\t%s",
-                   vers,core_vers);
+       if (!eq(vers, core_vers) && system == 0)
+               fprintf(stderr,
+                  "Warning: vmunix version mismatch:\n\t%sand\n\t%s",
+                  vers, core_vers);

        fp = fopen(ddname, "r");
        fp = fopen(ddname, "r");

-       fseek(fp, (off_t)(dumplo + ok(nl[X_PANICSTR].n_value)), 0);
-       fread((char *)&panicstr, sizeof panicstr, 1, fp);
+       fseek(fp, (off_t)(dumplo + ok(dump_nl[X_PANICSTR].n_value)), L_SET);
+       fread((char *)&panicstr, sizeof (panicstr), 1, fp);

        if (panicstr) {
        if (panicstr) {

-               fseek(fp, dumplo + ok(panicstr), 0);
+               fseek(fp, dumplo + ok(panicstr), L_SET);

                cp = panic_mesg;
                do
                        *cp = getc(fp);
                while (*cp++);
        }
        fclose(fp);
                cp = panic_mesg;
                do
                        *cp = getc(fp);
                while (*cp++);
        }
        fclose(fp);

-}      
+}

 
 get_crashtime()
 {
        int dumpfd;
        time_t clobber = (time_t)0;
 
 
 get_crashtime()
 {
        int dumpfd;
        time_t clobber = (time_t)0;
 

-       dumpfd = Open(ddname, 2);
-       Lseek(dumpfd, (off_t)(dumplo + ok(nl[X_TIME].n_value)), 0);
+       dumpfd = Open(ddname, O_RDONLY);
+       Lseek(dumpfd, (off_t)(dumplo + ok(dump_nl[X_TIME].n_value)), L_SET);

        Read(dumpfd, (char *)&dumptime, sizeof dumptime);
        Read(dumpfd, (char *)&dumptime, sizeof dumptime);

-       Lseek(dumpfd, (off_t)(dumplo + ok(nl[X_TIME].n_value)), 0);
-       Write(dumpfd, (char *)&clobber, sizeof clobber);

        close(dumpfd);
        if (dumptime == 0) {
        close(dumpfd);
        if (dumptime == 0) {

-#ifdef DEBUG
-               printf("dump time is 0\n");
-#endif
-               return 0;
+               if (Verbose)
+                       printf("Dump time not found.\n");
+               return (0);

        }
        printf("System went down at %s", ctime(&dumptime));
        if (dumptime < now - LEEWAY || dumptime > now + LEEWAY) {
        }
        printf("System went down at %s", ctime(&dumptime));
        if (dumptime < now - LEEWAY || dumptime > now + LEEWAY) {

-               printf("Dump time is unreasonable\n");
-               return 0;
+               printf("dump time is unreasonable\n");
+               return (0);

        }
        }

-       return 1;
+       return (1);

 }
 
 char *
 path(file)
        char *file;
 {
 }
 
 char *
 path(file)
        char *file;
 {

-       register char *cp = (char *)malloc(strlen(file) + strlen(dirname) + 2);
+       register char *cp = malloc(strlen(file) + strlen(dirname) + 2);

 
        (void) strcpy(cp, dirname);
        (void) strcat(cp, "/");
        (void) strcat(cp, file);
 
        (void) strcpy(cp, dirname);
        (void) strcat(cp, "/");
        (void) strcat(cp, file);

-       return cp;
+       return (cp);

 }
 
 check_space()
 {
        struct stat dsb;
        register char *ddev;
 }
 
 check_space()
 {
        struct stat dsb;
        register char *ddev;

-       register int dfd;
-       struct filsys sblk;
+       int dfd, spacefree;
+       struct fs fs;

 
        if (stat(dirname, &dsb) < 0) {
 
        if (stat(dirname, &dsb) < 0) {

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

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

-       dfd = Open(ddev, 0);
-       Lseek(dfd, 1L<<BSHIFT, 0);
-       Read(dfd, (char *)&sblk, sizeof sblk);
+       dfd = Open(ddev, O_RDONLY);
+       Lseek(dfd, (long)(SBLOCK * DEV_BSIZE), L_SET);
+       Read(dfd, (char *)&fs, sizeof (fs));

        close(dfd);
        close(dfd);

-       if (read_number("minfree") > sblk.s_tfree) {
-               fprintf(stderr, "Dump omitted, not enough space on device\n");
+       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");

                return (0);
        }
                return (0);
        }

+       if (freespace(&fs, fs.fs_minfree) < 0)
+               syslog(LOG_WARNING,
+                   "Dump performed, but free space threshold crossed");

        return (1);
 }
 
        return (1);
 }
 


@@ -248,51 +329,64 @@ read_number(fn)
        char lin[80];
        register FILE *fp;
 
        char lin[80];
        register FILE *fp;
 

-       if ((fp = fopen(path(fn), "r")) == NULL)
-               return 0;
+       fp = fopen(path(fn), "r");
+       if (fp == NULL)
+               return (0);

        if (fgets(lin, 80, fp) == NULL) {
                fclose(fp);
        if (fgets(lin, 80, fp) == NULL) {
                fclose(fp);

-               return 0;
+               return (0);

        }
        fclose(fp);
        }
        fclose(fp);

-       return atoi(lin);
+       return (atoi(lin));

 }
 
 }
 

+#define        BUFPAGES        (256*1024/NBPG)         /* 1/4 Mb */
+

 save_core()
 {
        register int n;
 save_core()
 {
        register int n;

-       char buffer[32*NBPG];
-       register char *cp = buffer;
+       register char *cp;

        register int ifd, ofd, bounds;
        register FILE *fp;
 
        register int ifd, ofd, bounds;
        register FILE *fp;
 

+       cp = malloc(BUFPAGES*NBPG);
+       if (cp == 0) {
+               fprintf(stderr, "savecore: Can't allocate i/o buffer.\n");
+               return;
+       }

        bounds = read_number("bounds");
        bounds = read_number("bounds");

-       ifd = Open("/vmunix", 0);
-       ofd = Create(path(sprintf(cp, "vmunix.%d", bounds)), 0666);
+       ifd = Open(system?system:"/vmunix", O_RDONLY);

        while((n = Read(ifd, cp, BUFSIZ)) > 0)
                Write(ofd, cp, n);
        close(ifd);
        close(ofd);
        while((n = Read(ifd, cp, BUFSIZ)) > 0)
                Write(ofd, cp, n);
        close(ifd);
        close(ofd);

-       ifd = Open(ddname, 0);
-       ofd = Create(path(sprintf(cp, "vmcore.%d", bounds)), 0666);
-       Lseek(ifd, (off_t)dumplo, 0);
-       printf("Saving %d bytes of image in vmcore.%d\n", NBPG*physmem, bounds);
-       while(physmem > 0) {
-               n = Read(ifd, cp, (physmem > 32 ? 32 : physmem) * NBPG);
+       ifd = Open(ddname, O_RDONLY);
+       Lseek(ifd, (off_t)(dumplo + ok(dump_nl[X_DUMPSIZE].n_value)), L_SET);
+       Read(ifd, (char *)&dumpsize, sizeof (dumpsize));
+       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);
+       while (dumpsize > 0) {
+               n = Read(ifd, cp,
+                   (dumpsize > BUFPAGES ? BUFPAGES : dumpsize) * NBPG);
+               if (n == 0) {
+                       printf("WARNING: core may be incomplete\n");
+                       break;
+               }

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

-               physmem -= n/NBPG;
+               dumpsize -= n/NBPG;

        }
        close(ifd);
        close(ofd);
        fp = fopen(path("bounds"), "w");
        fprintf(fp, "%d\n", bounds+1);
        fclose(fp);
        }
        close(ifd);
        close(ofd);
        fp = fopen(path("bounds"), "w");
        fprintf(fp, "%d\n", bounds+1);
        fclose(fp);

+       free(cp);

 }
 
 }
 

-char *days[] = {
-       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
+char *days[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };

 char *months[] = {
        "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep",
        "Oct", "Nov", "Dec"
 char *months[] = {
        "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep",
        "Oct", "Nov", "Dec"


@@ -303,11 +397,11 @@ log_entry()
        FILE *fp;
        struct tm *tm, *localtime();
 
        FILE *fp;
        struct tm *tm, *localtime();
 

-       tm = localtime(&now);

        fp = fopen("/usr/adm/shutdownlog", "a");
        if (fp == 0)
                return;
        fp = fopen("/usr/adm/shutdownlog", "a");
        if (fp == 0)
                return;

-       fseek(fp, 0L, 2);
+       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);
        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);


@@ -321,18 +415,18 @@ log_entry()
 /*
  * Versions of std routines that exit on error.
  */
 /*
  * Versions of std routines that exit on error.
  */

-

 Open(name, rw)
        char *name;
        int rw;
 {
        int fd;
 
 Open(name, rw)
        char *name;
        int rw;
 {
        int fd;
 

-       if ((fd = open(name, rw)) < 0) {
-               perror(name);
+       fd = open(name, rw);
+       if (fd < 0) {
+               syslog(LOG_ERR, "%s: %m", name);

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

-       return fd;
+       return (fd);

 }
 
 Read(fd, buff, size)
 }
 
 Read(fd, buff, size)


@@ -341,11 +435,12 @@ Read(fd, buff, size)
 {
        int ret;
 
 {
        int ret;
 

-       if ((ret = read(fd, buff, size)) < 0) {
-               perror("read");
+       ret = read(fd, buff, size);
+       if (ret < 0) {
+               syslog(LOG_ERR, "read: %m");

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

-       return ret;
+       return (ret);

 }
 
 off_t
 }
 
 off_t


@@ -355,11 +450,12 @@ Lseek(fd, off, flag)
 {
        long ret;
 
 {
        long ret;
 

-       if ((ret = lseek(fd, off, flag)) == -1L) {
-               perror("lseek");
+       ret = lseek(fd, off, flag);
+       if (ret == -1) {
+               syslog(LOG_ERR, "lseek: %m");

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

-       return ret;
+       return (ret);

 }
 
 Create(file, mode)
 }
 
 Create(file, mode)


@@ -368,21 +464,21 @@ Create(file, mode)
 {
        register int fd;
 
 {
        register int fd;
 

-       if ((fd = creat(file, mode)) < 0) {
-               perror(file);
+       fd = creat(file, mode);
+       if (fd < 0) {
+               syslog(LOG_ERR, "%s: %m", file);

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

-       return fd;
+       return (fd);

 }
 
 Write(fd, buf, size)
        int fd, size;
        char *buf;
 }
 
 Write(fd, buf, size)
        int fd, size;
        char *buf;

-

 {
 
        if (write(fd, buf, size) < size) {
 {
 
        if (write(fd, buf, size) < size) {

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

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