Release GNU Make version 3.99.93.

If we don't do this we'll continually add flags on recursion.  This
is mainly for users to set in their environment before invoking make.

ChangeLog

@@ -1,3 +1,51 @@
+2013-10-01  Paul Smith  <psmith@gnu.org>
+
+	* configure.ac: Update version to 3.99.93.
+	* NEWS: Ditto.
+
+2013-09-30  Paul Smith  <psmith@gnu.org>
+
+	* guile.c: Portability fixes for Guile 1.8.
+
+2013-09-29  Paul Smith  <psmith@gnu.org>
+
+	* output.c (output_dump): Always write Enter/Leave messages to stdio.
+	(log_working_directory): This now always writes to stdio, so we
+	don't need the struct output parameter anymore.
+	(output_start): Show the working directory when output_sync is not
+	set or is recursive.
+	* main.c (main): Ensure the special "already shown Enter message"
+	token is removed from MAKE_RESTARTS before the user can see it.
+	* function.c (func_shell_base): If the output_context stderr
+	exists but is invalid, write to the real stderr.
+	Fixes suggested by Frank Heckenbach <f.heckenbach@fh-soft.de>.
+
+	* output.c: Guard unistd.h inclusion, add io.h.
+	* gnumake.h: Move GMK_EXPORT before the declarations.
+	* make_msvc_net2003.vcproj: Add missing files.
+	Changes for MSVC suggested by Gerte Hoogewerf <g.hoogewerf@gmail.com>
+
+	* function.c (func_shell_base) [EMX]: Fix EMX support for output-sync.
+	* job.c (child_execute_job) [EMX]: Ditto.
+	* job.h (child_execute_job) [EMX]: Ditto.
+	* w32/compat/posixfcn.c: Invert the test for NO_OUTPUT_SYNC.
+
+	* guile.c (GSUBR_TYPE): Pre-2.0 Guile doesn't provide a typedef
+	for gsubr pointers.  Create one.
+	(guile_define_module): Use it.
+	(internal_guile_eval): Force UTF-8 encoding for Guile strings.
+
+	* main.c (main): Clear GNUMAKEFLAGS after parsing, to avoid
+	proliferation of options.
+	* NEWS: Document it.
+	* doc/make.texi (Options/Recursion): Ditto.
+
+2013-09-23  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32/compat/posixfcn.c: Fix the forgotten OUTPUT_SYNC conditional.
+
+	* job.h: Ditto, but in a comment.
+
 2013-09-22  Paul Smith  <psmith@gnu.org>
 
 	* configure.ac: Update version to 3.99.92.

NEWS

@@ -1,6 +1,6 @@
 GNU make NEWS                                               -*-indented-text-*-
   History of user-visible changes.
-  23 Sep 2013
+  1 Oct 2013
 
 See the end of this file for copyrights and conditions.
 
@@ -9,7 +9,7 @@ manual, which is contained in this distribution as the file doc/make.texi.
 See the README file and the GNU make manual for instructions for
 reporting bugs.
 
-Version 3.99.92
+Version 3.99.93
 
 A complete list of bugs fixed in this version is available here:
 
@@ -23,6 +23,14 @@ http://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=101&set
   * Each backslash/newline (plus subsequent whitespace) is converted to a
     single space
 
+* New feature: GNU Guile integration
+  This version of GNU make can be compiled with GNU Guile integration.
+  GNU Guile serves as an embedded extension language for make.
+  See the "Guile Function" section in the GNU Make manual for details.
+  Currently GNU Guile 1.8 and 2.0+ are supported.  In Guile 1.8 there is no
+  support for internationalized character sets.  In Guile 2.0+, scripts can be
+  encoded in UTF-8.
+
 * New command line option: --output-sync (-O) enables grouping of output by
   target or by recursive make.  This is useful during parallel builds to avoid
   mixing output from different jobs together giving hard-to-understand
@@ -47,6 +55,8 @@ http://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=101&set
 
 * New feature: "!=" shell assignment operator as an alternative to the
   $(shell ...) function.  Implemented for compatibility with BSD makefiles.
