check for null pointers; bug report 4.3BSD/etc/35

SCCS-vsn: old/init/init.c 5.8
SCCS-vsn: sbin/init/init.c 5.8

diff --git a/usr/src/old/init/init.c b/usr/src/old/init/init.c
index 8c971a5..51a392b 100644 (file)
--- a/usr/src/old/init/init.c
+++ b/usr/src/old/init/init.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)init.c     5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)init.c     5.8 (Berkeley) %G%";

 #endif not lint
 
 #include <signal.h>
 #endif not lint
 
 #include <signal.h>


@@ -147,7 +147,7 @@ shutdown()
        shutend();
 }
 
        shutend();
 }
 

-char shutfailm[] = "WARNING: Something is hung (wont die); ps axl advised\n";
+char shutfailm[] = "WARNING: Something is hung (won't die); ps axl advised\n";

 
 shutreset()
 {
 
 shutreset()
 {


@@ -201,6 +201,7 @@ single()
                        dup2(0, 1);
                        dup2(0, 2);
                        execl(shell, minus, (char *)0);
                        dup2(0, 1);
                        dup2(0, 2);
                        execl(shell, minus, (char *)0);

+                       perror(shell);

                        exit(0);
                }
                while ((xpid = wait((int *)0)) != pid)
                        exit(0);
                }
                while ((xpid = wait((int *)0)) != pid)


@@ -263,7 +264,7 @@ multiple()
                pid = wait((int *)0);
                if (pid == -1)
                        return;
                pid = wait((int *)0);
                if (pid == -1)
                        return;

-               omask = sigblock(SIGHUP);
+               omask = sigblock(sigmask(SIGHUP));

                for (ALL) {
                        /* must restart window system BEFORE emulator */
                        if (p->wpid == pid || p->wpid == -1)
                for (ALL) {
                        /* must restart window system BEFORE emulator */
                        if (p->wpid == pid || p->wpid == -1)


@@ -309,7 +310,7 @@ merge()
                                p->xflag |= CHANGE;
                                SCPYN(p->comn, t->ty_getty);
                        }
                                p->xflag |= CHANGE;
                                SCPYN(p->comn, t->ty_getty);
                        }

-                       if (SCMPN(p->wcmd, t->ty_window)) {
+                       if (SCMPN(p->wcmd, t->ty_window ? t->ty_window : "")) {

                                p->xflag |= WCHANGE|CHANGE;
                                SCPYN(p->wcmd, t->ty_window);
                        }
                                p->xflag |= WCHANGE|CHANGE;
                                SCPYN(p->wcmd, t->ty_window);
                        }


@@ -338,7 +339,7 @@ merge()
                SCPYN(p->line, t->ty_name);
                p->xflag |= FOUND|CHANGE;
                SCPYN(p->comn, t->ty_getty);
                SCPYN(p->line, t->ty_name);
                p->xflag |= FOUND|CHANGE;
                SCPYN(p->comn, t->ty_getty);

-               if (strcmp(t->ty_window, "") != 0) {
+               if (t->ty_window && strcmp(t->ty_window, "") != 0) {

                        p->xflag |= WCHANGE;
                        SCPYN(p->wcmd, t->ty_window);
                }
                        p->xflag |= WCHANGE;
                        SCPYN(p->wcmd, t->ty_window);
                }


@@ -386,8 +387,6 @@ term(p)
                kill(p->wpid, SIGHUP);
 }
 
                kill(p->wpid, SIGHUP);
 }
 

-#include <sys/ioctl.h>
-

 dfork(p)
        struct tab *p;
 {
 dfork(p)
        struct tab *p;
 {

diff --git a/usr/src/sbin/init/init.c b/usr/src/sbin/init/init.c
index 8c971a5..51a392b 100644 (file)
--- a/usr/src/sbin/init/init.c
+++ b/usr/src/sbin/init/init.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)init.c     5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)init.c     5.8 (Berkeley) %G%";

 #endif not lint
 
 #include <signal.h>
 #endif not lint
 
 #include <signal.h>


@@ -147,7 +147,7 @@ shutdown()
        shutend();
 }
 
        shutend();
 }
 

-char shutfailm[] = "WARNING: Something is hung (wont die); ps axl advised\n";
+char shutfailm[] = "WARNING: Something is hung (won't die); ps axl advised\n";

 
 shutreset()
 {
 
 shutreset()
 {


@@ -201,6 +201,7 @@ single()
                        dup2(0, 1);
                        dup2(0, 2);
                        execl(shell, minus, (char *)0);
                        dup2(0, 1);
                        dup2(0, 2);
                        execl(shell, minus, (char *)0);

+                       perror(shell);

                        exit(0);
                }
                while ((xpid = wait((int *)0)) != pid)
                        exit(0);
                }
                while ((xpid = wait((int *)0)) != pid)


@@ -263,7 +264,7 @@ multiple()
                pid = wait((int *)0);
                if (pid == -1)
                        return;
                pid = wait((int *)0);
                if (pid == -1)
                        return;

-               omask = sigblock(SIGHUP);
+               omask = sigblock(sigmask(SIGHUP));

                for (ALL) {
                        /* must restart window system BEFORE emulator */
                        if (p->wpid == pid || p->wpid == -1)
                for (ALL) {
                        /* must restart window system BEFORE emulator */
                        if (p->wpid == pid || p->wpid == -1)


@@ -309,7 +310,7 @@ merge()
                                p->xflag |= CHANGE;
                                SCPYN(p->comn, t->ty_getty);
                        }
                                p->xflag |= CHANGE;
                                SCPYN(p->comn, t->ty_getty);
                        }

-                       if (SCMPN(p->wcmd, t->ty_window)) {
+                       if (SCMPN(p->wcmd, t->ty_window ? t->ty_window : "")) {

                                p->xflag |= WCHANGE|CHANGE;
                                SCPYN(p->wcmd, t->ty_window);
                        }
                                p->xflag |= WCHANGE|CHANGE;
                                SCPYN(p->wcmd, t->ty_window);
                        }


@@ -338,7 +339,7 @@ merge()
                SCPYN(p->line, t->ty_name);
                p->xflag |= FOUND|CHANGE;
                SCPYN(p->comn, t->ty_getty);
                SCPYN(p->line, t->ty_name);
                p->xflag |= FOUND|CHANGE;
                SCPYN(p->comn, t->ty_getty);

-               if (strcmp(t->ty_window, "") != 0) {
+               if (t->ty_window && strcmp(t->ty_window, "") != 0) {

                        p->xflag |= WCHANGE;
                        SCPYN(p->wcmd, t->ty_window);
                }
                        p->xflag |= WCHANGE;
                        SCPYN(p->wcmd, t->ty_window);
                }


@@ -386,8 +387,6 @@ term(p)
                kill(p->wpid, SIGHUP);
 }
 
                kill(p->wpid, SIGHUP);
 }
 

-#include <sys/ioctl.h>
-

 dfork(p)
        struct tab *p;
 {
 dfork(p)
        struct tab *p;
 {