X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcommand.c;h=5e4e1a5f7c035264a9d37836201fa0973b717119;hb=5156fa5a8323a16f6b4bbc8950221cdc1d0e023d;hp=cd2b2038163b41f85d67394d35ed01fa54cefd1e;hpb=721f67e477ee5050961020ed5afd8e0daf42bf2d;p=pspp-builds.git diff --git a/src/command.c b/src/command.c index cd2b2038..5e4e1a5f 100644 --- a/src/command.c +++ b/src/command.c @@ -25,6 +25,7 @@ #include #include #include "alloc.h" +#include "dictionary.h" #include "error.h" #include "getline.h" #include "lexer.h" @@ -486,7 +487,7 @@ parse_command_name (void) assert (word_cnt < sizeof words / sizeof *words); if (token == T_ID) - words[word_cnt++] = xstrdup (ds_value (&tokstr)); + words[word_cnt++] = xstrdup (ds_c_str (&tokstr)); else words[word_cnt++] = xstrdup ("-"); @@ -632,10 +633,10 @@ cmd_erase (void) if (!lex_force_string ()) return CMD_FAILURE; - if (remove (ds_value (&tokstr)) == -1) + if (remove (ds_c_str (&tokstr)) == -1) { msg (SW, _("Error removing `%s': %s."), - ds_value (&tokstr), strerror (errno)); + ds_c_str (&tokstr), strerror (errno)); return CMD_FAILURE; } @@ -713,7 +714,7 @@ run_command (void) lex_get (); if (!lex_force_string ()) return CMD_FAILURE; - cmd = ds_value (&tokstr); + cmd = ds_c_str (&tokstr); string = 1; } else