From c2ee1dcc02035d781d6c70f06df7106979a9f870 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Sat, 9 Dec 2000 09:35:55 +0000
Subject: Add `_PATH_DEVZERO'. Use _PATH_* where where possible.

---
 sbin/atm/fore_dnld/fore_dnld.c | 5 +++--
 sbin/ccdconfig/ccdconfig.c     | 5 +++--
 sbin/fdisk_pc98/fdisk.c        | 5 +++--
 sbin/init/init.c               | 3 ++-
 sbin/pc98/fdisk/fdisk.c        | 5 +++--
 sbin/route/route.c             | 3 ++-
 6 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'sbin')

diff --git a/sbin/atm/fore_dnld/fore_dnld.c b/sbin/atm/fore_dnld/fore_dnld.c
index 1e5b27e..22ce59e 100644
--- a/sbin/atm/fore_dnld/fore_dnld.c
+++ b/sbin/atm/fore_dnld/fore_dnld.c
@@ -52,6 +52,7 @@
 
 #include <ctype.h>
 #include <fcntl.h>
+#include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -73,7 +74,7 @@ extern int pca200e_microcode_size;
 #define	DEV_NAME "/dev/sbus%d"
 #endif	/* sun */
 #if (defined(BSD) && (BSD >= 199103))
-#define	DEV_NAME "/dev/kmem"
+#define	DEV_NAME _PATH_KMEM
 #endif	/* BSD */
 
 #define	MAX_CHECK	60
@@ -1056,7 +1057,7 @@ char *argv[];
 			 * If comm_mode, setup terminal for single char I/O
 			 */
 			if ( comm_mode ) {
-				tty = open ( "/dev/tty", O_RDWR );
+				tty = open ( _PATH_TTY, O_RDWR );
 				ioctl ( tty, TCGETA, &sgtty );
 				sgtty.c_lflag &= ~( ICANON | ECHO );
 				vmin = sgtty.c_cc[VMIN];
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 9203dcc..aea08be 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -48,6 +48,7 @@ static const char rcsid[] =
 #include <fcntl.h>
 #include <kvm.h>
 #include <limits.h>
+#include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -444,9 +445,9 @@ resolve_ccdname(name)
 			free(path);
 			return (NULL);
 		}
-		(void)sprintf(path, "/dev/%s%c", name, 'a' + rawpart);
+		(void)sprintf(path, "%s%s%c", _PATH_DEV, name, 'a' + rawpart);
 	} else
-		(void)sprintf(path, "/dev/%s", name);
+		(void)sprintf(path, "%s%s", _PATH_DEV, name);
 
 	return (path);
 }
diff --git a/sbin/fdisk_pc98/fdisk.c b/sbin/fdisk_pc98/fdisk.c
index 39faadd..9fe2773 100644
--- a/sbin/fdisk_pc98/fdisk.c
+++ b/sbin/fdisk_pc98/fdisk.c
@@ -35,6 +35,7 @@ static const char rcsid[] =
 #include <fcntl.h>
 #include <err.h>
 #include <errno.h>
+#include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -331,11 +332,11 @@ main(int argc, char *argv[])
 	{
 		static char realname[12];
 
-		if(strncmp(argv[0], "/dev", 4) == 0)
+		if(strncmp(argv[0], _PATH_DEV, sizeof _PATH_DEV - 2) == 0)
 			disk = argv[0];
 		else
 		{
-			snprintf(realname, 12, "/dev/%s", argv[0]);
+			snprintf(realname, 12, "%s%s", _PATH_DEV, argv[0]);
 			disk = realname;
 		}
 		
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 3bb51ae..7498608 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -59,6 +59,7 @@ static const char rcsid[] =
 #include <errno.h>
 #include <fcntl.h>
 #include <libutil.h>
+#include <paths.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -283,7 +284,7 @@ invalid:
 		warning("ignoring excess arguments");
 
 	if (devfs) {
-		mount("devfs", "/dev", 0, 0);
+		mount("devfs", _PATH_DEV, 0, 0);
 	}
 
 	/*
diff --git a/sbin/pc98/fdisk/fdisk.c b/sbin/pc98/fdisk/fdisk.c
index 39faadd..9fe2773 100644
--- a/sbin/pc98/fdisk/fdisk.c
+++ b/sbin/pc98/fdisk/fdisk.c
@@ -35,6 +35,7 @@ static const char rcsid[] =
 #include <fcntl.h>
 #include <err.h>
 #include <errno.h>
+#include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -331,11 +332,11 @@ main(int argc, char *argv[])
 	{
 		static char realname[12];
 
-		if(strncmp(argv[0], "/dev", 4) == 0)
+		if(strncmp(argv[0], _PATH_DEV, sizeof _PATH_DEV - 2) == 0)
 			disk = argv[0];
 		else
 		{
-			snprintf(realname, 12, "/dev/%s", argv[0]);
+			snprintf(realname, 12, "%s%s", _PATH_DEV, argv[0]);
 			disk = realname;
 		}
 		
diff --git a/sbin/route/route.c b/sbin/route/route.c
index e6ee088..9c5b8d1 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -66,6 +66,7 @@ static const char rcsid[] =
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -178,7 +179,7 @@ main(argc, argv)
 	pid = getpid();
 	uid = getuid();
 	if (tflag)
-		s = open("/dev/null", O_WRONLY, 0);
+		s = open(_PATH_DEVNULL, O_WRONLY, 0);
 	else
 		s = socket(PF_ROUTE, SOCK_RAW, 0);
 	if (s < 0)
-- 
cgit v1.1