0a8812bdc
Bernhard Reutner-Fischer
2006-05-19
Subject
- replace _PATH_DEVNULL with bb_dev_null
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/vfork_daemon_rexec.c+3 -14
| @@ -1,3 +1,4 @@ | |
| + | /* vi: set sw=4 ts=4: */ |
| /* | |
| * Rexec program for system have fork() as vfork() with foreground option | |
| * | |
| @@ -11,19 +12,7 @@ | |
| * | |
| * Modified for uClibc by Erik Andersen <[email protected]> | |
| * | |
| - | * This program is free software; you can redistribute it and/or modify |
| - | * it under the terms of the GNU General Public License as published by |
| - | * the Free Software Foundation; either version 2 of the License, or |
| - | * (at your option) any later version. |
| - | * |
| - | * This program is distributed in the hope that it will be useful, |
| - | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| - | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| - | * General Public License for more details. |
| - | * |
| - | * You should have received a copy of the GNU General Public License |
| - | * along with this program; if not, write to the Free Software |
| - | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| + | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
| */ | |
| #include <unistd.h> | |
| @@ -46,7 +35,7 @@ void vfork_daemon_rexec(int nochdir, int noclose, | |
| if (!nochdir) | |
| chdir("/"); | |
| - | if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) { |
| + | if (!noclose && (fd = open(bb_dev_null, O_RDWR, 0)) != -1) { |
| dup2(fd, STDIN_FILENO); | |
| dup2(fd, STDOUT_FILENO); | |
| dup2(fd, STDERR_FILENO); | |
networking/udhcp/common.c+6 -4
| @@ -42,8 +42,10 @@ long uptime(void) | |
| static inline void sanitize_fds(void) | |
| { | |
| int zero; | |
| - | if ((zero = open(_PATH_DEVNULL, O_RDWR, 0)) < 0) return; |
| - | while (zero < 3) zero = dup(zero); |
| + | if ((zero = open(bb_dev_null, O_RDWR, 0)) < 0) |
| + | return; |
| + | while (zero < 3) |
| + | zero = dup(zero); |
| close(zero); | |
| } | |
| @@ -76,7 +78,7 @@ void udhcp_logging(int level, const char *fmt, ...) | |
| va_start(p, fmt); | |
| __va_copy(p2, p); | |
| - | if(!daemonized) { |
| + | if (!daemonized) { |
| vprintf(fmt, p); | |
| putchar('\n'); | |
| } | |
| @@ -103,7 +105,7 @@ void udhcp_logging(int level, const char *fmt, ...) | |
| va_list p; | |
| va_start(p, fmt); | |
| - | if(!daemonized) { |
| + | if (!daemonized) { |
| printf("%s, ", syslog_level_msg[level]); | |
| vprintf(fmt, p); | |
| putchar('\n'); | |
shell/ash.c+2 -2
| @@ -7147,8 +7147,8 @@ forkchild(struct job *jp, union node *n, int mode) | |
| ignoresig(SIGQUIT); | |
| if (jp->nprocs == 0) { | |
| close(0); | |
| - | if (open(_PATH_DEVNULL, O_RDONLY) != 0) |
| - | sh_error("Can't open %s", _PATH_DEVNULL); |
| + | if (open(bb_dev_null, O_RDONLY) != 0) |
| + | sh_error("Can't open %s", bb_dev_null); |
| } | |
| } | |
| if (!oldlvl && iflag) { | |