Fixed a buglet in the ERASE command, added a test for it, and some documentation.

[pspp-builds.git] / src / command.c

diff --git a/src/command.c b/src/command.c
index 7e9bb7742b7fba2f76dc4769d0c14e57594ad1f1..2c62d2f26d79200b8dce23cc80b79dea24820cb1 100644 (file)
--- a/src/command.c
+++ b/src/command.c
@@ -565,15 +565,24 @@ cmd_execute (void)
   return lex_end_of_command ();
 }
 
+
+#define assert_not_safer() \
+  do { \
+   if (set_safer) \
+    { \
+      msg (SE, _("This command not allowed when the SAFER option is set.")); \
+      return CMD_FAILURE; \
+    } \
+} while(0) 
+
+
+
 /* Parses, performs the ERASE command. */
 int
 cmd_erase (void)
 {
-  if (set_safer)
-    {
-      msg (SE, _("This command not allowed when the SAFER option is set."));
-      return CMD_FAILURE;
-    }
+
+  assert_not_safer();
   
   lex_match_id ("ERASE");
   if (!lex_force_match_id ("FILE"))
@@ -589,7 +598,7 @@ cmd_erase (void)
       return CMD_FAILURE;
     }
 
-  return lex_end_of_command ();
+  return CMD_SUCCESS;
 }
 
 #if unix
@@ -700,11 +709,7 @@ cmd_host (void)
 {
   int code;
 
-  if (set_safer)
-    {
-      msg (SE, _("This command not allowed when the SAFER option is set."));
-      return CMD_FAILURE;
-    }
+  assert_not_safer();
   
   lex_match_id ("HOST");