merge with 1.9

diff --git a/lib/getdate.y b/lib/getdate.y
index 1d56904..ff0aa66 100644 (file)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -627,6 +627,8 @@ ToSeconds(Hours, Minutes, Seconds, Meridian)
        if (Hours < 1 || Hours > 12)
            return -1;
        return ((Hours + 12) * 60L + Minutes) * 60L + Seconds;
+    default:
+       abort ();
     }
     /* NOTREACHED */
 }

diff --git a/old/sh-utils/NEWS b/old/sh-utils/NEWS
index 47db619..ef4278c 100644 (file)
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -2,9 +2,10 @@ Major changes in release 1.9:
 * su fails gracefully when getpass is unable to open /dev/tty.
 * printenv and tty detect and report write errors
 * fix bug in stty
-* stty supports accepts the new options status and flush on systems that
-  provide them
-* fix bugs in expr
+* stty accepts the new options status and flush on systems that provide them
+* `expr 1 / 0' gives an error message rather than trying to divide by zero
+* expr's `substr' doesn't overrun malloc'd buffer
+* expr recognizes the string `0' as zero
 * better support for Linux, Dec Alpha, and SGI Irix
 * all programs (even true and false) accept --version and --help options
 * uname's --version option is no longer equivalent to its -v option