aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/common/dialyzer.c
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-11-17 13:01:37 +0100
committerZandra <[email protected]>2015-11-17 13:01:37 +0100
commitd42741c7ec0cfe8287a2866a5e837d4da26a97ca (patch)
tree6c8276306e5c269613901f11df0cfe09e47c44b4 /erts/etc/common/dialyzer.c
parent68a045f8d649fdd77cc704e39e9e4dc331693a90 (diff)
parent731890f3b4ac62eed1221aa7d9fd2bfa6bf51d8c (diff)
downloadotp-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/dialyzer.c')
-rw-r--r--erts/etc/common/dialyzer.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/erts/etc/common/dialyzer.c b/erts/etc/common/dialyzer.c
index c45626606c..cac1464bf6 100644
--- a/erts/etc/common/dialyzer.c
+++ b/erts/etc/common/dialyzer.c
@@ -65,7 +65,6 @@ static int eargc; /* Number of arguments in eargv. */
static void error(char* format, ...);
static char* emalloc(size_t size);
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__
@@ -189,7 +188,7 @@ int 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;
@@ -269,27 +268,6 @@ int main(int argc, char** argv)
return run_erlang(eargv[0], eargv);
}
-static void
-push_words(char* src)
-{
- char sbuf[MAXPATHLEN];
- 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)
{