projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed centering prior to sweep operation
[pspp]
/
src
/
command.c
diff --git
a/src/command.c
b/src/command.c
index de77be80e8f95596e67c291309590691b84b2377..c6d7659d09c1c34632487b1df8142c211e508171 100644
(file)
--- a/
src/command.c
+++ b/
src/command.c
@@
-28,7
+28,7
@@
#include "dictionary.h"
#include "error.h"
#include "glob.h"
#include "dictionary.h"
#include "error.h"
#include "glob.h"
-#include "getl
ine
.h"
+#include "getl.h"
#include "lexer.h"
#include "main.h"
#include "settings.h"
#include "lexer.h"
#include "main.h"
#include "settings.h"
@@
-45,6
+45,10
@@
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
\f
/* Global variables. */
\f
/* Global variables. */
@@
-104,7
+108,7
@@
pspp_completion_function (const char *text, int state)
cmd = &commands[state + skip];
cmd = &commands[state + skip];
- if ( cmd->transition[pgm_state] == STATE_ERROR || ( cmd->debug && !
test_mode
) )
+ if ( cmd->transition[pgm_state] == STATE_ERROR || ( cmd->debug && !
get_testing_mode ()
) )
{
skip++;
continue;
{
skip++;
continue;
@@
-550,7
+554,7
@@
parse_command_name (void)
{
if (command->skip_entire_name)
lex_get ();
{
if (command->skip_entire_name)
lex_get ();
- if ( command->debug & !
test_mode
)
+ if ( command->debug & !
get_testing_mode ()
)
goto error;
free_words (words, word_cnt);
return command;
goto error;
free_words (words, word_cnt);
return command;
@@
-595,7
+599,7
@@
parse_command_name (void)
free (words[word_cnt]);
}
free (words[word_cnt]);
}
- if ( command->debug && !
test_mode
)
+ if ( command->debug && !
get_testing_mode ()
)
goto error;
free_words (words, word_cnt);
goto error;
free_words (words, word_cnt);
@@
-675,7
+679,7
@@
cmd_execute (void)
int
cmd_erase (void)
{
int
cmd_erase (void)
{
- if (
safer_mode()
)
+ if (
get_safer_mode ()
)
{
msg (SE, _("This command not allowed when the SAFER option is set."));
return CMD_FAILURE;
{
msg (SE, _("This command not allowed when the SAFER option is set."));
return CMD_FAILURE;
@@
-735,7
+739,7
@@
shell (void)
execl (shell_fn, shell_process, NULL);
execl (shell_fn, shell_process, NULL);
-
err_hcf
(1);
+
_exit
(1);
}
case -1:
}
case -1:
@@
-806,7
+810,7
@@
cmd_host (void)
{
int code;
{
int code;
- if (
safer_mode()
)
+ if (
get_safer_mode ()
)
{
msg (SE, _("This command not allowed when the SAFER option is set."));
return CMD_FAILURE;
{
msg (SE, _("This command not allowed when the SAFER option is set."));
return CMD_FAILURE;