.

single stop char.  Stop when any char in the string is hit.
All callers changed.
(find_semicolon): Pass stop chars "#;" to one find_char_unquote call,
instead of using two calls.  If the match is not a ; but a #, return zero.

ChangeLog

@@ -1,5 +1,33 @@
+Fri Mar 10 13:56:49 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* Version 3.72.11.
+
+	* read.c (find_char_unquote): Make second arg a string of stop
+ 	chars instead of a single stop char.  Stop when any char in the
+ 	string is hit.  All callers changed.
+	(find_semicolon): Pass stop chars "#;" to one find_char_unquote call,
+	instead of using two calls.  If the match is not a ; but a #,
+ 	return zero.
+	* misc.c: Changed find_char_unquote callers here too.
+
+	* Version 3.72.10.
+
+	* read.c (read_makefile, parse_file_seq): Fix typo __MS_DOS__ ->
+ 	__MSDOS__.
+
+	* GNUmakefile (globfiles): Add glob/configure.bat.
+	(distfiles): Add configh.dos, configure.bat.
+
 Wed Mar  8 13:10:57 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	Fixes for MS-DOS from DJ Delorie.
+	* read.c (read_makefile, parse_file_seq) [__MS_DOS__]: Don't see :
+ 	as separator in "C:\...".
+	* configh.dos (STDC_HEADERS): Define only if undefined.
+	(HAVE_SYS_PARAM_H): Don't define this.
+	(HAVE_STRERROR): Define this.
+	* job.c (construct_command_argv_internal) [__MSDOS__]: Fix typos.
+
 	* Version 3.72.9.
 
 	* main.c (decode_switches): Reset optind to 1 instead of 0.

GNUmakefile

@@ -152,7 +152,7 @@ $(prog): $(objs) $(globdep) #$(addprefix $(ARCH)/,gmalloc.o mcheck.o)
 	mv -f $@.new $@
 
 globfiles = $(addprefix glob/,COPYING.LIB configure.in configure Makefile.in \
-			glob.c fnmatch.c glob.h fnmatch.h)
+			configure.bat glob.c fnmatch.c glob.h fnmatch.h)
 $(globfiles): stamp-glob ;
 stamp-glob: /home/gd/gnu/libc/posix/glob.tar
 	-rm -rf glob
@@ -223,6 +223,7 @@ tarfiles: $(tarfiles)
 
 distfiles=README INSTALL COPYING ChangeLog NEWS \
           configure Makefile.in configure.in build.sh.in mkinstalldirs \
+	  configh.dos configure.bat \
 	  acconfig.h $(srcs) remote-*.c $(globfiles) \
 	  make.texinfo make-stds.texi \
 	  make.?? make.??s make.toc make.aux make.man texinfo.tex TAGS tags \

README

@@ -1,4 +1,4 @@
-This directory contains the 3.72.9 test release of GNU Make.
+This directory contains the 3.72.10 test release of GNU Make.
 All bugs reported for previous test releases have been fixed.
 Some bugs surely remain.
 

configh.dos.template

@@ -16,7 +16,9 @@
 #define RETSIGTYPE void
 
 /* Define if you have the ANSI C header files.  */
+#ifndef STDC_HEADERS
 #define STDC_HEADERS
+#endif
 
 /* Define if `sys_siglist' is declared by <signal.h>.  */
 #define SYS_SIGLIST_DECLARED
@@ -49,7 +51,7 @@
 #define HAVE_LIMITS_H
 
 /* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H
+#undef HAVE_SYS_PARAM_H
 
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H
@@ -60,6 +62,7 @@
 /* Define if you have the <memory.h> header file.  */
 #define HAVE_MEMORY_H
 
-#define INCLUDEDIR "c:/djgpp/include"
-#define LIBDIR "c:/djgpp/lib"
+/* Define if you have the `strerror' function.  */
+#define HAVE_STRERROR
+
 #define SCCS_GET "get"

job.c

@@ -1497,7 +1497,7 @@ construct_command_argv_internal (line, restp, shell, ifs)
 	 strcat (dos_bname, ".bat");
 	 strcat (dos_bename, ".err");
        }
