SAVE TRANSLATE: Improve error message.

[pspp] / src / language / data-io / save-translate.c

diff --git a/src/language/data-io/save-translate.c b/src/language/data-io/save-translate.c
index 54b769ddee26cff951111d130bc507498ed51adf..26941329f35ad378426ad441654031e9ab586791 100644 (file)
--- a/src/language/data-io/save-translate.c
+++ b/src/language/data-io/save-translate.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010, 2011, 2013 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011, 2013, 2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -86,8 +86,11 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds)
   stage = case_map_stage_create (dict);
   dict_delete_scratch_vars (dict);
 
-  while (lex_match (lexer, T_SLASH))
+  while (lex_token (lexer) != T_ENDCMD)
     {
+      if (!lex_force_match (lexer, T_SLASH))
+        goto error;
+
       if (lex_match_id (lexer, "OUTFILE"))
        {
           if (handle != NULL)
@@ -234,8 +237,6 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds)
       else if (!parse_dict_trim (lexer, dict))
         goto error;
     }
-  if (lex_end_of_command (lexer) != CMD_SUCCESS)
-    goto error;
 
   if (type == 0)
     {
@@ -247,7 +248,7 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds)
       lex_sbc_missing ("OUTFILE");
       goto error;
     }
-  else if (!replace && fn_exists (fh_get_file_name (handle)))
+  else if (!replace && fn_exists (handle))
     {
       msg (SE, _("Output file `%s' exists but %s was not specified."),
            fh_get_file_name (handle), "REPLACE");