diff options
| author | Zandra <[email protected]> | 2015-11-17 13:01:37 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-17 13:01:37 +0100 |
| commit | d42741c7ec0cfe8287a2866a5e837d4da26a97ca (patch) | |
| tree | 6c8276306e5c269613901f11df0cfe09e47c44b4 /erts/etc/common/escript.c | |
| parent | 68a045f8d649fdd77cc704e39e9e4dc331693a90 (diff) | |
| parent | 731890f3b4ac62eed1221aa7d9fd2bfa6bf51d8c (diff) | |
| download | otp-d42741c7ec0cfe8287a2866a5e837d4da26a97ca.tar.gz otp-d42741c7ec0cfe8287a2866a5e837d4da26a97ca.tar.bz2 otp-d42741c7ec0cfe8287a2866a5e837d4da26a97ca.zip | |
Merge branch 'evnu/fix-whitespace-splitting' into maint
* evnu/fix-whitespace-splitting:
Fix erroneous splitting of emulator path
Diffstat (limited to 'erts/etc/common/escript.c')
| -rw-r--r-- | erts/etc/common/escript.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c index 7fd02ed436..a5c6d0d40b 100644 --- a/erts/etc/common/escript.c +++ b/erts/etc/common/escript.c @@ -74,7 +74,6 @@ static void error(char* format, ...); static char* emalloc(size_t size); static void efree(void *p); static char* strsave(char* string); -static void push_words(char* src); static int run_erlang(char* name, char** argv); static char* get_default_emulator(char* progname); #ifdef __WIN32__ @@ -432,7 +431,7 @@ main(int argc, char** argv) emulator = get_default_emulator(argv[0]); } - if (strlen(emulator) >= PMAX) + if (strlen(emulator) >= MAXPATHLEN) error("Value of environment variable ESCRIPT_EMULATOR is too large"); /* @@ -445,7 +444,7 @@ main(int argc, char** argv) eargv_base = (char **) emalloc(eargv_size*sizeof(char*)); eargv = eargv_base; eargc = 0; - push_words(emulator); + PUSH(strsave(emulator)); eargc_base = eargc; eargv = eargv + eargv_size/2; eargc = 0; @@ -554,26 +553,6 @@ main(int argc, char** argv) return run_erlang(eargv[0], eargv); } -static void -push_words(char* src) -{ - char sbuf[PMAX]; - char* dst; - - dst = sbuf; - while ((*dst++ = *src++) != '\0') { - if (isspace((int)*src)) { - *dst = '\0'; - PUSH(strsave(sbuf)); - dst = sbuf; - do { - src++; - } while (isspace((int)*src)); - } - } - if (sbuf[0]) - PUSH(strsave(sbuf)); -} #ifdef __WIN32__ wchar_t *make_commandline(char **argv) { |