d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close line before fork, or becomes close twice.

Browse Source 
Debug output cleanup.
This commit is contained in:
ache 1995-09-15 20:34:55 +00:00
parent fec6394849
commit 58c05ab78e
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
sbin/startslip/startslip.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: startslip.c,v 1.10 1995/09/15 20:06:50 ache Exp $
*/
#ifndef lint
@ -223,30 +223,8 @@ main(argc, argv)
*/
down(3);
}
if (diali > 0)
dialerstring = dials[dialc++ % diali];
/*
* We may get a HUP below, when the parent (session leader/
* controlling process) exits; ignore HUP until into new session.
*/
signal(SIGHUP, SIG_IGN);
hup = 0;
if (fork() > 0) {
if (first)
printd("parent exit\n");
exit(0);
}
if (setsid() < 0) {
syslog(LOG_ERR, "setsid: %m");
down(2);
}
pid = getpid();
printd("restart: pid %ld: ", pid);
if ((pfd = fopen(pidfile, "w")) != NULL) {
fprintf(pfd, "%ld\n", pid);
fclose(pfd);
}
if (wfd) {
printd("fclose, ");
fclose(wfd);
@ -264,11 +242,31 @@ main(argc, argv)
fd = -1;
sleep(5);
}
if (terminate)
goto restart;
if (diali > 0)
dialerstring = dials[dialc++ % diali];
if (fork() > 0) {
if (first)
printd("parent exit\n");
exit(0);
}
if (setsid() < 0) {
syslog(LOG_ERR, "setsid: %m");
down(2);
}
pid = getpid();
printd("restart: pid %ld: ", pid);
if ((pfd = fopen(pidfile, "w")) != NULL) {
fprintf(pfd, "%ld\n", pid);
fclose(pfd);
}
if (tries > 1) {
syslog(LOG_INFO, "sleeping %d seconds (%d tries)",
wait_time * (tries - 1), tries - 1);
wait_time * (tries - 1), tries);
sleep(wait_time * (tries - 1));
if (hup || terminate)
if (terminate)
goto restart;
}
printd("open");
@ -310,7 +308,7 @@ main(argc, argv)
syslog(LOG_ERR, "tcsetpgrp failed: %m");
down(2);
}
printd(", ioctl");
printd(", ioctl\n");
if (tcgetattr(fd, &t) < 0) {
syslog(LOG_ERR, "%s: tcgetattr: %m\n", devicename);
down(2);
@ -345,10 +343,10 @@ main(argc, argv)
}
setbuf(wfd, (char *)0);
if (dialerstring) {
printd(", send dialstring: %s\\r", dialerstring);
printd("send dialstring: %s\\r", dialerstring);
fprintf(wfd, "%s\r", dialerstring);
} else {
printd(", send \\r");
printd("send \\r");
putc('\r', wfd);
}
printd("\n");