-     batch = fopen(bename, "w"); /* Create a file.  */
+     batch = fopen (dos_bename, "w"); /* Create a file.  */
      if (batch != NULL)
        fclose (batch);
      batch = fopen (dos_bname, "w");
@@ -1506,7 +1506,7 @@ construct_command_argv_internal (line, restp, shell, ifs)
      fprintf (batch, "\nif errorlevel 1 del %s\n", dos_bename);
      fclose (batch);
      new_argv = (char **) xmalloc(2 * sizeof(char *));
-     new_argv[0] = strdup (bname);
+     new_argv[0] = strdup (dos_bname);
      new_argv[1] = 0;
    }
 #else	/* Not MSDOS.  */

misc.c

@@ -126,7 +126,7 @@ remove_comments (line)
 {
   char *comment;
 
-  comment = find_char_unquote (line, '#', 0);
+  comment = find_char_unquote (line, "#", 0);
 
   if (comment != 0)
     /* Cut off the line at the #.  */

read.c

@@ -723,6 +723,11 @@ read_makefile (filename, flags)
 	      else
 		break;
 	    }
+#ifdef __MSDOS__
+	  /* For MS-DOS, skip a "C:\...".  */
+	  if (p != 0 && p[1] == '\\' && isalpha (p[-1]))
+	    p = 0;
+#endif
 	  if (p != 0)
 	    {
 	      struct nameseq *target;
@@ -1432,9 +1437,9 @@ record_files (filenames, pattern, pattern_percent, deps, commands_started,
    one, or nil if there are none.  */
 
 char *
-find_char_unquote (string, stopchar, blank)
+find_char_unquote (string, stopchars, blank)
      char *string;
-     int stopchar;
+     char *stopchars;
      int blank;
 {
   unsigned int string_len = strlen (string);
@@ -1442,19 +1447,12 @@ find_char_unquote (string, stopchar, blank)
 
   while (1)
     {
-      if (blank)
-	{
-	  while (*p != '\0' && *p != stopchar && !isblank (*p))
-	    ++p;
-	  if (*p == '\0')
-	    break;
-	}
-      else
-	{
-	  p = index (p, stopchar);
-	  if (p == 0)
-	    break;
-	}
+      while (*p != '\0' && index (stopchars, *p) == 0
+	     && (!blank || !isblank (*p)))
+	++p;
+      if (*p == '\0')
+	break;
+
       if (p > string && p[-1] == '\\')
 	{
 	  /* Search for more backslashes.  */
@@ -1488,7 +1486,7 @@ char *
 find_percent (pattern)
      char *pattern;
 {
-  return find_char_unquote (pattern, '%', 0);
+  return find_char_unquote (pattern, "%", 0);
 }
 
 /* Search STRING for an unquoted ; that is not after an unquoted #.  */
@@ -1497,8 +1495,11 @@ static char *
 find_semicolon (string)
      char *string;
 {
-  return (find_char_unquote (string, '#', 0) == 0
-	  ? find_char_unquote (string, ';', 0) : 0);
+  char *match = find_char_unquote (string, ";#", 0);
+  if (match != 0 && *match == '#')
+    /* We found a comment before a semicolon.  No match.  */
+    match = 0;
+  return match;
 }
 
 /* Parse a string into a sequence of filenames represented as a
@@ -1526,6 +1527,9 @@ parse_file_seq (stringp, stopchar, size, strip)
   register char *p = *stringp;
   char *q;
   char *name;
+  char stopchars[2];
+  stopchars[0] = stopchar;
+  stopchars[1] = '\0';
 
   while (1)
     {
@@ -1537,7 +1541,12 @@ parse_file_seq (stringp, stopchar, size, strip)
 	break;
       /* Yes, find end of next name.  */
       q = p;
-      p = find_char_unquote (q, stopchar, 1);
+      p = find_char_unquote (q, stopchars, 1);
+#ifdef __MSDOS__
+      /* For MS-DOS, skip a "C:\...".  */
+      if (stopchar == ':' && p != 0 && p[1] == '\\' && isalpha (p[-1]))
+	p = 0;
+#endif
       if (p == 0)
 	p = q + strlen (q);
 

version.c

@@ -1,4 +1,4 @@
-char *version_string = "3.72.9";
+char *version_string = "3.72.11";
 
 /*
   Local variables: