projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
malloca-instead-of-local_alloc.patch from patch #6230.
[pspp-builds.git]
/
src
/
language
/
command.c
diff --git
a/src/language/command.c
b/src/language/command.c
index 1688a10eb6e3472dc5fa7e3ae0a21134827fc006..62538c64ff677465e18c25767c79d7aba3bcada3 100644
(file)
--- a/
src/language/command.c
+++ b/
src/language/command.c
@@
-31,7
+31,6
@@
#include <data/variable.h>
#include <language/lexer/lexer.h>
#include <language/prompt.h>
#include <data/variable.h>
#include <language/lexer/lexer.h>
#include <language/prompt.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
@@
-49,6
+48,9
@@
#include <readline/readline.h>
#endif
#include <readline/readline.h>
#endif
+#include "xalloc.h"
+#include "xmalloca.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
#include "gettext.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
@@
-777,7
+779,7
@@
shell (void)
{
const char *cp = strrchr (shell_fn, '/');
cp = cp ? &cp[1] : shell_fn;
{
const char *cp = strrchr (shell_fn, '/');
cp = cp ? &cp[1] : shell_fn;
- shell_process =
local_alloc
(strlen (cp) + 8);
+ shell_process =
xmalloca
(strlen (cp) + 8);
strcpy (shell_process, "-");
strcat (shell_process, cp);
if (strcmp (cp, "sh"))
strcpy (shell_process, "-");
strcat (shell_process, cp);
if (strcmp (cp, "sh"))