X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fcommand-line.c;h=ec7a9b22509132b5373916fd9dc53f5ad9a88c40;hb=6a856ba6fc06843fd02886087c769247de4d08f0;hp=f7090a3eb44f18d5086ef8868da7bc7d2f26827e;hpb=2d4dd90964061defa92972156ae2a12323708519;p=pspp diff --git a/src/ui/terminal/command-line.c b/src/ui/terminal/command-line.c index f7090a3eb4..ec7a9b2250 100644 --- a/src/ui/terminal/command-line.c +++ b/src/ui/terminal/command-line.c @@ -50,11 +50,12 @@ static void usage (void); char *subst_vars (char *); + /* Parses the command line specified by ARGC and ARGV as received by main(). Returns true if normal execution should proceed, false if the command-line indicates that PSPP should exit. */ bool -parse_command_line (int argc, char **argv) +parse_command_line (int argc, char **argv, struct source_stream *ss) { static struct option long_options[] = { @@ -140,9 +141,9 @@ parse_command_line (int argc, char **argv) break; case 'I': if (optarg == NULL || !strcmp (optarg, "-")) - getl_clear_include_path (); + getl_clear_include_path (ss); else - getl_add_include_dir (optarg); + getl_add_include_dir (ss, optarg); break; case 'l': outp_list_classes (); @@ -195,7 +196,7 @@ parse_command_line (int argc, char **argv) char *pspprc_fn = fn_search_path ("rc", config_path, NULL); if (pspprc_fn != NULL) { - getl_append_source (create_syntax_file_source (pspprc_fn)); + getl_append_source (ss, create_syntax_file_source (pspprc_fn)); free (pspprc_fn); } @@ -206,12 +207,12 @@ parse_command_line (int argc, char **argv) outp_configure_macro (argv[i]); else { - getl_append_source (create_syntax_file_source (argv[i])); + getl_append_source (ss, create_syntax_file_source (argv[i])); syntax_files++; } if (!syntax_files || interactive_mode) - getl_append_source (create_readln_source () ); + getl_append_source (ss, create_readln_source () ); return true; }