Move minix/paths.h to paths.h

Also, merge in relevant macros from NetBSD

diff --git a/commands/ash/Makefile b/commands/ash/Makefile
index 86991e8c617faa04cb529d67199ccd283f483fb7..05ed3bc37e64d5b1b81f7e6eb4a9fa1f2f8001d7 100644 (file)
--- a/commands/ash/Makefile
+++ b/commands/ash/Makefile
@@ -31,7 +31,7 @@ YFLAGS=       -d
 EDIT=-DEDITLINE
 
 # Enable this line if your system does not have a <paths.h>
-NO_PATHS_H=-DNO_PATHS_H 
+#NO_PATHS_H=-DNO_PATHS_H
 
 # Enable this if you don't want job control
 NO_JOBS=-DJOBS=0

diff --git a/commands/dhcpd/dhcpd.h b/commands/dhcpd/dhcpd.h
index 11b8d6abd5e21424fb5476f969abd5969302c9db..ba7a1329b510962b7a6bb57675e31b2d1be0638c 100644 (file)
--- a/commands/dhcpd/dhcpd.h
+++ b/commands/dhcpd/dhcpd.h
@@ -5,7 +5,7 @@
 
 #define nil ((void*)0)
 
-#include <minix/paths.h>
+#include <paths.h>
 
 /* Paths to files. */
 #define PATH_DHCPCONF  _PATH_DHCPCONF

diff --git a/commands/diff/diffdir.c b/commands/diff/diffdir.c
index 763e9728ec551dcc426518f378440d333111802e..2d6f091beb193b089b430bbde8fd8284ac59842f 100644 (file)
--- a/commands/diff/diffdir.c
+++ b/commands/diff/diffdir.c
@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
-#include <minix/paths.h>
+#include <paths.h>
 #include <sys/statfs.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/commands/diff/pathnames.h b/commands/diff/pathnames.h
index 958c12314ba4702315a6b648bc48cf1bc556b6d7..ab79dca284da8e0053676637538ccb50b1698a57 100644 (file)
--- a/commands/diff/pathnames.h
+++ b/commands/diff/pathnames.h
@@ -20,6 +20,6 @@
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
-#include <minix/paths.h>
+#include <paths.h>
 
 #define        _PATH_PR        "/usr/bin/pr"

diff --git a/commands/finger/finger.c b/commands/finger/finger.c
index a1ce1fdd33504ef895058f5b4204787314cacb55..ef39187fb88b23b4cf4e2f659e05b904c995d3ff 100644 (file)
--- a/commands/finger/finger.c
+++ b/commands/finger/finger.c
@@ -97,7 +97,7 @@ struct person {                       /* one for each person fingered */
        char hostt[HMAX+1];             /* login host */
 };
 
-#include <minix/paths.h>
+#include <paths.h>
 
 char LASTLOG[] = _PATH_LASTLOG;        /* last login info */
 char USERLOG[] = _PATH_UTMP;           /* who is logged in */

diff --git a/commands/hostaddr/hostaddr.c b/commands/hostaddr/hostaddr.c
index f463a16283aab1a28d0a52f6b66c2d3e8d5daee5..01d7f48076fda036a91a070d7d4068c04ee518e8 100644 (file)
--- a/commands/hostaddr/hostaddr.c
+++ b/commands/hostaddr/hostaddr.c
@@ -30,7 +30,7 @@ Created:      Jan 27, 1992 by Philip Homburg
 #include <net/gen/resolv.h>
 #include <net/gen/dhcp.h>
 
-#include <minix/paths.h>
+#include <paths.h>
 
 char *prog_name;
 

diff --git a/commands/last/last.c b/commands/last/last.c
index 80b085bf983a253ceb45f4a592bce681a591be11..a8094c5c9f47ef37aabd83118ba316a586ba4ec3 100644 (file)
--- a/commands/last/last.c
+++ b/commands/last/last.c
@@ -57,7 +57,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <minix/paths.h>
+#include <paths.h>
 
 #define  FALSE 0
 #define  TRUE  1

diff --git a/commands/login/login.c b/commands/login/login.c
index b720faa492ba9edce87c67c93ac200f8df7a19e6..9f2fd81b47f0a781a4ba0c163bfeb7449e49e701 100644 (file)
--- a/commands/login/login.c
+++ b/commands/login/login.c
@@ -75,7 +75,7 @@
 #include <time.h>
 #include <sys/utsname.h>
 #include <minix/minlib.h>
