usage bb_dev_null

This commit is contained in:
"Vladimir N. Oleynik" 2005-10-12 15:34:25 +00:00
parent 86a1073e0b
commit 6c35c7c976
12 changed files with 14 additions and 15 deletions

View File

@ -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 {

View File

@ -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. */

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);
}

View File

@ -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);

View File

@ -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) {

View File

@ -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));

View File

@ -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

View File

@ -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);

View File

@ -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));
}