Call _exit() instead of exit() if exec*() fails

[st.git] / st.c

diff --git a/st.c b/st.c
index bcf96e9..4499be6 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1158,7 +1158,10 @@ execsh(void) {
                        die("who are you?\n");
        }
 
-       sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
+       if (!(sh = getenv("SHELL"))) {
+               sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
+       }
+
        if(opt_cmd)
                prog = opt_cmd[0];
        else if(utmp)
@@ -1187,7 +1190,7 @@ execsh(void) {
        signal(SIGALRM, SIG_DFL);
 
        execvp(prog, args);
-       exit(EXIT_FAILURE);
+       _exit(EXIT_FAILURE);
 }
 
 void
@@ -2576,7 +2579,10 @@ tputc(char *c, int len) {
                unicodep = ascii = *c;
        } else {
                utf8decode(c, &unicodep, UTF_SIZ);
-               width = wcwidth(unicodep);
+               if ((width = wcwidth(unicodep)) == -1) {
+                       c = "\357\277\275";     /* UTF_INVALID */
+                       width = 1;
+               }
                control = ISCONTROLC1(unicodep);
                ascii = unicodep;
        }
@@ -3136,8 +3142,8 @@ xinit(void) {
                | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
        xw.attrs.colormap = xw.cmap;
 
-       parent = opt_embed ? strtol(opt_embed, NULL, 0) : \
-                       XRootWindow(xw.dpy, xw.scr);
+       if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
+               parent = XRootWindow(xw.dpy, xw.scr);
        xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity