X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fgetpass.c;h=865a6c93b0abf6f7b4b2833660c5dc34cf00053e;hb=337338b404931f06f0db2119c9e145e8ca5a9860;hp=f3ae82918a83d2f5d24bfeb7c20a66963a1466f0;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh diff --git a/sbr/getpass.c b/sbr/getpass.c index f3ae829..865a6c9 100644 --- a/sbr/getpass.c +++ b/sbr/getpass.c @@ -1,6 +1,6 @@ /* * Portions of this code are Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -12,8 +12,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -42,48 +42,45 @@ #define MAX_PASSWORD_LEN 256 #ifndef TCSANOW -#define TCSANOW 0 +# define TCSANOW 0 #endif char * nmh_getpass(const char *prompt) { - struct termios oterm, term; - int ch; - char *p; - FILE *fout, *fin; - static char buf[MAX_PASSWORD_LEN + 1]; - int istty = isatty(fileno(stdin)); + struct termios oterm, term; + int ch; + char *p; + FILE *fout, *fin; + static char buf[MAX_PASSWORD_LEN + 1]; + int istty = isatty(fileno(stdin)); - /* Find if stdin is connect to a terminal. If so, read directly from - * the terminal, and turn off echo. Otherwise read from stdin. - */ + /* Find if stdin is connect to a terminal. If so, read directly from + * the terminal, and turn off echo. Otherwise read from stdin. + */ - if (!istty || !(fout = fin = fopen("/dev/tty", "w+"))) { - fout = stderr; - fin = stdin; - } - else /* Reading directly from terminal here */ - { - (void)tcgetattr(fileno(fin), &oterm); - term = oterm; /* Save original info */ - term.c_lflag &= ~ECHO; - (void)fputs(prompt, fout); - rewind(fout); /* implied flush */ - (void)tcsetattr(fileno(fin), TCSANOW, &term); - } + if (!istty || !(fout = fin = fopen("/dev/tty", "w+"))) { + fout = stderr; + fin = stdin; + } else { /* Reading directly from terminal here */ + (void)tcgetattr(fileno(fin), &oterm); + term = oterm; /* Save original info */ + term.c_lflag &= ~ECHO; + (void)fputs(prompt, fout); + rewind(fout); /* implied flush */ + (void)tcsetattr(fileno(fin), TCSANOW, &term); + } - for (p = buf; (ch = getc(fin)) != EOF && - ch != '\n' && - p < buf + MAX_PASSWORD_LEN;) - *p++ = ch; - *p = '\0'; + for (p = buf; (ch = getc(fin)) != EOF && ch != '\n' && + p < buf + MAX_PASSWORD_LEN;) + *p++ = ch; + *p = '\0'; - if (istty) { - (void)tcsetattr(fileno(fin), TCSANOW, &oterm); - rewind(fout); - (void)fputc('\n', fout); - (void)fclose(fin); - } - return buf; + if (istty) { + (void)tcsetattr(fileno(fin), TCSANOW, &oterm); + rewind(fout); + (void)fputc('\n', fout); + (void)fclose(fin); + } + return buf; }