add pathnames.h

SCCS-vsn: usr.sbin/sa/sa.c 4.11
SCCS-vsn: sbin/savecore/savecore.c 5.15

diff --git a/usr/src/sbin/savecore/savecore.c b/usr/src/sbin/savecore/savecore.c
index 71292a3..451a514 100644 (file)
--- a/usr/src/sbin/savecore/savecore.c
+++ b/usr/src/sbin/savecore/savecore.c
@@ -22,21 +22,22 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

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

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

-#include <stdio.h>
-#include <nlist.h>

 #include <sys/param.h>
 #include <sys/dir.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/file.h>
 #include <sys/syslog.h>
 #include <sys/param.h>
 #include <sys/dir.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/file.h>
 #include <sys/syslog.h>

+#include <stdio.h>
+#include <nlist.h>
+#include "pathnames.h"

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


@@ -212,8 +213,8 @@ read_kmem()
        char *dump_sys;
        int kmem, i;
        
        char *dump_sys;
        int kmem, i;
        

-       dump_sys = system ? system : "/vmunix";
-       nlist("/vmunix", current_nl);
+       dump_sys = system ? system : _PATH_UNIX;
+       nlist(_PATH_UNIX, current_nl);

        nlist(dump_sys, dump_nl);
        /*
         * Some names we need for the currently running system,
        nlist(dump_sys, dump_nl);
        /*
         * Some names we need for the currently running system,


@@ -225,7 +226,7 @@ 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) {

-                       log(LOG_ERR, "/vmunix: %s not in namelist\n",
+                       log(LOG_ERR, "%s: %s not in namelist\n", _PATH_UNIX,

                            current_nl[cursyms[i]].n_name);
                        exit(1);
                }
                            current_nl[cursyms[i]].n_name);
                        exit(1);
                }


@@ -235,7 +236,7 @@ read_kmem()
                            dump_nl[dumpsyms[i]].n_name);
                        exit(1);
                }
                            dump_nl[dumpsyms[i]].n_name);
                        exit(1);
                }

-       kmem = Open("/dev/kmem", O_RDONLY);
+       kmem = Open(_PATH_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);
        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);


@@ -270,7 +271,7 @@ check_kmem()
        fgets(core_vers, sizeof (core_vers), fp);
        fclose(fp);
        if (!eq(vers, core_vers) && system == 0) {
        fgets(core_vers, sizeof (core_vers), fp);
        fclose(fp);
        if (!eq(vers, core_vers) && system == 0) {

-               log(LOG_WARNING, "Warning: vmunix version mismatch:\n");
+               log(LOG_WARNING, "Warning: %s version mismatch:\n", _PATH_UNIX);

                log(LOG_WARNING, "\t%s\n", vers);
                log(LOG_WARNING, "and\t%s\n", core_vers);
        }
                log(LOG_WARNING, "\t%s\n", vers);
                log(LOG_WARNING, "and\t%s\n", core_vers);
        }


@@ -380,7 +381,7 @@ save_core()
                return;
        }
        bounds = read_number("bounds");
                return;
        }
        bounds = read_number("bounds");

-       ifd = Open(system?system:"/vmunix", O_RDONLY);
+       ifd = Open(system ? system : _PATH_UNIX, O_RDONLY);

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

diff --git a/usr/src/usr.sbin/sa/sa.c b/usr/src/usr.sbin/sa/sa.c
index 9e65ff0..1ae2d8a 100644 (file)
--- a/usr/src/usr.sbin/sa/sa.c
+++ b/usr/src/usr.sbin/sa/sa.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)sa.c        4.10 (Berkeley) %G%";
+static char *sccsid = "@(#)sa.c        4.11 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -24,6 +24,7 @@ static char *sccsid = "@(#)sa.c       4.10 (Berkeley) %G%";
 #include <signal.h>
 #include <utmp.h>
 #include <pwd.h>
 #include <signal.h>
 #include <utmp.h>
 #include <pwd.h>

+#include "pathnames.h"

 
 /* interpret command time accounting */
 
 
 /* interpret command time accounting */
 


@@ -250,9 +251,9 @@ char        *getname();
 #define        SAVACCT "./savacct"
 #define        ACCT    "./acct"
 #else
 #define        SAVACCT "./savacct"
 #define        ACCT    "./acct"
 #else

-#define        USRACCT "/usr/adm/usracct"
-#define        SAVACCT "/usr/adm/savacct"
-#define        ACCT    "/usr/adm/acct"
+#define        USRACCT _PATH_USRACCT
+#define        SAVACCT _PATH_SAVACCT
+#define        ACCT    _PATH_ACCT

 #endif DEBUG
 \f
 
 #endif DEBUG
 \f