+  Note there are subtle differences between "!=" and $(shell ...).  See the
+  description in the GNU make manual.
   WARNING: Backward-incompatibility!
   Variables ending in "!" previously defined as "variable!= value" will now be
   interpreted as shell assignment.  Change your assignment to add whitespace
@@ -58,11 +68,6 @@ http://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=101&set
   version of POSIX (see http://austingroupbugs.net/view.php?id=330).  It is
   not necessary to define the .POSIX target to access this operator.
 
-* New feature: GNU Guile integration
-  This version of GNU make can be compiled with GNU Guile integration.
-  GNU Guile serves as an embedded extension language for make.
-  See the "Guile Function" section in the GNU Make manual for details.
-
 * New feature: Loadable objects
   This version of GNU make contains a "technology preview": the ability to
   load dynamic objects into the make runtime.  These objects can be created by
@@ -73,7 +78,8 @@ http://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=101&set
 * New variable: $(GNUMAKEFLAGS) will be parsed for make flags, just like
   MAKEFLAGS is.  It can be set in the environment or the makefile, containing
   GNU make-specific flags to allow your makefile to be portable to other
-  versions of make.  GNU make never sets or modifies GNUMAKEFLAGS.
+  versions of make.  Once this variable is parsed, GNU make will set it to the
+  empty string so that flags will not be duplicated on recursion.
 
 * New variable: `MAKE_HOST' gives the name of the host architecture
   make was compiled for.  This is the same value you see after 'Built for'
@@ -81,8 +87,10 @@ http://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=101&set
 
 * Behavior of MAKEFLAGS and MFLAGS is more rigorously defined.  All simple
   flags are grouped together in the first word of MAKEFLAGS.  No options that
-  accept arguments appear there.  If no simple flags are present MAKEFLAGS
-  begins with a space.  MFLAGS never begins with "- ".
+  accept arguments appear in the first word.  If no simple flags are present
+  MAKEFLAGS begins with a space.  Flags with both short and long versions
+  always use the short versions in MAKEFLAGS.  Flags are listed in
+  alphabetical order using ASCII ordering.  MFLAGS never begins with "- ".
 
 * Setting the -r and -R options in MAKEFLAGS inside a makefile now works as
   expected, removing all built-in rules and variables, respectively.

README.W32.template

@@ -7,7 +7,7 @@ It builds with the MinGW port of GCC (tested with GCC 3.4.2).
 It also builds with MSVC 2.x, 4.x, 5.x, 6.x, and 2003 as well as
 with .NET 7.x and .NET 2003.
 
-As of version 3.83, a build with Guile is supported (tested with Guile
+As of version 4.0, a build with Guile is supported (tested with Guile
 2.0.3).  To build with Guile, you will need, in addition to Guile
 itself, its dependency libraries and the pkg-config program.  The
 latter is used to figure out which compilation and link switches and

TODO.private

@@ -99,30 +99,6 @@ The Rest of the List
     you just can't figure it out.  The way variables are expanded now
     means this isn't 100% trivial, but it probably won't be hard.
 
- 8) Integration of Guile as an embedded scripting language.  This means:
-    allowing Guile functions to be declared in makefiles somehow, then
-    providing a syntax for invoking them.  At least one formulation of
-    that would have the function resolve to a string which would be
-    substituted in the makefile, kind of like $(shell ...) does now, but
-    using the embedded interpreter so there's no process forked of
-    course.  Obviously this is an optional add-on feature.
-
-    It could be more advanced than that, even, who knows?  Maybe make
-    could provide Guile functions that allow Guile scripts more direct
-    access to internal make structures, somehow.  This kind of thing
-    needs a lot of thought.
-
-    Also there's always the flip side: in some very fundamental ways
-    make isn't the best choice right now for a complex build tool.  It's
-    great for simple-to-medium tasks, but there are already other tools
-    available for the really tough situations.  Ask yourself,
-    realistically, how much work is worthwhile to add to make, given the
-    fundamentals you can't really overcome without significantly
-    affecting backward compatibility--and then why not use another tool
-    in the first place?
-
-    Something to think about.
-
 
 -------------------------------------------------------------------------------
 Copyright (C) 1997-2013 Free Software Foundation, Inc.

configure.ac

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([GNU make],[3.99.92],[bug-make@gnu.org])
+AC_INIT([GNU make],[3.99.93],[bug-make@gnu.org])
 
 AC_PREREQ([2.62])
 

doc/make.texi

@@ -4808,10 +4808,17 @@ to GNU @code{make}, and hence do not want to add GNU
 @code{make}-specific flags to the @code{MAKEFLAGS} variable, you can
 add them to the @code{GNUMAKEFLAGS} variable instead.  This variable
 is parsed just before @code{MAKEFLAGS}, in the same way as
-@code{MAKEFLAGS}.  Note, however, that when @code{make} constructs
-@code{MAKEFLAGS} to pass to a recursive @code{make} it will include
-all flags.  GNU @code{make} never sets the @code{GNUMAKEFLAGS}
-variable itself.
+@code{MAKEFLAGS}.  When @code{make} constructs @code{MAKEFLAGS} to
+pass to a recursive @code{make} it will include all flags, even those
+taken from @code{GNUMAKEFLAGS}.  As a result, after parsing
+@code{GNUMAKEFLAGS} GNU @code{make} sets this variable to the empty
+string to avoid duplicating flags during recursion.
+
+It's best to use @code{GNUMAKEFLAGS} only with flags which won't
+materially change the behavior of your makefiles.  If your makefiles
+require GNU make anyway then simply use @code{MAKEFLAGS}.  Flags such
+as @samp{--no-print-directory} or @samp{--output-sync} may be
+appropriate for @code{GNUMAKEFLAGS}.
 
 @node -w Option,  , Options/Recursion, Recursion
 @subsection The @samp{--print-directory} Option

function.c

@@ -1620,7 +1620,7 @@ char *
 func_shell_base (char *o, char **argv, int trim_newlines)
 {
   char *batch_filename = NULL;
-
+  int errfd;
 #ifdef __MSDOS__
   FILE *fpipe;
 #endif
@@ -1636,9 +1636,9 @@ func_shell_base (char *o, char **argv, int trim_newlines)
      are used to run the commands, because we normally refrain from
      creating batch files under -n.  */
   int j_p_f = just_print_flag;
-
   just_print_flag = 0;
 #endif
+
   /* Construct the argument list.  */
   command_argv = construct_command_argv (argv[0], NULL, NULL, 0,
                                          &batch_filename);
@@ -1652,15 +1652,15 @@ func_shell_base (char *o, char **argv, int trim_newlines)
 #endif
 
   /* Using a target environment for 'shell' loses in cases like:
-     export var = $(shell echo foobie)
-     because target_environment hits a loop trying to expand $(var)
-     to put it in the environment.  This is even more confusing when
-     var was not explicitly exported, but just appeared in the
-     calling environment.
+       export var = $(shell echo foobie)
+       bad := $(var)
+     because target_environment hits a loop trying to expand $(var) to put it
+     in the environment.  This is even more confusing when 'var' was not
+     explicitly exported, but just appeared in the calling environment.
 
      See Savannah bug #10593.
 
-  envp = target_environment (NILF);
+  envp = target_environment (NULL);
   */
 
   envp = environ;
@@ -1678,6 +1678,9 @@ func_shell_base (char *o, char **argv, int trim_newlines)
   /* Set up the output in case the shell writes something.  */
   output_start ();
 
+  errfd = (output_context && output_context->err >= 0
+           ? output_context->err : FD_STDERR);
+
 #if defined(__MSDOS__)
   fpipe = msdos_openpipe (pipedes, &pid, argv[0]);
   if (pipedes[0] < 0)
@@ -1710,7 +1713,7 @@ func_shell_base (char *o, char **argv, int trim_newlines)
   CLOSE_ON_EXEC(pipedes[1]);
   CLOSE_ON_EXEC(pipedes[0]);
   /* Never use fork()/exec() here! Use spawn() instead in exec_command() */
-  pid = child_execute_job (FD_STDIN, pipedes[1], FD_STDOUT, command_argv, envp);
+  pid = child_execute_job (FD_STDIN, pipedes[1], errfd, command_argv, envp);
   if (pid < 0)
     perror_with_name (error_prefix, "spawn");
 # else /* ! __EMX__ */
@@ -1724,9 +1727,7 @@ func_shell_base (char *o, char **argv, int trim_newlines)
       if (stack_limit.rlim_cur)
        setrlimit (RLIMIT_STACK, &stack_limit);
 #  endif
-      child_execute_job (FD_STDIN, pipedes[1],
-                         output_context ? output_context->err : FD_STDERR,
-                         command_argv, envp);
+      child_execute_job (FD_STDIN, pipedes[1], errfd, command_argv, envp);
     }
   else
 # endif

gnumake.h

@@ -38,17 +38,17 @@ typedef struct
 #endif
 
 /* Free memory returned by the gmk_expand() function.  */
-void GMK_EXPORT gmk_free (char *str);
+GMK_EXPORT void gmk_free (char *str);
 
 /* Allocate memory in GNU make's context.  */
-char * GMK_EXPORT gmk_alloc (unsigned int len);
+GMK_EXPORT char *gmk_alloc (unsigned int len);
 
 /* Run $(eval ...) on the provided string BUFFER.  */
-void GMK_EXPORT gmk_eval (const char *buffer, const gmk_floc *floc);
+GMK_EXPORT void gmk_eval (const char *buffer, const gmk_floc *floc);
 
 /* Run GNU make expansion on the provided string STR.
    Returns an allocated buffer that the caller must free with gmk_free().  */
-char * GMK_EXPORT gmk_expand (const char *str);
+GMK_EXPORT char *gmk_expand (const char *str);
 
 /* Register a new GNU make function NAME (maximum of 255 chars long).
    When the function is expanded in the makefile, FUNC will be invoked with
@@ -65,7 +65,7 @@ char * GMK_EXPORT gmk_expand (const char *str);
    If EXPAND_ARGS is 0, the arguments to the function will not be expanded
    before FUNC is called.  If EXPAND_ARGS is non-0, they will be expanded.
 */
-void GMK_EXPORT gmk_add_function (const char *name,
+GMK_EXPORT void gmk_add_function (const char *name,
                                   char *(*func)(const char *nm,
                                                 int argc, char **argv),
                                   int min_args, int max_args, int expand_args);

guile.c

@@ -24,6 +24,16 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <libguile.h>
 
+/* Pre-2.0 versions of Guile don't have a typedef for gsubr function types.  */
+#if SCM_MAJOR_VERSION < 2
+# define GSUBR_TYPE         SCM (*) ()
+/* Guile 1.x doesn't really support i18n.  */
+# define EVAL_STRING(_s)    scm_c_eval_string (_s)
+#else
+# define GSUBR_TYPE         scm_t_subr
+# define EVAL_STRING(_s)    scm_eval_string (scm_from_utf8_string (_s))
+#endif
+
 static SCM make_mod = SCM_EOL;
 static SCM obj_to_str = SCM_EOL;
 
@@ -72,10 +82,10 @@ guile_define_module (void *data UNUSED)
 #include "gmk-default.h"
 
   /* Register a subr for GNU make's eval capability.  */
-  scm_c_define_gsubr ("gmk-expand", 1, 0, 0, (scm_t_subr) guile_expand_wrapper);
+  scm_c_define_gsubr ("gmk-expand", 1, 0, 0, (GSUBR_TYPE) guile_expand_wrapper);
 
   /* Register a subr for GNU make's eval capability.  */
-  scm_c_define_gsubr ("gmk-eval", 1, 0, 0, (scm_t_subr) guile_eval_wrapper);
+  scm_c_define_gsubr ("gmk-eval", 1, 0, 0, (GSUBR_TYPE) guile_eval_wrapper);
 
   /* Define the rest of the module.  */
   scm_c_eval_string (GUILE_module_defn);
@@ -100,7 +110,7 @@ guile_init (void *arg UNUSED)
 static void *
 internal_guile_eval (void *arg)
 {
-  return cvt_scm_to_str (scm_c_eval_string (arg));
+  return cvt_scm_to_str (EVAL_STRING (arg));
 }
 
 /* This is the function registered with make  */

job.c

@@ -2234,7 +2234,7 @@ child_execute_job (int stdin_fd, int stdout_fd, int stderr_fd,
   /* Restore stdout/stdin/stderr of the parent and close temporary FDs.  */
   if (save_stdin >= 0)
     {
-      if (dup2 (save_stdin, FD_STDIN) != 0)
+      if (dup2 (save_stdin, FD_STDIN) != FD_STDIN)
         fatal (NILF, _("Could not restore stdin\n"));
       else
         close (save_stdin);
@@ -2242,7 +2242,7 @@ child_execute_job (int stdin_fd, int stdout_fd, int stderr_fd,
 
   if (save_stdout >= 0)
     {
-      if (dup2 (save_stdout, FD_STDOUT) != 0)
+      if (dup2 (save_stdout, FD_STDOUT) != FD_STDOUT)
         fatal (NILF, _("Could not restore stdout\n"));
       else
         close (save_stdout);
@@ -2250,7 +2250,7 @@ child_execute_job (int stdin_fd, int stdout_fd, int stderr_fd,
 
   if (save_stderr >= 0)
     {
-      if (dup2 (save_stderr, FD_STDERR) != 0)
+      if (dup2 (save_stderr, FD_STDERR) != FD_STDERR)
         fatal (NILF, _("Could not restore stderr\n"));
       else
         close (save_stderr);

job.h

@@ -80,7 +80,7 @@ typedef int sync_handle_t;      /* file descriptor */
 #  define RECORD_SYNC_MUTEX(m) (void)(m)
 
 # endif
-#endif  /* !OUTPUT_SYNC */
+#endif  /* !NO_OUTPUT_SYNC */
 
 /* Structure describing a running or dead child process.  */
 
@@ -128,7 +128,7 @@ int child_execute_job (char *argv, struct child *child);
 # define FD_STDERR      (fileno (stderr))
 # if defined(__EMX__)
 int child_execute_job (int stdin_fd, int stdout_fd, int stderr_fd,
-                       char **argv, char **envp)
+                       char **argv, char **envp);
 # else
 void child_execute_job (int stdin_fd, int stdout_fd, int stderr_fd,
                         char **argv, char **envp) __attribute__ ((noreturn));

main.c

@@ -1295,64 +1295,62 @@ main (int argc, char **argv, char **envp)
 
     for (i = 0; envp[i] != 0; ++i)
       {
-        int do_not_define = 0;
+        struct variable *v;
         char *ep = envp[i];
+        /* By default, export all variables culled from the environment.  */
+        enum variable_export export = v_export;
+        unsigned int len;
 
         while (! STOP_SET (*ep, MAP_EQUALS))
           ++ep;
+
+        /* If there's no equals sign it's a malformed environment.  Ignore.  */
+        if (*ep == '\0')
+          continue;
+
 #ifdef WINDOWS32
         if (!unix_path && strneq (envp[i], "PATH=", 5))
           unix_path = ep+1;
         else if (!strnicmp (envp[i], "Path=", 5))
           {
-            do_not_define = 1; /* it gets defined after loop exits */
             if (!windows32_path)
               windows32_path = ep+1;
+            /* PATH gets defined after the loop exits.  */
+            continue;
           }
 #endif
-        /* The result of pointer arithmetic is cast to unsigned int for
-           machines where ptrdiff_t is a different size that doesn't widen
-           the same.  */
-        if (!do_not_define)
+
+        /* Length of the variable name, and skip the '='.  */
+        len = ep++ - envp[i];
+
+        /* If this is MAKE_RESTARTS, check to see if the "already printed
+           the enter statement" flag is set.  */
+        if (len == 13 && strneq (envp[i], "MAKE_RESTARTS", 13))
           {
-            struct variable *v;
-
-            v = define_variable (envp[i], (unsigned int) (ep - envp[i]),
-                                 ep + 1, o_env, 1);
-            /* Force exportation of every variable culled from the
-               environment.  We used to rely on target_environment's
-               v_default code to do this.  But that does not work for the
-               case where an environment variable is redefined in a makefile
-               with 'override'; it should then still be exported, because it
-               was originally in the environment.  */
-            v->export = v_export;
-
-            /* Another wrinkle is that POSIX says the value of SHELL set in
-               the makefile won't change the value of SHELL given to
-               subprocesses.  */
-            if (streq (v->name, "SHELL"))
+            if (*ep == '-')
               {
-#ifndef __MSDOS__
-                v->export = v_noexport;
-#endif
-                shell_var.name = "SHELL";
-                shell_var.length = 5;
-                shell_var.value = xstrdup (ep + 1);
-              }
-
-            /* If MAKE_RESTARTS is set, remember it but don't export it.
-               If it's negative, it means the "enter" message was printed.  */
-            else if (streq (v->name, "MAKE_RESTARTS"))
-              {
-                v->export = v_noexport;
-                if (*(++ep) == '-')
-                  {
-                    OUTPUT_TRACED ();
-                    ++ep;
-                  }
-                restarts = (unsigned int) atoi (ep);
+                OUTPUT_TRACED ();
+                ++ep;
               }
+            restarts = (unsigned int) atoi (ep);
+            export = v_noexport;
           }
+
+        v = define_variable (envp[i], len, ep, o_env, 1);
+
+        /* POSIX says the value of SHELL set in the makefile won't change the
+           value of SHELL given to subprocesses.  */
+        if (streq (v->name, "SHELL"))
+          {
+#ifndef __MSDOS__
+            export = v_noexport;
+#endif
+            shell_var.name = "SHELL";
+            shell_var.length = 5;
+            shell_var.value = xstrdup (ep);
+          }
+
+        v->export = export;
       }
   }
 #ifdef WINDOWS32
@@ -1396,6 +1394,10 @@ main (int argc, char **argv, char **envp)
   /* Decode the switches.  */
 
   decode_env_switches (STRING_SIZE_TUPLE ("GNUMAKEFLAGS"));
+
+  /* Clear GNUMAKEFLAGS to avoid duplication.  */
+  define_variable_cname ("GNUMAKEFLAGS", "", o_env, 0);
+
   decode_env_switches (STRING_SIZE_TUPLE ("MAKEFLAGS"));
 
   /* In output sync mode we need to sync any output generated by reading the
@@ -1931,12 +1933,16 @@ main (int argc, char **argv, char **envp)
 
     /* Decode switches again, for variables set by the makefile.  */
     decode_env_switches (STRING_SIZE_TUPLE ("GNUMAKEFLAGS"));
+
+    /* Clear GNUMAKEFLAGS to avoid duplication.  */
+    define_variable_cname ("GNUMAKEFLAGS", "", o_override, 0);
+
     decode_env_switches (STRING_SIZE_TUPLE ("MAKEFLAGS"));
 #if 0
     decode_env_switches (STRING_SIZE_TUPLE ("MFLAGS"));
 #endif
 
-    /* Reset in case the switches changed our minds.  */
+    /* Reset in case the switches changed our mind.  */
     syncing = (output_sync == OUTPUT_SYNC_LINE
                || output_sync == OUTPUT_SYNC_TARGET);
 

make_msvc_net2003.vcproj

@@ -171,6 +171,9 @@
 			<File
 				RelativePath=".\job.c">
 			</File>
+			<File
+				RelativePath=".\load.c">
+			</File>
 			<File
 				RelativePath=".\output.c">
 			</File>
@@ -210,6 +213,9 @@
 				<File
 					RelativePath=".\w32\compat\dirent.c">
 				</File>
+				<File
+					RelativePath=".\w32\compat\posixfcn.c">
+				</File>
 				<File
 					RelativePath=".\w32\subproc\misc.c">
 					<FileConfiguration

output.c

@@ -22,7 +22,10 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <assert.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <unistd.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
@@ -32,6 +35,7 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef WINDOWS32
 # include <windows.h>
+# include <io.h>
 # include "sub_proc.h"
 #endif /* WINDOWS32 */
 
@@ -92,10 +96,8 @@ _outputs (struct output *out, int is_err, const char *msg)
       while (1)
         {
           EINTRLOOP (r, write (fd, msg, len));
-          if (r == len)
+          if (r == len || r <= 0)
             break;
-          if (r <= 0)
-            return;
           len -= r;
           msg += r;
         }
@@ -106,7 +108,7 @@ _outputs (struct output *out, int is_err, const char *msg)
    left (according to ENTERING) the current directory.  */
 
 static int
-log_working_directory (struct output *out, int entering)
+log_working_directory (int entering)
 {
   static char *buf = NULL;
   static unsigned int len = 0;
@@ -168,7 +170,7 @@ log_working_directory (struct output *out, int entering)
   else
     sprintf (p, fmt, program, makelevel, starting_directory);
 
-  _outputs (out, 0, buf);
+  _outputs (NULL, 0, buf);
 
   return 1;
 }
@@ -387,7 +389,7 @@ output_dump (struct output *out)
 
       /* Log the working directory for this dump.  */
       if (print_directory_flag && output_sync != OUTPUT_SYNC_RECURSE)
-        traced = log_working_directory (output_context, 1);
+        traced = log_working_directory (1);
 
       if (outfd_not_empty)
         pump_from_tmp (out->out, stdout);
@@ -395,7 +397,7 @@ output_dump (struct output *out)
         pump_from_tmp (out->err, stderr);
 
       if (traced)
-        log_working_directory (output_context, 0);
+        log_working_directory (0);
 
       /* Exit the critical section.  */
       if (sem)
@@ -558,7 +560,7 @@ output_close (struct output *out)
   if (! out)
     {
       if (stdio_traced)
-        log_working_directory (NULL, 0);
+        log_working_directory (0);
       return;
     }
 
@@ -579,15 +581,17 @@ void
 output_start ()
 {
 #ifndef NO_OUTPUT_SYNC
-  if (output_context && output_context->syncout && ! OUTPUT_ISSET(output_context))
-    setup_tmpfile (output_context);
+  /* If we're syncing output make sure the temporary file is set up.  */
+  if (output_context && output_context->syncout)
+    if (! OUTPUT_ISSET(output_context))
+      setup_tmpfile (output_context);
 #endif
 
-  if (! output_context || output_sync == OUTPUT_SYNC_RECURSE)
-    {
-      if (! stdio_traced && print_directory_flag)
-        stdio_traced = log_working_directory (NULL, 1);
-    }
+  /* If we're not syncing this output per-line or per-target, make sure we emit
+     the "Entering..." message where appropriate.  */
+  if (output_sync == OUTPUT_SYNC_NONE || output_sync == OUTPUT_SYNC_RECURSE)
+    if (! stdio_traced && print_directory_flag)
+      stdio_traced = log_working_directory (1);
 }
 
 void

tests/ChangeLog

@@ -1,3 +1,18 @@
+2013-09-29  Paul Smith  <psmith@gnu.org>
+
+	* scripts/variables/SHELL: Solaris /bin/sh can't handle options in
+	multiple words; skip that test.
+	* scripts/targets/ONESHELL: Ditto.
+
+	* scripts/variables/GNUMAKEFLAGS: Verify that GNUMAKEFLAGS is
+	cleared and options are not duplicated.
+
+2013-09-23  Paul Smith  <psmith@gnu.org>
+
+	* scripts/options/print-directory: Rename dash-w to
+	print-directory to avoid conflicts with dash-W on case-insensitive
+	filesystems.
+
 2013-09-22  Paul Smith  <psmith@gnu.org>
 
 	* scripts/features/se_implicit: Verify that order-only tokens

tests/scripts/targets/ONESHELL

@@ -4,6 +4,10 @@ $description = "Test the behaviour of the .ONESHELL target.";
 
 $details = "";
 
+# Some shells (*shakes fist at Solaris*) cannot handle multiple flags in
+# separate arguments.
+my $t = `/bin/sh -e -c true 2>/dev/null`;
+my $multi_ok = $? == 0;
 
 # Simple
 
@@ -19,7 +23,8 @@ all:
 
 # Simple but use multi-word SHELLFLAGS
 
-run_make_test(q!
+if ($multi_ok) {
+    run_make_test(q!
 .ONESHELL:
 .SHELLFLAGS = -e -c
 all:
@@ -29,6 +34,7 @@ all:
               '', 'a=$$
 [ 0"$a" -eq "$$" ] || echo fail
 ');
+}
 
 # Again, but this time with inner prefix chars
 

tests/scripts/variables/GNUMAKEFLAGS

@@ -23,4 +23,20 @@ all: ; @echo $(MAKEFLAGS)
 echo erR --trace --no-print-directory
 erR --trace --no-print-directory");
 
+# Verify that re-exec / recursion doesn't duplicate flags from GNUMAKEFLAGS
+
+unlink('x.mk');
+
+$extraENV{GNUMAKEFLAGS} = '-Itst/bad -Oline';
+
+run_make_test(q!
+recurse: ; @echo $@; echo MAKEFLAGS = $$MAKEFLAGS; echo GNUMAKEFLAGS = $$GNUMAKEFLAGS; #MAKEPATH# -f #MAKEFILE# all
+all: ; @echo $@; echo MAKEFLAGS = $$MAKEFLAGS; echo GNUMAKEFLAGS = $$GNUMAKEFLAGS
+-include x.mk
+x.mk: ; @echo $@; echo MAKEFLAGS = $$MAKEFLAGS; echo GNUMAKEFLAGS = $$GNUMAKEFLAGS; echo > $@
+!,
+              "", "x.mk\nMAKEFLAGS = -Itst/bad -Oline\nGNUMAKEFLAGS =\nrecurse\nMAKEFLAGS = -Itst/bad -Oline\nGNUMAKEFLAGS =\n#MAKE#[1]: Entering directory '#PWD#'\nall\nMAKEFLAGS = w -Itst/bad -Oline\nGNUMAKEFLAGS =\n#MAKE#[1]: Leaving directory '#PWD#'\n");
+
+unlink('x.mk');
+
 1;

tests/scripts/variables/SHELL

@@ -71,12 +71,20 @@ all: ; \@$script
               '', $out);
 
 # Do it again but add spaces to SHELLFLAGS
-$flags = '-x -c';
-run_make_test(qq!
+
+# Some shells (*shakes fist at Solaris*) cannot handle multiple flags in
+# separate arguments.
+my $t = `/bin/sh -e -c true 2>/dev/null`;
+my $multi_ok = $? == 0;
+
+if ($multi_ok) {
+    $flags = '-x -c';
+    run_make_test(qq!
 .SHELLFLAGS = $flags
 all: ; \@$script
 !,
               '', $out);
+}
 
 # We can't just use "false" because on different systems it provides a
 # different exit code--once again Solaris: false exits with 255 not 1

w32/compat/posixfcn.c

@@ -26,7 +26,7 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "makeint.h"
 #include "job.h"
 
-#ifdef OUTPUT_SYNC
+#ifndef NO_OUTPUT_SYNC
 /* Support for OUTPUT_SYNC and related functionality.  */
 
 /* Emulation of fcntl that supports only F_GETFD and F_SETLKW.  */
@@ -257,7 +257,7 @@ same_stream (FILE *f1, FILE *f2)
   return 0;
 }
 
-#endif	/* OUTPUT_SYNC */
+#endif	/* !NO_OUTPUT_SYNC */
 
 #if MAKE_LOAD