diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable wordexp

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-04-15 15:07:04 +01:00
parent b97fa48cd2
commit bfc5b4e3b1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
C/sysbits.c
View File

@ -97,7 +97,7 @@ static char SccsId[] = "%W% %G%";
#if HAVE_FENV_H && !defined(__CYGWIN__) #if HAVE_FENV_H && !defined(__CYGWIN__)
#include <fenv.h> #include <fenv.h>
#endif #endif
#if HAVE_WORDEXP_H #if defined(ENABLE_SYSTEM_EXPANSION) && HAVE_WORDEXP_H
#include <wordexp.h> #include <wordexp.h>
#endif #endif
#if HAVE_LIBGEN_H #if HAVE_LIBGEN_H
@ -419,7 +419,7 @@ yapExpandVars (const char *source, char *result)
strncat (result, src, YAP_FILENAME_MAX); strncat (result, src, YAP_FILENAME_MAX);
return result; return result;
} }
#if !HAVE_WORDEXP #if !HAVE_WORDEXP || !defined(ENABLE_SYSTEM_EXPANSION)
// do VARIABLE expansion // do VARIABLE expansion
else if (source[0] == '$') { else if (source[0] == '$') {
/* follow SICStus expansion rules */ /* follow SICStus expansion rules */
@ -464,7 +464,7 @@ expandVars(const char *pattern, char *expanded, int maxlen)
if ((pattern = yapExpandVars(pattern, tmp)) == NULL) { if ((pattern = yapExpandVars(pattern, tmp)) == NULL) {
return NULL; return NULL;
} }
#if __WIN32 || __MINGW32__ #if ( __WIN32 || __MINGW32__ ) && defined(ENABLE_SYSTEM_EXPANSION)
DWORD retval=0; DWORD retval=0;
// notice that the file does not need to exist1 // notice that the file does not need to exist1
if (ini == NULL) { if (ini == NULL) {
@ -480,7 +480,7 @@ expandVars(const char *pattern, char *expanded, int maxlen)
return NULL; return NULL;
} }
return expanded; return expanded;
#elif HAVE_WORDEXP #elif HAVE_WORDEXP && defined(ENABLE_SYSTEM_EXPANSION)
wordexp_t result; wordexp_t result;
/* Expand the string for the program to run. */ /* Expand the string for the program to run. */