projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make interactive output go to the terminal (bug #17213), by
[pspp]
/
src
/
data
/
file-name.c
diff --git
a/src/data/file-name.c
b/src/data/file-name.c
index 2ad3311a2dfb3c2824df8009d18b16f843540bd6..23d7ee0889f2c75460e8d479eb177b7acc2f75d9 100644
(file)
--- a/
src/data/file-name.c
+++ b/
src/data/file-name.c
@@
-87,7
+87,7
@@
fn_interp_vars (struct substring src, const char *(*getenv) (const char *),
else if (ss_match_char (&src, '{'))
ss_get_until (&src, '}', &var_name);
else
else if (ss_match_char (&src, '{'))
ss_get_until (&src, '}', &var_name);
else
- ss_get_chars (&src, M
IN
(1, ss_span (src, ss_cstr (CC_ALNUM))),
+ ss_get_chars (&src, M
AX
(1, ss_span (src, ss_cstr (CC_ALNUM))),
&var_name);
start = ds_length (&dst);
&var_name);
start = ds_length (&dst);
@@
-305,7
+305,9
@@
fn_open (const char *fn, const char *mode)
int
fn_close (const char *fn, FILE *f)
{
int
fn_close (const char *fn, FILE *f)
{
- if (!strcmp (fn, "-"))
+ if (fileno (f) == STDIN_FILENO
+ || fileno (f) == STDOUT_FILENO
+ || fileno (f) == STDERR_FILENO)
return 0;
#if HAVE_POPEN
else if (fn[0] == '|' || (*fn && fn[strlen (fn) - 1] == '|'))
return 0;
#if HAVE_POPEN
else if (fn[0] == '|' || (*fn && fn[strlen (fn) - 1] == '|'))