X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcommand.c;h=3bf9571fa5a4065537ce1225a01fb42a1ff49559;hb=55e6e7ba37a30570f5a31e2d78c22dfa7b61a36f;hp=3da5da69919a510adbd56f4f39c79df1de31847b;hpb=740218f508466f16a79939cd97027b99f589d682;p=pspp-builds.git diff --git a/src/language/command.c b/src/language/command.c index 3da5da69..3bf9571f 100644 --- a/src/language/command.c +++ b/src/language/command.c @@ -288,7 +288,7 @@ parse_command_name (struct lexer *lexer) { if (!ds_is_empty (&s) && ds_last (&s) != '-') ds_put_byte (&s, ' '); - ds_put_cstr (&s, lex_tokid (lexer)); + ds_put_cstr (&s, lex_tokcstr (lexer)); } else if (lex_is_integer (lexer) && lex_integer (lexer) >= 0) { @@ -514,10 +514,10 @@ cmd_erase (struct lexer *lexer, struct dataset *ds UNUSED) if (!lex_force_string (lexer)) return CMD_FAILURE; - if (remove (ds_cstr (lex_tokstr (lexer))) == -1) + if (remove (lex_tokcstr (lexer)) == -1) { msg (SW, _("Error removing `%s': %s."), - ds_cstr (lex_tokstr (lexer)), strerror (errno)); + lex_tokcstr (lexer), strerror (errno)); return CMD_FAILURE; }