02111-1307, USA. */
#include <config.h>
+#include "getline.h"
#include <assert.h>
#include <stdio.h>
#include <errno.h>
#include "alloc.h"
#include "error.h"
#include "filename.h"
-#include "getline.h"
#include "lexer.h"
+#include "repeat.h"
#include "settings.h"
#include "str.h"
#include "tab.h"
#endif /* no readline/history.h */
#endif /* -lhistory */
+extern struct cmd_set cmd;
+
static struct string getl_include_path;
/* Number of levels of DO REPEAT structures we're nested inside. If
void
getl_uninitialize (void)
{
-#if HAVE_LIBHISTORY && unix
+#if HAVE_LIBHISTORY && defined (unix)
if (history_file)
write_history (history_file);
#endif
}
/* Display a welcoming message. */
-void
+static void
welcome (void)
{
getl_welcomed = 1;
- fputs ("PSPP is free software and you are welcome to distribute copies of"
+ fputs ("PSPP is free software and you are welcome to distribute copies of "
"it\nunder certain conditions; type \"show copying.\" to see the "
"conditions.\nThere is ABSOLUTELY NO WARRANTY for PSPP; type \"show "
"warranty.\" for details.\n", stdout);
if (ds_length (&getl_buf) > 0 && ds_end (&getl_buf)[-1] == '\n')
ds_truncate (&getl_buf, ds_length (&getl_buf) - 1);
- if (set_echo)
+ if (get_echo())
tab_output_text (TAB_LEFT | TAT_FIX, ds_value (&getl_buf));
getl_head->ln++;
#if HAVE_LIBHISTORY
if (!history_file)
{
-#if unix
+#ifdef unix
history_file = tilde_expand (HISTORY_FILE);
#endif
using_history ();
switch (getl_prompt)
{
case GETL_PRPT_STANDARD:
- prompt = set_prompt;
+ prompt = get_prompt();
break;
case GETL_PRPT_CONTINUATION:
- prompt = set_cprompt;
+ prompt = get_cprompt();
break;
case GETL_PRPT_DATA:
- prompt = set_dprompt;
+ prompt = get_dprompt();
break;
default:
err_error_count = err_warning_count = 0;
err_already_flagged = 0;
- fputs (getl_prompt ? set_cprompt : set_prompt, stdout);
+ fputs (getl_prompt ? get_cprompt() : get_prompt(), stdout);
ds_clear (&getl_buf);
if (ds_getline (&getl_buf, stdin))
return 1;