github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-03-26 12:04:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the .ONESHELL operation on MS-Windows.

Browse Source 
job.c (construct_command_argv_internal) [WINDOWS32]: Return
 right after generating new_argv for one_shell case.  This fixes
 the Windows build for both Unixy shell and stock Windows shells.
This commit is contained in:
Eli Zaretskii 2013-04-29 19:17:07 +03:00
parent 9253a34a57
commit 9a7fe22b19
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2013-04-29 Eli Zaretskii <eliz@gnu.org>
* job.c (construct_command_argv_internal) [WINDOWS32]: Return
right after generating new_argv for one_shell case. This fixes
the Windows build for both Unixy shell and stock Windows shells.
2013-04-28 Eli Zaretskii <eliz@gnu.org> 2013-04-28 Eli Zaretskii <eliz@gnu.org>
* dir.c (local_stat) [WINDOWS32]: Use the wrapper on MS-Windows. * dir.c (local_stat) [WINDOWS32]: Use the wrapper on MS-Windows.

6
job.c
View File

@ -3335,7 +3335,7 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
*t = '\0'; *t = '\0';
} }
#ifdef WINDOWS32 #ifdef WINDOWS32
else /* non-Posix shell */ else /* non-Posix shell (cmd.exe etc.) */
{ {
const char *f = line; const char *f = line;
char *t = line; char *t = line;
@ -3404,8 +3404,9 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
new_argv = xmalloc (2 * sizeof (char *)); new_argv = xmalloc (2 * sizeof (char *));
new_argv[0] = xstrdup (*batch_filename); new_argv[0] = xstrdup (*batch_filename);
new_argv[1] = NULL; new_argv[1] = NULL;
return new_argv;
} }
#else /* WINDOWS32 */ #endif /* WINDOWS32 */
/* Create an argv list for the shell command line. */ /* Create an argv list for the shell command line. */
{ {
int n = 0; int n = 0;
@ -3429,7 +3430,6 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
new_argv[n++] = line; new_argv[n++] = line;
new_argv[n++] = NULL; new_argv[n++] = NULL;
} }
#endif /* WINDOWS32 */
return new_argv; return new_argv;
} }