[BACK]Return to job.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / usr.bin / make

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/usr.bin/make/job.c between version 1.162 and 1.163

version 1.162, 2012/06/12 19:21:50 version 1.163, 2012/07/03 21:03:40
Line 2423  Job_ParseShell(char *line)
Line 2423  Job_ParseShell(char *line)
          * If no path was given, the user wants one of the pre-defined shells,           * If no path was given, the user wants one of the pre-defined shells,
          * yes? So we find the one s/he wants with the help of JobMatchShell           * yes? So we find the one s/he wants with the help of JobMatchShell
          * and set things up the right way. shellPath will be set up by           * and set things up the right way. shellPath will be set up by
          * Job_Init.           * Shell_Init.
          */           */
         if (newShell.name == NULL) {          if (newShell.name == NULL) {
             Parse_Error(PARSE_FATAL, "Neither path nor name specified");              Parse_Error(PARSE_FATAL, "Neither path nor name specified");
Line 2438  Job_ParseShell(char *line)
Line 2438  Job_ParseShell(char *line)
             }              }
             commandShell = sh;              commandShell = sh;
             shellName = newShell.name;              shellName = newShell.name;
               if (shellPath) {
                   /* Shell_Init has already been called!  Do it again. */
                   free(UNCONST(shellPath));
                   shellPath = NULL;
                   Shell_Init();
               }
         }          }
     } else {      } else {
         /*          /*

Legend:
Removed from v.1.162  
changed lines
  Added in v.1.163

CVSweb <webmaster@jp.NetBSD.org>