diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-13 08:43:39 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-13 08:43:39 +0000 |
| commit | f5b6feedcaed6b2cbc7f5dc20a2cc4b401dc62d9 (patch) | |
| tree | e0488f13207fc700327a542de5d0b12f718dfc0a | |
| parent | ba1d606cb2a4c0a6e1e69b0a4f72cd9f34439469 (diff) | |
| download | zsh-f5b6feedcaed6b2cbc7f5dc20a2cc4b401dc62d9.tar.gz zsh-f5b6feedcaed6b2cbc7f5dc20a2cc4b401dc62d9.tar.xz zsh-f5b6feedcaed6b2cbc7f5dc20a2cc4b401dc62d9.zip | |
make read -[kq] always print the prompt, if any; after all they make sure they have a terminal anyway (10727)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/builtin.c | 21 |
2 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index b7cd82fec..876fb54e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-04-13 Sven Wischnowsky <wischnow@informatik.hu-berlin.de> + * 10727: Src/builtin.c: make read -[kq] always print the prompt, + if any; after all they make sure they have a terminal anyway + * 10726: Src/hashtable.c: fix field name for HAVE_NIS_PLUS * 10725: Src/Zle/compcore.c, Src/Zle/compctl.c, diff --git a/Src/builtin.c b/Src/builtin.c index dfea94477..6cb03b3f5 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -3356,11 +3356,12 @@ int bin_read(char *name, char **args, char *ops, int func) { char *reply, *readpmpt; - int bsiz, c = 0, gotnl = 0, al = 0, first, nchars = 1, bslash; + int bsiz, c = 0, gotnl = 0, al = 0, first, nchars = 1, bslash, keys = 0; int haso = 0; /* true if /dev/tty has been opened specially */ int isem = !strcmp(term, "emacs"), izle = zleactive && getkeyptr; char *buf, *bptr, *firstarg, *zbuforig; LinkList readll = newlinklist(); + FILE *oshout = NULL; if ((ops['k'] || ops['b']) && *args && idigit(**args)) { if (!(nchars = atoi(*args))) @@ -3385,8 +3386,11 @@ bin_read(char *name, char **args, char *ops, int func) if (!zleactive) { if (SHTTY == -1) { /* need to open /dev/tty specially */ - SHTTY = open("/dev/tty", O_RDWR|O_NOCTTY); - haso = 1; + if ((SHTTY = open("/dev/tty", O_RDWR|O_NOCTTY)) != -1) { + haso = 1; + oshout = shout; + init_shout(); + } } /* We should have a SHTTY opened by now. */ if (SHTTY == -1) { @@ -3403,6 +3407,7 @@ bin_read(char *name, char **args, char *ops, int func) setcbreak(); readfd = SHTTY; } + keys = 1; } else if (ops['u'] && !ops['p']) { /* -u means take input from the specified file descriptor. * * -up means take input from the coprocess. */ @@ -3419,9 +3424,9 @@ bin_read(char *name, char **args, char *ops, int func) for (readpmpt = firstarg; *readpmpt && *readpmpt != '?'; readpmpt++); if (*readpmpt++) { - if (isatty(0)) { - zputs(readpmpt, stderr); - fflush(stderr); + if (keys || isatty(0)) { + zputs(readpmpt, (haso ? shout : stderr)); + fflush(haso ? shout : stderr); } readpmpt[-1] = '\0'; } @@ -3462,6 +3467,8 @@ bin_read(char *name, char **args, char *ops, int func) settyinfo(&shttyinfo); if (haso) { close(SHTTY); + fclose(shout); + shout = oshout; SHTTY = -1; } } @@ -3493,6 +3500,8 @@ bin_read(char *name, char **args, char *ops, int func) /* dispose of result appropriately, etc. */ if (haso) { close(SHTTY); + fclose(shout); + shout = oshout; SHTTY = -1; } } |