diff options
| author |   markus <markus@openbsd.org> | 1999-11-24 19:53:43 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 1999-11-24 19:53:43 +0000 |
| commit | bbc3e7c1e8e1af65828ac62d704e08603bfb3791 (patch) | |
| tree | 4283772edb80175f48931910dc69d6bca31941f2 /usr.bin/ssh/readpass.c | |
| parent | Limit newaliases to root and trusted users; sendmail+gshapiro@sendmail.orG (diff) | |
| download | wireguard-openbsd-bbc3e7c1e8e1af65828ac62d704e08603bfb3791.tar.xz wireguard-openbsd-bbc3e7c1e8e1af65828ac62d704e08603bfb3791.zip | |
KNF, final part 3
Diffstat (limited to 'usr.bin/ssh/readpass.c')
| -rw-r--r-- | usr.bin/ssh/readpass.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/usr.bin/ssh/readpass.c b/usr.bin/ssh/readpass.c index 9cd50a86884..b1e58a64d54 100644 --- a/usr.bin/ssh/readpass.c +++ b/usr.bin/ssh/readpass.c @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$Id: readpass.c,v 1.6 1999/11/24 00:26:03 deraadt Exp $"); +RCSID("$Id: readpass.c,v 1.7 1999/11/24 19:53:50 markus Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -38,10 +38,12 @@ intr_handler(int sig) kill(getpid(), sig); } -/* Reads a passphrase from /dev/tty with echo turned off. Returns the - passphrase (allocated with xmalloc). Exits if EOF is encountered. - The passphrase if read from stdin if from_stdin is true (as is the - case with ssh-keygen). */ +/* + * Reads a passphrase from /dev/tty with echo turned off. Returns the + * passphrase (allocated with xmalloc). Exits if EOF is encountered. The + * passphrase if read from stdin if from_stdin is true (as is the case with + * ssh-keygen). + */ char * read_passphrase(const char *prompt, int from_stdin) @@ -53,8 +55,10 @@ read_passphrase(const char *prompt, int from_stdin) if (from_stdin) f = stdin; else { - /* Read the passphrase from /dev/tty to make it possible - to ask it even when stdin has been redirected. */ + /* + * Read the passphrase from /dev/tty to make it possible to + * ask it even when stdin has been redirected. + */ f = fopen("/dev/tty", "r"); if (!f) { /* No controlling terminal and no DISPLAY. Nowhere to read. */ @@ -101,8 +105,10 @@ read_passphrase(const char *prompt, int from_stdin) *strchr(buf, '\n') = 0; /* Allocate a copy of the passphrase. */ cp = xstrdup(buf); - /* Clear the buffer so we don\'t leave copies of the passphrase - laying around. */ + /* + * Clear the buffer so we don\'t leave copies of the passphrase + * laying around. + */ memset(buf, 0, sizeof(buf)); /* Print a newline since the prompt probably didn\'t have one. */ fprintf(stderr, "\n"); |