diff options
| author | craigm <none@none> | 2007-02-07 14:12:12 -0800 |
|---|---|---|
| committer | craigm <none@none> | 2007-02-07 14:12:12 -0800 |
| commit | b952dcaaf805e7c797b236434862b1bd6718fd68 (patch) | |
| tree | e424c02389885c49a0846758597e41f90c156415 /usr/src/lib/libc/port/stdio/getpass.c | |
| parent | bf1f3d9222ae6fcadd490d70a03838f7a2d30bb0 (diff) | |
| download | illumos-joyent-b952dcaaf805e7c797b236434862b1bd6718fd68.tar.gz | |
6515653 __getpass function outputs to stderr rather than tty
Diffstat (limited to 'usr/src/lib/libc/port/stdio/getpass.c')
| -rw-r--r-- | usr/src/lib/libc/port/stdio/getpass.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr/src/lib/libc/port/stdio/getpass.c b/usr/src/lib/libc/port/stdio/getpass.c index b25ef5efa6..1e4ce5e38f 100644 --- a/usr/src/lib/libc/port/stdio/getpass.c +++ b/usr/src/lib/libc/port/stdio/getpass.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -80,7 +80,7 @@ __getpass(const char *prompt, int size) rmutex_t *lk; if (pbuf == NULL || - (fi = fopen("/dev/tty", "rF")) == NULL) + (fi = fopen("/dev/tty", "r+F")) == NULL) return (NULL); setbuf(fi, NULL); sig = signal(SIGINT, catch); @@ -89,8 +89,7 @@ __getpass(const char *prompt, int size) flags = ttyb.c_lflag; ttyb.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL); (void) ioctl(FILENO(fi), TCSETAF, &ttyb); - FLOCKFILE(lk, stderr); - (void) fputs(prompt, stderr); + (void) fputs(prompt, fi); p = pbuf; while (!intrupt && (c = GETC(fi)) != '\n' && c != '\r' && c != EOF) { @@ -98,10 +97,9 @@ __getpass(const char *prompt, int size) *p++ = (char)c; } *p = '\0'; + (void) PUTC('\n', fi); ttyb.c_lflag = flags; (void) ioctl(FILENO(fi), TCSETAW, &ttyb); - (void) PUTC('\n', stderr); - FUNLOCKFILE(lk); (void) signal(SIGINT, sig); (void) fclose(fi); if (intrupt) |