mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2025-02-07 06:47:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sun May 12 19:19:43 1996 Aaron Digulla <digulla@fh-konstanz.de>

Browse source 
* function.c: Use special function wildcard_expansion() for
	$(wildcard ) to allow Amiga wildcards
	The current directory on Amiga is "" instead of "."
This commit is contained in:
Roland McGrath 1996-05-13 18:39:52 +00:00
parent efbe1b6411
commit 678b14fb7e
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
function.c
View file

@ -27,6 +27,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <process.h> #include <process.h>
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#ifdef _AMIGA
#include "amiga.h"
#endif
static char *string_glob PARAMS ((char *line)); static char *string_glob PARAMS ((char *line));
@ -342,10 +345,13 @@ expand_function (o, function, text, end)
#ifndef VMS /* not supported for vms yet */ #ifndef VMS /* not supported for vms yet */
case function_shell: case function_shell:
{ {
char **argv, **envp; char **argv;
char *error_prefix; char *error_prefix;
#ifndef _AMIGA
char **envp;
int pipedes[2]; int pipedes[2];
int pid; int pid;
#endif
/* Expand the command line. */ /* Expand the command line. */
text = expand_argument (text, end); text = expand_argument (text, end);
@ -991,8 +997,12 @@ expand_function (o, function, text, end)
case function_wildcard: case function_wildcard:
text = expand_argument (text, end); text = expand_argument (text, end);
#ifdef _AMIGA
o = wildcard_expansion (text, o);
#else
p = string_glob (text); p = string_glob (text);
o = variable_buffer_output (o, p, strlen (p)); o = variable_buffer_output (o, p, strlen (p));
#endif
free (text); free (text);
break; break;
@ -1210,8 +1220,12 @@ index argument");
#ifdef VMS #ifdef VMS
o = variable_buffer_output (o, "[]", 2); o = variable_buffer_output (o, "[]", 2);
#else #else
#ifndef _AMIGA
o = variable_buffer_output (o, "./", 2); o = variable_buffer_output (o, "./", 2);
#endif #else
/* o = o */; /* Just a nop... */
#endif /* AMIGA */
#endif /* !VMS */
else else
/* The entire name is the basename. */ /* The entire name is the basename. */
o = variable_buffer_output (o, p2, len); o = variable_buffer_output (o, p2, len);