-#include <minix/paths.h>
+#include <paths.h>
 
 char PATH_UTMP[] = _PATH_UTMP;                 /* current logins */
 char PATH_WTMP[] = _PATH_WTMP;         /* login/logout history */

diff --git a/commands/man/pathnames.h b/commands/man/pathnames.h
index 6de096bf6a03e7c8f3afce541f5ae88729060796..95c2280d478c2d306c6c92b5c69f60d51b146c81 100644 (file)
--- a/commands/man/pathnames.h
+++ b/commands/man/pathnames.h
@@ -31,7 +31,7 @@
  *     @(#)pathnames.h 8.3 (Berkeley) 1/2/94
  */
 
-#include <minix/paths.h>
+#include <paths.h>
 
 #define        _PATH_MANCONF   "/etc/man.conf"
 #define        _PATH_PAGER     "/usr/bin/more -s"

diff --git a/commands/modem/modem.c b/commands/modem/modem.c
index 99ddcf21bbc8145df86a4e3af70fb20fc8a79a33..e3e3119f5d0a34b7b14ade3076c52cbc3c0eaa16 100644 (file)
--- a/commands/modem/modem.c
+++ b/commands/modem/modem.c
@@ -23,7 +23,7 @@
 #include <utmp.h>
 #include <errno.h>
 
-#include <minix/paths.h>
+#include <paths.h>
 
 char PATH_UTMP[] = _PATH_UTMP;                 /* current logins */
 

diff --git a/commands/nonamed/nonamed.c b/commands/nonamed/nonamed.c
index 7dd1d95f4309320ee86750458efde6adeee51268..d713ff788d328b632157983d3d7ec35da583cb00 100644 (file)
--- a/commands/nonamed/nonamed.c
+++ b/commands/nonamed/nonamed.c
@@ -41,7 +41,7 @@ static const char version[] = "2.7";
 #include <net/gen/udp_io.h>
 #include <net/gen/dhcp.h>
 
-#include <minix/paths.h>
+#include <paths.h>
 
 #define HTTL           3600L   /* Default time to live for /etc/hosts data. */
 #define SHORT_TIMEOUT     2    /* If you expect an answer soon. */

diff --git a/commands/patch/pathnames.h b/commands/patch/pathnames.h
index 99182f300f24e8ee1502c72f8b54451a5212f911..e9d3ccbee6ee58dc400838f2ec44538e4e8e7733 100644 (file)
--- a/commands/patch/pathnames.h
+++ b/commands/patch/pathnames.h
@@ -9,6 +9,6 @@
  * on July 29, 2003.
  */
 
-#include <minix/paths.h>
+#include <paths.h>
 
 #define        _PATH_ED                "/bin/ed"

diff --git a/commands/patch/util.c b/commands/patch/util.c
index 0e2032ab68ed640a04abe1fa056553c6b9a6ccad..f7c94a6522073d2170bbfeb7bd4d013bf3df8bfb 100644 (file)
--- a/commands/patch/util.c
+++ b/commands/patch/util.c
@@ -39,7 +39,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
-#include <minix/paths.h>
+#include <paths.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdlib.h>

diff --git a/commands/pax/options.c b/commands/pax/options.c
index 66e963c044b9f6fb098449981ee942d2721c21e9..49b6fde84b562105493442a47a0cdffd2a61bd1d 100644 (file)
--- a/commands/pax/options.c
+++ b/commands/pax/options.c
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
 #include <unistd.h>
 #include <stdlib.h>
 #include <limits.h>
-#include <minix/paths.h>
+#include <paths.h>
 
 #include <sys/types.h>
 #include <string.h>

diff --git a/commands/pax/pax.c b/commands/pax/pax.c
index f249a28d5a51ee661dd3e2bd3ffece5c9454808e..e454e1a45d7e6b67b3a93d775e0285714eb4e790 100644 (file)
--- a/commands/pax/pax.c
+++ b/commands/pax/pax.c
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)pax.c     8.2 (Berkeley) 4/18/94";
 #include <errno.h>
 #include <fcntl.h>
 #include <locale.h>
-#include <minix/paths.h>
+#include <paths.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/commands/ps/ps.c b/commands/ps/ps.c
index 797a43e7f0e6cb75329058878f514baf13299c0b..d3a5e395700282f3e2d964c6946145b96df425cb 100644 (file)
--- a/commands/ps/ps.c
+++ b/commands/ps/ps.c
@@ -53,7 +53,7 @@
 
 #include <minix/config.h>
 #include <minix/endpoint.h>
