# HG changeset patch # User Rob Landley # Date 1197236142 21600 # Node ID 571623c6765d83ab1321af7de955d8a70b0b81b5 # Parent e83f92dc44a0f213fc4a063ea15d63269cbbf6b0 Changeset 186 assumed that toys.exitval defaults to 0. Actually change the default and have [p]error_exit() always return nonzero anyway. diff -r e83f92dc44a0 -r 571623c6765d lib/lib.c --- a/lib/lib.c Sun Dec 09 15:32:07 2007 -0600 +++ b/lib/lib.c Sun Dec 09 15:35:42 2007 -0600 @@ -59,7 +59,7 @@ verror_msg(msg, 0, va); va_end(va); - exit(toys.exitval); + exit(!toys.exitval ? 1 : toys.exitval); } @@ -72,7 +72,7 @@ verror_msg(msg, errno, va); va_end(va); - exit(toys.exitval); + exit(!toys.exitval ? 1 : toys.exitval); } // Die unless we can allocate memory. @@ -350,7 +350,6 @@ free(cwd); return rlist; - } // Convert unsigned int to ascii, writing into supplied buffer. A truncated diff -r e83f92dc44a0 -r 571623c6765d main.c --- a/main.c Sun Dec 09 15:32:07 2007 -0600 +++ b/main.c Sun Dec 09 15:35:42 2007 -0600 @@ -68,7 +68,6 @@ toys.which = which; toys.argv = argv; - toys.exitval = 1; if (NEED_OPTIONS && which->options) get_optflags(); else toys.optargs = argv+1; }