Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-14 12:30:40 +00:00
Code Issues Projects Releases Wiki Activity

rename log var to log_console so we dont override internal gcc/glibc log func

Browse Source
This commit is contained in:
Mike Frysinger 2005-07-05 02:19:20 +00:00
parent b381009740
commit 72a4c33568
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
init/init.c
View File

@ -156,7 +156,7 @@ static struct init_action *init_action_list = NULL;
static char console[CONSOLE_BUFF_SIZE] = _PATH_CONSOLE; static char console[CONSOLE_BUFF_SIZE] = _PATH_CONSOLE;
#ifndef CONFIG_SYSLOGD #ifndef CONFIG_SYSLOGD
static char *log = VC_5; static char *log_console = VC_5;
#endif #endif
static sig_atomic_t got_cont = 0; static sig_atomic_t got_cont = 0;
static const int LOG = 0x1; static const int LOG = 0x1;
@ -239,9 +239,9 @@ static void message(int device, const char *fmt, ...)
/* Take full control of the log tty, and never close it. /* Take full control of the log tty, and never close it.
* It's mine, all mine! Muhahahaha! */ * It's mine, all mine! Muhahahaha! */
if (log_fd < 0) { if (log_fd < 0) {
if ((log_fd = device_open(log, O_RDWR | O_NDELAY | O_NOCTTY)) < 0) { if ((log_fd = device_open(log_console, O_RDWR | O_NDELAY | O_NOCTTY)) < 0) {
log_fd = -2; log_fd = -2;
bb_error_msg("Bummer, can't write to log on %s!", log); bb_error_msg("Bummer, can't write to log on %s!", log_console);
device = CONSOLE; device = CONSOLE;
} else { } else {
fcntl(log_fd, F_SETFD, FD_CLOEXEC); fcntl(log_fd, F_SETFD, FD_CLOEXEC);
@ -381,7 +381,7 @@ static void console_init(void)
if (fd < 0) { if (fd < 0) {
/* Perhaps we should panic here? */ /* Perhaps we should panic here? */
#ifndef CONFIG_SYSLOGD #ifndef CONFIG_SYSLOGD
log = log_console =
#endif #endif
safe_strncpy(console, "/dev/null", sizeof(console)); safe_strncpy(console, "/dev/null", sizeof(console));
} else { } else {
@ -393,7 +393,7 @@ static void console_init(void)
if (s == NULL || strcmp(s, "linux") == 0) if (s == NULL || strcmp(s, "linux") == 0)
putenv("TERM=vt102"); putenv("TERM=vt102");
#ifndef CONFIG_SYSLOGD #ifndef CONFIG_SYSLOGD
log = console; log_console = console;
#endif #endif
} else { } else {
if (s == NULL) if (s == NULL)