summaryrefslogtreecommitdiffabout
path: root/src/ctl.c
authorSergey Poznyakoff <gray@gnu.org>2015-12-19 22:50:52 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2015-12-19 22:59:25 (GMT)
commitd479bd2f63445524253e16d8575a0592c266908d (patch) (side-by-side diff)
treeaae2188767328ee7dac100e14ad58ec75eeb35e5 /src/ctl.c
parent84e4b3d5274c599ed30482bfe2ca8af080d936af (diff)
downloadpies-d479bd2f63445524253e16d8575a0592c266908d.tar.gz
pies-d479bd2f63445524253e16d8575a0592c266908d.tar.bz2
Bugfixes in init mode
* src/ctl.c (ctl_open): Add missing return. * src/pies.c (config_parse): Return if tree is null. (main) [INIT_EMU]: Print more info. Override default init_fifo. Don't use syslog and control socket if running as init process. * src/pies.h (init_fifo): New extern. * src/progman.c (open_redirector): Return -1 if running as init process. (prog_start): Always initialize redir[]. * src/sysvinit.c (init_fifo): New variable. Use it instead if the INIT_FIFO macro. (inittrans): Call create_fifo once, when transiting from boot to normal state.
Diffstat (limited to 'src/ctl.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/ctl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ctl.c b/src/ctl.c
index bd8fa53..a640d1f 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -1190,6 +1190,7 @@ ctl_open ()
{
logmsg (LOG_CRIT, _("%s: cannot create URL: %s"),
str, strerror (errno));
+ return;
}
free (str);
}
@@ -1197,7 +1198,8 @@ ctl_open ()
fd = create_socket (control.url, SOCK_STREAM, NULL, 077);
if (fd == -1)
{
- logmsg (LOG_CRIT, _("can't create control socket %s"), control.url->string);
+ logmsg (LOG_CRIT, _("can't create control socket %s"),
+ control.url->string);
exit (EX_UNAVAILABLE);
}

Return to:

Send suggestions and report system problems to the System administrator.