X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fgetpass.c;h=865a6c93b0abf6f7b4b2833660c5dc34cf00053e;hb=18017df38ebb626f6eed6f339641fd1298c326e7;hp=b33a3f8edaa840d7613c65c3d4bb0421f08d930b;hpb=e0233d70fb7bfac996b3514ae60d7eedef0e6ad3;p=mmh

diff --git a/sbr/getpass.c b/sbr/getpass.c
index b33a3f8..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.
@@ -29,13 +29,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $Id$
  */
 
 #include <stdio.h>
 #include <termios.h>
-#include <unistd.h>   /* for ttyname() */
+#include <unistd.h>   /* for isatty() */
 #include "h/mh.h"     /* for adios() */
 
 /* We don't use MAX_PASS here because the maximum password length on a remote
@@ -44,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, *ttystring;
-  FILE *fout, *fin;
-  static char  buf[MAX_PASSWORD_LEN + 1];
+	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((ttystring = (char *)ttyname(fileno(stdin))) == NULL) {
-    fout = stderr;
-    fin = stdin;
-  }
-  else /* Reading directly from terminal here */
-    {
-      fout = fin = fopen(ttystring, "w+");
-      (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(ttystring != NULL) {
-    (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;
 }