summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archival/gunzip.c2
-rw-r--r--coreutils/nohup.c2
-rw-r--r--e2fsprogs/blkid/cache.c2
-rw-r--r--e2fsprogs/blkid/devname.c2
-rw-r--r--e2fsprogs/blkid/probe.c2
-rw-r--r--e2fsprogs/blkid/resolve.c2
-rw-r--r--e2fsprogs/blkid/save.c2
-rw-r--r--e2fsprogs/e2fsck.c2
-rw-r--r--init/init.c4
-rw-r--r--libbb/messages.c4
-rw-r--r--networking/traceroute.c3
-rw-r--r--shell/msh.c2
12 files changed, 14 insertions, 15 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c
index a4db7ca..76738b0 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -116,7 +116,7 @@ extern int gunzip_main(int argc, char **argv)
/* Set output filename and number */
if (opt & GUNZIP_OPT_TEST) {
- dst_fd = bb_xopen("/dev/null", O_WRONLY); /* why does test use filenum 2 ? */
+ dst_fd = bb_xopen(bb_dev_null, O_WRONLY); /* why does test use filenum 2 ? */
} else if (opt & GUNZIP_OPT_STDOUT) {
dst_fd = STDOUT_FILENO;
} else {
diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index c457bfd..febaf54 100644
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -115,7 +115,7 @@ int nohup_main (int argc, char **argv)
Note that it is deliberately opened for *writing*,
to ensure any read evokes an error. */
if (isatty (STDIN_FILENO))
- fd_reopen (STDIN_FILENO, "/dev/null", 0);
+ fd_reopen (STDIN_FILENO, bb_dev_null, 0);
/* If standard output is a tty, redirect it (appending) to a file.
First try nohup.out, then $HOME/nohup.out. */
diff --git a/e2fsprogs/blkid/cache.c b/e2fsprogs/blkid/cache.c
index 88cc326..0dd1b62 100644
--- a/e2fsprogs/blkid/cache.c
+++ b/e2fsprogs/blkid/cache.c
@@ -111,7 +111,7 @@ int main(int argc, char** argv)
argv[1] ? argv[1] : BLKID_CACHE_FILE);
exit(1);
}
- if ((ret = blkid_get_cache(&cache, "/dev/null")) != 0) {
+ if ((ret = blkid_get_cache(&cache, bb_dev_null)) != 0) {
fprintf(stderr, "%s: error creating cache (%d)\n",
argv[0], ret);
exit(1);
diff --git a/e2fsprogs/blkid/devname.c b/e2fsprogs/blkid/devname.c
index b323021..b5db29e 100644
--- a/e2fsprogs/blkid/devname.c
+++ b/e2fsprogs/blkid/devname.c
@@ -355,7 +355,7 @@ int main(int argc, char **argv)
"Probe all devices and exit\n", argv[0]);
exit(1);
}
- if ((ret = blkid_get_cache(&cache, "/dev/null")) != 0) {
+ if ((ret = blkid_get_cache(&cache, bb_dev_null)) != 0) {
fprintf(stderr, "%s: error creating cache (%d)\n",
argv[0], ret);
exit(1);
diff --git a/e2fsprogs/blkid/probe.c b/e2fsprogs/blkid/probe.c
index 9008dc8..1c30460 100644
--- a/e2fsprogs/blkid/probe.c
+++ b/e2fsprogs/blkid/probe.c
@@ -680,7 +680,7 @@ int main(int argc, char **argv)
"Probe a single device to determine type\n", argv[0]);
exit(1);
}
- if ((ret = blkid_get_cache(&cache, "/dev/null")) != 0) {
+ if ((ret = blkid_get_cache(&cache, bb_dev_null)) != 0) {
fprintf(stderr, "%s: error creating cache (%d)\n",
argv[0], ret);
exit(1);
diff --git a/e2fsprogs/blkid/resolve.c b/e2fsprogs/blkid/resolve.c
index 3dca74f..625782d 100644
--- a/e2fsprogs/blkid/resolve.c
+++ b/e2fsprogs/blkid/resolve.c
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
argv[0], argv[0]);
exit(1);
}
- if (blkid_get_cache(&cache, "/dev/null") < 0) {
+ if (blkid_get_cache(&cache, bb_dev_null) < 0) {
fprintf(stderr, "Couldn't get blkid cache\n");
exit(1);
}
diff --git a/e2fsprogs/blkid/save.c b/e2fsprogs/blkid/save.c
index 1830e45..3fba245 100644
--- a/e2fsprogs/blkid/save.c
+++ b/e2fsprogs/blkid/save.c
@@ -166,7 +166,7 @@ int main(int argc, char **argv)
exit(1);
}
- if ((ret = blkid_get_cache(&cache, "/dev/null")) != 0) {
+ if ((ret = blkid_get_cache(&cache, bb_dev_null)) != 0) {
fprintf(stderr, "%s: error creating cache (%d)\n",
argv[0], ret);
exit(1);
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index fc7e740..42ee8ab 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -15086,7 +15086,7 @@ static void reserve_stdio_fds(void)
int fd;
while (1) {
- fd = open("/dev/null", O_RDWR);
+ fd = open(bb_dev_null, O_RDWR);
if (fd > 2)
break;
if (fd < 0) {
diff --git a/init/init.c b/init/init.c
index 166f526..96c7046 100644
--- a/init/init.c
+++ b/init/init.c
@@ -353,7 +353,7 @@ static void console_init(void)
#ifndef CONFIG_SYSLOGD
log_console =
#endif
- safe_strncpy(console, "/dev/null", sizeof(console));
+ safe_strncpy(console, bb_dev_null, sizeof(console));
} else {
s = getenv("TERM");
/* check for serial console */
@@ -834,7 +834,7 @@ static void new_init_action(int action, const char *command, const char *cons)
/* do not run entries if console device is not available */
if (access(cons, R_OK | W_OK))
return;
- if (strcmp(cons, "/dev/null") == 0 && (action & ASKFIRST))
+ if (strcmp(cons, bb_dev_null) == 0 && (action & ASKFIRST))
return;
new_action = calloc((size_t) (1), sizeof(struct init_action));
diff --git a/libbb/messages.c b/libbb/messages.c
index e6e4dc3..9a77aa6 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -97,7 +97,7 @@ const char * const bb_path_motd_file = MOTD_FILE;
const char * const bb_default_login_shell = LIBBB_DEFAULT_LOGIN_SHELL;
#endif
-#ifdef L_dev_null
-const char * const bb_dev_null = "dev/null";
+#ifdef L_bb_dev_null
+const char * const bb_dev_null = "/dev/null";
#endif
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 15d55e7..d716f2f 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -321,7 +321,6 @@ static int maxpacket = 32 * 1024; /* max ip packet size */
static int pmtu; /* Path MTU Discovery (RFC1191) */
static char *hostname;
-static const char devnull[] = "/dev/null";
static u_short ident;
static u_short port = 32768 + 666; /* start udp dest port # for probe packets */
@@ -1090,7 +1089,7 @@ traceroute_main(int argc, char *argv[])
bb_perror_msg_and_die("unknown protocol %s", cp);
/* Insure the socket fds won't be 0, 1 or 2 */
- do n = bb_xopen(devnull, O_RDONLY); while (n < 2);
+ do n = bb_xopen(bb_dev_null, O_RDONLY); while (n < 2);
if (n > 2)
close(n);
diff --git a/shell/msh.c b/shell/msh.c
index 25c98a4..30ebc7a 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -2714,7 +2714,7 @@ int act;
interactive = 0;
if (pin == NULL) {
close(0);
- open("/dev/null", 0);
+ open(bb_dev_null, 0);
}
_exit(execute(t->left, pin, pout, FEXEC));
}
generated by cgit v1.1 at 2024-12-26 15:21:03 +0000