# HG changeset patch # User Rob Landley # Date 1207247121 18000 # Node ID 2d9e5cc32ea91160f3637ddc472a1ec314429f08 # Parent 8e2f9e376489793633f5560f4fbd4ade3ba830ac Remove "expand_args()", which didn't do anything. (For -run mode, the shell already parsed tinycc's command line arguments, so all parsing them _again_ could do is break up "quoted strings with spaces".) diff -r 8e2f9e376489 -r 2d9e5cc32ea9 options.c --- a/options.c Sat Mar 29 14:18:28 2008 -0500 +++ b/options.c Thu Apr 03 13:25:21 2008 -0500 @@ -235,7 +235,7 @@ { "static", TCC_OPTION_static, 0 }, { "shared", TCC_OPTION_shared, 0 }, { "o", TCC_OPTION_o, TCC_OPTION_HAS_ARG }, - { "run", TCC_OPTION_run, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP }, + { "run", TCC_OPTION_run, 0 }, { "rdynamic", TCC_OPTION_rdynamic, 0 }, { "r", TCC_OPTION_r, 0 }, { "Wl,", TCC_OPTION_Wl, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP }, @@ -252,33 +252,6 @@ { NULL }, }; -/* convert 'str' into an array of space separated strings */ -static int expand_args(char ***pargv, char *str) -{ - char *s1; - char **argv, *arg; - int argc, len; - - argc = 0; - argv = NULL; - for(;;) { - while (is_space(*str)) - str++; - if (*str == '\0') - break; - s1 = str; - while (*str != '\0' && !is_space(*str)) - str++; - len = str - s1; - arg = xmalloc(len + 1); - memcpy(arg, s1, len); - arg[len] = '\0'; - dynarray_add((void ***)&argv, &argc, arg); - } - *pargv = argv; - return argc; -} - static char **files; static int nb_files, nb_libraries; static int multiple_files; @@ -422,16 +395,8 @@ print_search_dirs = 1; break; case TCC_OPTION_run: - { - int argc1; - char **argv1; - argc1 = expand_args(&argv1, optarg); - if (argc1 > 0) { - parse_args(s, argc1, argv1); - } - multiple_files = 0; - tccg_output_type = TCC_OUTPUT_MEMORY; - } + multiple_files = 0; + tccg_output_type = TCC_OUTPUT_MEMORY; break; case TCC_OPTION_v: if (!tccg_verbose++) show_version();