-#include <minix/paths.h>
+#include <paths.h>
 #include <minix/procfs.h>
 #include <limits.h>
 #include <sys/types.h>
@@ -229,10 +229,10 @@ PRIVATE void getkinfo(void)
        FILE *fp;
 
        if ((fp = fopen("kinfo", "r")) == NULL)
-               err("Unable to open " _PATH_PROC "/kinfo");
+               err("Unable to open " _PATH_PROC "kinfo");
 
        if (fscanf(fp, "%u %u", &nr_procs, &nr_tasks) != 2)
-               err("Unable to read from " _PATH_PROC "/kinfo");
+               err("Unable to read from " _PATH_PROC "kinfo");
 
        fclose(fp);
 }

diff --git a/commands/ramdisk/ramdisk.c b/commands/ramdisk/ramdisk.c
index 560429f788f5be59e1a20c62943112c447d0e79e..cab1b38b979922810f1b0982c1bf6382a662b98f 100644 (file)
--- a/commands/ramdisk/ramdisk.c
+++ b/commands/ramdisk/ramdisk.c
@@ -1,5 +1,5 @@
 
-#include <minix/paths.h>
+#include <paths.h>
 
 #include <sys/ioc_memory.h>
 #include <stdio.h>

diff --git a/commands/service/service.c b/commands/service/service.c
index f7726854ea3579d84822bf08d8e7e5b4296ebb85..c32583dc61de37c1fccbeb64f6b17935291f35bb 100644 (file)
--- a/commands/service/service.c
+++ b/commands/service/service.c
@@ -24,7 +24,7 @@
 #include <minix/rs.h>
 #include <minix/syslib.h>
 #include <minix/bitmap.h>
-#include <minix/paths.h>
+#include <paths.h>
 #include <minix/sef.h>
 #include <minix/dmap.h>
 #include <sys/types.h>

diff --git a/commands/tar/config.h b/commands/tar/config.h
index bc080821e87e667cde4edbd20f240517476227bf..133b6d5bc11e57a31c1b56dac5b2a0e4b2001209 100644 (file)
--- a/commands/tar/config.h
+++ b/commands/tar/config.h
@@ -335,7 +335,7 @@
 /* #undef HAVE_OPENSSL_SHA_H */
 
 /* Define to 1 if you have the <paths.h> header file. */
-/* #undef HAVE_PATHS_H */
+#define HAVE_PATHS_H 1
 
 /* Define to 1 if you have the `pipe' function. */
 #define HAVE_PIPE 1

diff --git a/commands/top/top.c b/commands/top/top.c
index 79f0aad279c163cdcf755ee7dc7f083758e59b52..be90c07f871098ecf8e4ae93557a12dcba860da2 100644 (file)
--- a/commands/top/top.c
+++ b/commands/top/top.c
@@ -33,7 +33,7 @@
 #include <minix/endpoint.h>
 #include <minix/const.h>
 #include <minix/u64.h>
-#include <minix/paths.h>
+#include <paths.h>
 #include <minix/procfs.h>
 
 u32_t system_hz;
@@ -544,12 +544,12 @@ void getkinfo(void)
        FILE *fp;
 
        if ((fp = fopen("kinfo", "r")) == NULL) {
-               fprintf(stderr, "opening " _PATH_PROC "/kinfo failed\n");
+               fprintf(stderr, "opening " _PATH_PROC "kinfo failed\n");
                exit(1);
        }
 
        if (fscanf(fp, "%u %u", &nr_procs, &nr_tasks) != 2) {
-               fprintf(stderr, "reading from " _PATH_PROC "/kinfo failed\n");
+               fprintf(stderr, "reading from " _PATH_PROC "kinfo failed\n");
                exit(1);
        }
 

diff --git a/commands/who/who.c b/commands/who/who.c
index 0989bd29c40cc527b8469d24a469816bb6e002fd..eebeaceea5479ae694e219f8d7a3a115b31e5a44 100644 (file)
--- a/commands/who/who.c
+++ b/commands/who/who.c
@@ -10,7 +10,7 @@
 #include <utmp.h>
 #include <time.h>
 #include <string.h>
-#include <minix/paths.h>
+#include <paths.h>
 
 char PATH_UTMP[] = _PATH_UTMP;
 

