projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented the SHOW command and massaged the SET command to fit
[pspp-builds.git]
/
src
/
command.c
diff --git
a/src/command.c
b/src/command.c
index 316868a2be5d5663ffb72ba4745144b62e8ea694..163f9845742ee095096f8791c7d18d64d47f4a52 100644
(file)
--- a/
src/command.c
+++ b/
src/command.c
@@
-566,21
+566,17
@@
cmd_execute (void)
return lex_end_of_command ();
}
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)
{
/* Parses, performs the ERASE command. */
int
cmd_erase (void)
{
- assert_not_safer();
+ if ( safer_mode() )
+ {
+ msg (SE, _("This command not allowed when the SAFER option is set."));
+ return CMD_FAILURE;
+ }
+
lex_match_id ("ERASE");
if (!lex_force_match_id ("FILE"))
lex_match_id ("ERASE");
if (!lex_force_match_id ("FILE"))
@@
-707,8
+703,12
@@
cmd_host (void)
{
int code;
{
int code;
- assert_not_safer();
-
+ if ( safer_mode() )
+ {
+ msg (SE, _("This command not allowed when the SAFER option is set."));
+ return CMD_FAILURE;
+ }
+
lex_match_id ("HOST");
#ifdef unix
lex_match_id ("HOST");
#ifdef unix