aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test/utils/gccifier.c
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-06-08 17:33:12 +0200
committerLukas Larsson <[email protected]>2012-06-08 17:33:12 +0200
commit3341122a92e71ade3edc7ecaadab9f55da29e20d (patch)
tree3f8fab1fc3681a0c5b0fda11ed34cf4631f81adf /erts/test/utils/gccifier.c
parentb4b4c6299d3926e55b042ea45f55adaeec41cb6f (diff)
parenta977c40ac2c290623e20e9df32315eb6a1bdf55d (diff)
downloadotp-3341122a92e71ade3edc7ecaadab9f55da29e20d.tar.gz
otp-3341122a92e71ade3edc7ecaadab9f55da29e20d.tar.bz2
otp-3341122a92e71ade3edc7ecaadab9f55da29e20d.zip
Merge branch 'lukas/otp/install_with_whitespace/OTP-10107' into maint
* lukas/otp/install_with_whitespace/OTP-10107: Update to work with space in include path Update to work with whitespace in exec path
Diffstat (limited to 'erts/test/utils/gccifier.c')
-rw-r--r--erts/test/utils/gccifier.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/erts/test/utils/gccifier.c b/erts/test/utils/gccifier.c
index a6b8a340a1..a1019f9a72 100644
--- a/erts/test/utils/gccifier.c
+++ b/erts/test/utils/gccifier.c
@@ -73,17 +73,23 @@ save_arg(args_t *args, char *arg1, ...)
args->vec = (char **) (args->no
? realloc((void *) args->vec,
(sizeof(char *)
- *(args->no + ARGS_INCR + 1)))
+ *(args->no + ARGS_INCR + 2)))
: malloc((sizeof(char *)
- *(args->no + ARGS_INCR + 1))));
+ *(args->no + ARGS_INCR + 2))));
if (!args->vec)
enomem();
args->no += ARGS_INCR;
}
+ if (carg == arg1) {
+ args->vec[args->ix++] = "\"";
+ args->chars++;
+ }
args->vec[args->ix++] = carg;
args->chars += strlen(carg);
carg = va_arg(argp, char *);
}
+ args->vec[args->ix++] = "\"";
+ args->chars++;
args->vec[args->ix++] = " ";
args->chars++;
va_end(argp);