diff --git a/commands/write/write.c b/commands/write/write.c
index 36a8a7d99f9c1d8e0e3ad7fc5555d89e57fe1ba1..21402c91858102285784339003a6ea7f28fa4885 100644 (file)
--- a/commands/write/write.c
+++ b/commands/write/write.c
@@ -25,7 +25,7 @@
 #include <utmp.h>
 #include <time.h>
 #include <stdio.h>
-#include <minix/paths.h>
+#include <paths.h>
 
 static char *Version = "@(#) WRITE 1.6 (10/24/92)";
 

diff --git a/include/Makefile b/include/Makefile
index a39997e17ed4dff873859b61062d2726bc4aebae..37a8ca72b975261e169b9903a2d58a801c8660bf 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -10,7 +10,7 @@ INCS= alloca.h ansi.h a.out.h ar.h assert.h configfile.h ctype.h \
        syslog.h tar.h termcap.h termios.h time.h timers.h tools.h \
        ttyent.h ucontext.h unistd.h utime.h utmp.h wchar.h wctype.h \
        hgfs.h tzfile.h util.h fetch.h mpool.h ndbm.h db.h poll.h resolv.h \
-       memory.h
+       memory.h paths.h
 INCS+= arpa/inet.h arpa/nameser.h
 INCS+= minix/a.out.h minix/bitmap.h minix/callnr.h minix/cdrom.h \
        minix/com.h minix/config.h minix/const.h minix/cpufeature.h \
@@ -21,7 +21,7 @@ INCS+=        minix/a.out.h minix/bitmap.h minix/callnr.h minix/cdrom.h \
        minix/drivers.h minix/drvlib.h minix/ds.h minix/endpoint.h \
        minix/fslib.h minix/ioctl.h minix/ipc.h minix/ipcconst.h \
        minix/keymap.h minix/minlib.h minix/mq.h minix/mthread.h \
-       minix/netdriver.h minix/partition.h minix/paths.h \
+       minix/netdriver.h minix/partition.h \
        minix/portio.h minix/priv.h minix/procfs.h minix/profile.h \
        minix/queryparam.h \
        minix/rs.h minix/safecopies.h minix/sched.h minix/sef.h minix/sound.h \

diff --git a/include/minix/paths.h b/include/minix/paths.h
deleted file mode 100644 (file)
index 88a82ef..0000000
--- a/include/minix/paths.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _MINIX_PATHS_H
-#define _MINIX_PATHS_H 1
-
-#define _PATH_DHCPCONF "/etc/dhcp.conf"
-#define _PATH_DHCPPID  "/usr/run/dhcpd.pid"
-#define _PATH_DHCPCACHE        "/usr/adm/dhcp.cache"
-#define _PATH_DHCPPOOL "/usr/adm/dhcp.pool"
-
-#define _PATH_WTMP     "/usr/adm/wtmp"
-#define _PATH_UTMP     "/etc/utmp"
-#define _PATH_LASTLOG  "/usr/adm/lastlog"
-#define _PATH_MOTD     "/etc/motd"
-#define _PATH_HOSTS    "/etc/hosts"
-
-#define    _PATH_DEFTAPE   "/dev/sa0"
-#define    _PATH_RAMDISK   "/dev/ram"
-#define    _PATH_TTY       "/dev/tty"
-#define    _PATH_TMP       "/tmp"
-#define    _PATH_DEVNULL   "/dev/null"
-
-#define _PATH_BSHELL   "/bin/sh"
-#define _PATH_SERVICE  "/bin/service"
-#define _PATH_SYSTEM_CONF      "/etc/system.conf"
-#define _PATH_SYSTEM_CONF_DIR  "/etc/system.conf.d"
-
-#define _PATH_PROC     "/proc"
-
-#endif

