* Various pre-release cleanups.

diff --git a/ChangeLog b/ChangeLog
index 93ed16c..eb0a46a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
+1999-09-07  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * job.c (construct_command_argv_internal) [__MSDOS__]: Add "echo"
+       and "unset" to the list of builtin shell commands.
+
+       * configh.DOS.template (MAKE_HOST): Define to "i386-pc-msdosdjgpp"
+       which is the canonical name of the DJGPP host.
+
 1999-09-05  Paul D. Smith  <psmith@gnu.org>
 
+       * Version 3.77.95 released.
+
        * make.texinfo (Make Errors): Document some new jobserver error
        messages.
 

diff --git a/configh.dos.template b/configh.dos.template
index 0faab42..36fb953 100644 (file)
--- a/configh.dos.template
+++ b/configh.dos.template
@@ -49,4 +49,4 @@
 #define HAVE_VPRINTF 1\r
 \r
 /* Build host information. */\r
-#define MAKE_HOST "DOS (DJGPP)"\r
+#define MAKE_HOST "i386-pc-msdosdjgpp"\r

diff --git a/glob/ChangeLog b/glob/ChangeLog
index 6fa4365..592e7a0 100644 (file)
--- a/glob/ChangeLog
+++ b/glob/ChangeLog
@@ -1,3 +1,7 @@
+1999-09-06  Paul D. Smith  <psmith@gnu.org>
+
+       * fnmatch.c: Update to latest version from GLIBC.
+
 1999-07-21  Paul D. Smith  <psmith@gnu.org>
 
        * glob.c, glob.h, fnmatch.c, fnmatch.h: Update to latest version

diff --git a/glob/fnmatch.c b/glob/fnmatch.c
index 4ad86ff..b1e1b94 100644 (file)
--- a/glob/fnmatch.c
+++ b/glob/fnmatch.c
@@ -132,18 +132,21 @@ extern int errno;
 # if !defined HAVE___STRCHRNUL && !defined _LIBC
 static char *
 __strchrnul (s, c)
-     register const char *s;
+     const char *s;
      int c;
 {
-  c = (unsigned char)c;
-  while (*s && *s != c)
-    ++s;
-  return (char *)s;
+  char *result = strchr (s, c);
+  if (result == NULL)
+    result = strchr (s, '\0');
+  return result;
 }
 # endif
 
 /* Match STRING against the filename pattern PATTERN, returning zero if
    it matches, nonzero if not.  */
+static int internal_fnmatch __P ((const char *pattern, const char *string,
+                                 int no_leading_period, int flags))
+     internal_function;
 static int
 #ifdef _LIBC
 internal_function

diff --git a/job.c b/job.c
index 01a99ae..b656d6c 100644 (file)
--- a/job.c
+++ b/job.c
@@ -1932,11 +1932,12 @@ construct_command_argv_internal (line, restp, shell, ifs, batch_filename_ptr)
                                 "vol", ":", 0 };
 
   static char sh_chars_sh[]  = "#;\"*?[]&|<>(){}$`^";
-  static char *sh_cmds_sh[]  = { "cd", "eval", "exec", "exit", "login",
+  static char *sh_cmds_sh[]  = { "cd", "echo", "eval", "exec", "exit", "login",
                                 "logout", "set", "umask", "wait", "while",
                                 "for", "case", "if", ":", ".", "break",
                                 "continue", "export", "read", "readonly",
-                                "shift", "times", "trap", "switch", 0 };
+                                "shift", "times", "trap", "switch", "unset",
+                                 0 };
 
   char *sh_chars;
   char **sh_cmds;

diff --git a/make.texinfo b/make.texinfo
index 45de763..73ac73f 100644 (file)
--- a/make.texinfo
+++ b/make.texinfo
@@ -9455,7 +9455,7 @@ One of the most common reasons for this message is that you (or perhaps
 your oh-so-helpful editor, as is the case with many MS-Windows editors)
 have attempted to indent your command scripts with spaces instead of a
 TAB character.  In this case, @code{make} will use the second form of
-the error above. Remember that every line in the command script must
+the error above.  Remember that every line in the command script must
 begin with a TAB character.  Eight spaces do not count.  @xref{Rule
 Syntax}.