Add error message when child exits whit error

[st.git] / st.c

diff --git a/st.c b/st.c
index b221f33..45bc89d 100644 (file)
--- a/st.c
+++ b/st.c
@@ -89,19 +89,18 @@ char *argv0;
 #define VT102ID "\033[?6c"
 
 enum glyph_attribute {
 #define VT102ID "\033[?6c"
 
 enum glyph_attribute {

-        ATTR_NULL      = 0,
+       ATTR_NULL      = 0,

        ATTR_BOLD      = 1,
        ATTR_FAINT     = 2,
        ATTR_ITALIC    = 4,
        ATTR_UNDERLINE = 8,
        ATTR_BLINK     = 16,
        ATTR_BOLD      = 1,
        ATTR_FAINT     = 2,
        ATTR_ITALIC    = 4,
        ATTR_UNDERLINE = 8,
        ATTR_BLINK     = 16,

-       ATTR_FASTBLINK = 32,
-       ATTR_REVERSE   = 64,
-       ATTR_INVISIBLE = 128,
-       ATTR_STRUCK    = 256,
-       ATTR_WRAP      = 512,
-       ATTR_WIDE      = 1024,
-       ATTR_WDUMMY    = 2048,
+       ATTR_REVERSE   = 32,
+       ATTR_INVISIBLE = 64,
+       ATTR_STRUCK    = 128,
+       ATTR_WRAP      = 256,
+       ATTR_WIDE      = 512,
+       ATTR_WDUMMY    = 1024,

 };
 
 enum cursor_movement {
 };
 
 enum cursor_movement {


@@ -1177,16 +1176,15 @@ execsh(void) {
 
 void
 sigchld(int a) {
 
 void
 sigchld(int a) {

-       int stat = 0;
+       int stat, ret;

 
        if(waitpid(pid, &stat, 0) < 0)
                die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
 
 
        if(waitpid(pid, &stat, 0) < 0)
                die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
 

-       if(WIFEXITED(stat)) {
-               exit(WEXITSTATUS(stat));
-       } else {
-               exit(EXIT_FAILURE);
-       }
+       ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE;
+       if (ret != EXIT_SUCCESS)
+               die("child finished with error '%d'\n", stat);
+       exit(EXIT_SUCCESS);

 }
 
 void
 }
 
 void


@@ -1684,7 +1682,6 @@ tsetattr(int *attr, int l) {
                                ATTR_ITALIC     |
                                ATTR_UNDERLINE  |
                                ATTR_BLINK      |
                                ATTR_ITALIC     |
                                ATTR_UNDERLINE  |
                                ATTR_BLINK      |

-                               ATTR_FASTBLINK  |

                                ATTR_REVERSE    |
                                ATTR_INVISIBLE  |
                                ATTR_STRUCK     );
                                ATTR_REVERSE    |
                                ATTR_INVISIBLE  |
                                ATTR_STRUCK     );


@@ -1704,10 +1701,9 @@ tsetattr(int *attr, int l) {
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                case 5: /* slow blink */
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                case 5: /* slow blink */

-                       term.c.attr.mode |= ATTR_BLINK;
-                       break;
+                       /* FALLTHROUGH */

                case 6: /* rapid blink */
                case 6: /* rapid blink */

-                       term.c.attr.mode |= ATTR_FASTBLINK;
+                       term.c.attr.mode |= ATTR_BLINK;

                        break;
                case 7:
                        term.c.attr.mode |= ATTR_REVERSE;
                        break;
                case 7:
                        term.c.attr.mode |= ATTR_REVERSE;


@@ -1718,11 +1714,8 @@ tsetattr(int *attr, int l) {
                case 9:
                        term.c.attr.mode |= ATTR_STRUCK;
                        break;
                case 9:
                        term.c.attr.mode |= ATTR_STRUCK;
                        break;

-               case 21:
-                       term.c.attr.mode &= ~ATTR_BOLD;
-                       break;

                case 22:
                case 22:

-                       term.c.attr.mode &= ~ATTR_FAINT;
+                       term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT);

                        break;
                case 23:
                        term.c.attr.mode &= ~ATTR_ITALIC;
                        break;
                case 23:
                        term.c.attr.mode &= ~ATTR_ITALIC;


@@ -1733,9 +1726,6 @@ tsetattr(int *attr, int l) {
                case 25:
                        term.c.attr.mode &= ~ATTR_BLINK;
                        break;
                case 25:
                        term.c.attr.mode &= ~ATTR_BLINK;
                        break;

-               case 26:
-                       term.c.attr.mode &= ~ATTR_FASTBLINK;
-                       break;

                case 27:
                        term.c.attr.mode &= ~ATTR_REVERSE;
                        break;
                case 27:
                        term.c.attr.mode &= ~ATTR_REVERSE;
                        break;


@@ -3786,6 +3776,8 @@ run(void) {
        /* Waiting for window mapping */
        while(1) {
                XNextEvent(xw.dpy, &ev);
        /* Waiting for window mapping */
        while(1) {
                XNextEvent(xw.dpy, &ev);

+               if(XFilterEvent(&ev, None))
+                       continue;

                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;
                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;