diff --git a/include/paths.h b/include/paths.h
new file mode 100644 (file)
index 0000000..6ee679c
--- /dev/null
+++ b/include/paths.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)paths.h     8.1 (Berkeley) 6/2/93
+ */
+
+#ifndef _PATHS_H
+#define _PATHS_H
+
+/* Default search path. */
+#define        _PATH_DEFPATH   "/usr/bin:/bin:/usr/pkg/bin:/usr/local/bin"
+/* All standard utilities path. */
+#define        _PATH_STDPATH \
+       "/usr/bin:/bin:/usr/sbin:/sbin:/usr/pkg/bin:/usr/pkg/sbin:/usr/local/bin:/usr/local/sbin"
+
+#define _PATH_DHCPCONF "/etc/dhcp.conf"
+#define _PATH_DHCPPID  "/usr/run/dhcpd.pid"
+#define _PATH_DHCPCACHE        "/usr/adm/dhcp.cache"
+#define _PATH_DHCPPOOL "/usr/adm/dhcp.pool"
+
+#define _PATH_WTMP     "/usr/adm/wtmp"
+#define _PATH_UTMP     "/etc/utmp"
+#define _PATH_LASTLOG  "/usr/adm/lastlog"
+#define _PATH_MOTD     "/etc/motd"
+#define _PATH_HOSTS    "/etc/hosts"
+
+#define    _PATH_DEFTAPE   "/dev/sa0"
+#define    _PATH_RAMDISK   "/dev/ram"
+#define    _PATH_TTY       "/dev/tty"
+#define    _PATH_DEVNULL   "/dev/null"
+#define    _PATH_CONSOLE   "/dev/console"
+#define    _PATH_KMEM      "/dev/kmem"
+#define    _PATH_MEM       "/dev/mem"
+#define    _PATH_RANDOM    "/dev/random"
+#define    _PATH_URANDOM   "/dev/urandom"
+
+#define _PATH_BSHELL   "/bin/sh"
+#define _PATH_SERVICE  "/bin/service"
+#define _PATH_SYSTEM_CONF      "/etc/system.conf"
+#define _PATH_SYSTEM_CONF_DIR  "/etc/system.conf.d"
+
+/* Provide trailing slash, since mostly used for building pathnames. */
+#define _PATH_DEV      "/dev/"
+#define _PATH_TMP      "/tmp/"
+#define _PATH_PROC     "/proc/"
+
+#endif

diff --git a/lib/libarchive/config.h b/lib/libarchive/config.h
index 9e2a1f6268fbe226d5c5bd7d67b8088e8ac309ab..4b35ca4c140e3bdb2c4abb1e7efb760a94ea7993 100644 (file)
--- a/lib/libarchive/config.h
+++ b/lib/libarchive/config.h
@@ -335,7 +335,7 @@
 /* #undef HAVE_OPENSSL_SHA_H */
 
 /* Define to 1 if you have the <paths.h> header file. */
-/* #undef HAVE_PATHS_H */
+#define HAVE_PATHS_H 1
 
 /* Define to 1 if you have the `pipe' function. */
 #define HAVE_PIPE 1

diff --git a/lib/libc/other/_mount.c b/lib/libc/other/_mount.c
index 8c473ce8b1fc1489a5b5c4137405a641f7f39ef5..38ef0c3e054baf3ce341bd4ccfbbe1a179b74ba9 100644 (file)
--- a/lib/libc/other/_mount.c
+++ b/lib/libc/other/_mount.c
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <minix/syslib.h>
 #include <minix/rs.h>
-#include <minix/paths.h>
+#include <paths.h>
 #define OK     0
 
 #define FSPATH "/sbin/"

diff --git a/lib/libc/other/sysconf.c b/lib/libc/other/sysconf.c
index f70b2f179db335e8cb440594c84f5d0111d68475..ac0124141b393ceada3e2a8f722b07813f22f520 100644 (file)
--- a/lib/libc/other/sysconf.c
+++ b/lib/libc/other/sysconf.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <stdio.h>
-#include <minix/paths.h>
+#include <paths.h>
 
 PRIVATE u32_t get_hz(void)
 {
@@ -19,7 +19,7 @@ PRIVATE u32_t get_hz(void)
   u32_t hz;
   int r;
 
-  if ((fp = fopen(_PATH_PROC "/hz", "r")) != NULL)
+  if ((fp = fopen(_PATH_PROC "hz", "r")) != NULL)
   {
        r = fscanf(fp, "%lu", &hz);
 

diff --git a/lib/libc/posix/getloadavg.c b/lib/libc/posix/getloadavg.c
index c19f3a4d578d147318e8eeaf57a2799a22c92bde..7debfcabbc1093302ef860e445ad365898981aec 100644 (file)
--- a/lib/libc/posix/getloadavg.c
+++ b/lib/libc/posix/getloadavg.c
@@ -1,6 +1,6 @@
 
 #include <sys/types.h>
-#include <minix/paths.h>
+#include <paths.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -17,7 +17,7 @@ int getloadavg(double *loadavg, int nelem)
        return -1;
   }
 
-  if((fp = fopen(_PATH_PROC "/loadavg", "r")) == NULL)
+  if((fp = fopen(_PATH_PROC "loadavg", "r")) == NULL)
        return -1;
 
   for(i = 0; i < nelem; i++)