pool/sysvinit
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=120
This commit is contained in:
Dr. Werner Fink 2011-04-19 12:17:03 +00:00 committed by Git OBS Bridge
parent 922425c58c
commit 2fcfe93545
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
showconsole-1.14.dif
View File

@ -127,7 +127,7 @@
.TP .TP
.I /dev/console .I /dev/console
--- libconsole.c --- libconsole.c
+++ libconsole.c 2011-04-19 11:59:52.812425484 +0000 +++ libconsole.c 2011-04-19 12:16:38.307927219 +0000
@@ -59,6 +59,22 @@ @@ -59,6 +59,22 @@
#include "listing.h" #include "listing.h"
@ -307,7 +307,22 @@
error ("select(): %m\n"); error ("select(): %m\n");
goto nothing; goto nothing;
} }
@@ -998,20 +1019,14 @@ void closeIO(void) @@ -898,8 +919,12 @@ void safeIO (void)
(*vr_access)();
vr_access = NULL;
}
- if ((flog = fdopen (log, "a")) == NULL)
- error("Can not open %s: %m\n", BOOT_LOGFILE);
+ lock(&llock);
+ if ((flog = fdopen (log, "a")) == NULL) {
+ unlock(&llock);
+ error("Can not open %s: %m\n", BOOT_LOGFILE);
+ }
+ unlock(&llock);
nsigio = SIGIO; /* We do not need a signal handler */
(void)signal(SIGIO, SIG_IGN);
@@ -998,20 +1023,16 @@ void closeIO(void)
pthread_cancel(lthread); pthread_cancel(lthread);
} }
@ -329,13 +344,15 @@
+ fputc('\n', flog); + fputc('\n', flog);
+ (void)fclose(flog); + (void)fclose(flog);
+ } + }
+ lock(&llock);
flog = NULL; flog = NULL;
-xout: -xout:
+ unlock(&llock);
+ +
if (fdfifo >= 0) { if (fdfifo >= 0) {
close(fdfifo); close(fdfifo);
fdfifo = -1; fdfifo = -1;
@@ -1101,7 +1116,7 @@ static dev_t fallback(const pid_t pid, c @@ -1101,7 +1122,7 @@ static dev_t fallback(const pid_t pid, c
printf("|%u|%u|", tty, ttypgrp); /* stdout to pipe synchronize ... */ printf("|%u|%u|", tty, ttypgrp); /* stdout to pipe synchronize ... */
@ -344,7 +361,7 @@
} break; } break;
case -1: case -1:
error("can not execute: %m\n"); error("can not execute: %m\n");
@@ -1463,6 +1478,10 @@ static void consalloc(struct console *re @@ -1463,6 +1484,10 @@ static void consalloc(struct console *re
return; return;
} }
tail->next = newc; tail->next = newc;