projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix memory leaks; bug 21056
[pspp]
/
src
/
ui
/
terminal
/
read-line.c
diff --git
a/src/ui/terminal/read-line.c
b/src/ui/terminal/read-line.c
index e361832680964e41d413970be213ba24071241a8..626b06353392f75c6941c6e1ac1e30f6096a0ef2 100644
(file)
--- a/
src/ui/terminal/read-line.c
+++ b/
src/ui/terminal/read-line.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2007
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
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
@@
-32,6
+32,8
@@
#include <libpspp/str.h>
#include <libpspp/version.h>
#include <language/prompt.h>
#include <libpspp/str.h>
#include <libpspp/version.h>
#include <language/prompt.h>
+#include <output/journal.h>
+#include <output/manager.h>
#include "xalloc.h"
#include "xalloc.h"
@@
-99,12
+101,11
@@
readln_uninitialize (void)
static bool
read_interactive (struct getl_interface *s,
static bool
read_interactive (struct getl_interface *s,
- struct string *line
, enum getl_syntax *syntax
)
+ struct string *line)
{
struct readln_source *is =
(struct readln_source *) s ;
{
struct readln_source *is =
(struct readln_source *) s ;
- *syntax = GETL_INTERACTIVE;
return is->interactive_func (line, prompt_get_style ());
}
return is->interactive_func (line, prompt_get_style ());
}
@@
-128,6
+129,7
@@
welcome (void)
"warranty.\" for details.\n", stdout);
puts (stat_version);
readln_initialize ();
"warranty.\" for details.\n", stdout);
puts (stat_version);
readln_initialize ();
+ journal_enable ();
}
/* Gets a line from the user and stores it into LINE.
}
/* Gets a line from the user and stores it into LINE.
@@
-148,6
+150,9
@@
readln_read (struct string *line, enum prompt_style style)
welcome ();
welcome ();
+ if (style == PROMPT_FIRST)
+ som_flush ();
+
#if HAVE_READLINE
rl_attempted_completion_function = (style == PROMPT_FIRST
? complete_command_name
#if HAVE_READLINE
rl_attempted_completion_function = (style == PROMPT_FIRST
? complete_command_name