4.4BSD snapshot (revision 8.1); add 1993 to copyright

[unix-history] / usr / src / include / paths.h

diff --git a/usr/src/include/paths.h b/usr/src/include/paths.h
index 67641ae..35da488 100644 (file)
--- a/usr/src/include/paths.h
+++ b/usr/src/include/paths.h
@@ -1,18 +1,24 @@
 /*
 /*

- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)paths.h     5.11 (Berkeley) %G%
+ *     @(#)paths.h     8.1 (Berkeley) %G%

  */
 
  */
 

-#define        _PATH_DEFPATH   ":/bin:/usr/bin"
+#ifndef _PATHS_H_
+#define        _PATHS_H_
+
+/* Default search path. */
+#define        _PATH_DEFPATH   "/usr/bin:/bin"
+/* All standard utilities path. */
+#define        _PATH_STDPATH \
+       "/usr/bin:/bin:/usr/sbin:/sbin:/usr/contrib/bin:/usr/old/bin"

 
 #define        _PATH_BSHELL    "/bin/sh"
 #define        _PATH_CONSOLE   "/dev/console"
 #define        _PATH_CSHELL    "/bin/csh"
 
 #define        _PATH_BSHELL    "/bin/sh"
 #define        _PATH_CONSOLE   "/dev/console"
 #define        _PATH_CSHELL    "/bin/csh"

-#define        _PATH_DEV       "/dev/"

 #define        _PATH_DEVDB     "/var/run/dev.db"
 #define        _PATH_DEVNULL   "/dev/null"
 #define        _PATH_DRUM      "/dev/drum"
 #define        _PATH_DEVDB     "/var/run/dev.db"
 #define        _PATH_DEVNULL   "/dev/null"
 #define        _PATH_DRUM      "/dev/drum"


@@ -22,9 +28,16 @@
 #define        _PATH_MEM       "/dev/mem"
 #define        _PATH_NOLOGIN   "/etc/nologin"
 #define        _PATH_SENDMAIL  "/usr/sbin/sendmail"
 #define        _PATH_MEM       "/dev/mem"
 #define        _PATH_NOLOGIN   "/etc/nologin"
 #define        _PATH_SENDMAIL  "/usr/sbin/sendmail"

-#define        _PATH_TMP       "/tmp/"
+#define        _PATH_SHELLS    "/etc/shells"

 #define        _PATH_TTY       "/dev/tty"
 #define        _PATH_UNIX      "/vmunix"
 #define        _PATH_TTY       "/dev/tty"
 #define        _PATH_UNIX      "/vmunix"

-#define        _PATH_VARRUN    "/var/run"
-#define        _PATH_VARTMP    "/var/tmp"

 #define        _PATH_VI        "/usr/bin/vi"
 #define        _PATH_VI        "/usr/bin/vi"

+
+/* Provide trailing slash, since mostly used for building pathnames. */
+#define        _PATH_DEV       "/dev/"
+#define        _PATH_TMP       "/tmp/"
+#define        _PATH_VARDB     "/var/db/"
+#define        _PATH_VARRUN    "/var/run/"
+#define        _PATH_VARTMP    "/var/tmp/"
+
+#endif /* !_PATHS_H_ */