X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fgetpass.c;h=6bc2cb8af0eaf62ff1264b6f11522f5adba96e89;hp=a8238fb2b0f36a930f67aea1c18014c2f9a2aed1;hb=fb49dd82ec42997b9df97f221c920f6596102c0a;hpb=09470876aa753a96fa312296ed3c39ba761f3dd2

diff --git a/sbr/getpass.c b/sbr/getpass.c
index a8238fb..6bc2cb8 100644
--- a/sbr/getpass.c
+++ b/sbr/getpass.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1988, 1993
+ * Portions of this code are Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,39 +34,39 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>   /* for calloc() */
 #include <termios.h>
-#include <unistd.h>   /* for ttyname() */
+#include <unistd.h>   /* for isatty() */
 #include "h/mh.h"     /* for adios() */
 
-#define PASSWORD_LEN 128
+/* We don't use MAX_PASS here because the maximum password length on a remote
+   POP daemon will have nothing to do with the length on our OS.  256 is
+   arbitrary but hopefully big enough to accomodate everyone. */
+#define MAX_PASSWORD_LEN 256
 
 #ifndef TCSANOW
 #define TCSANOW 0
 #endif
 
 char *
-getpass(const char *prompt)
+nmh_getpass(const char *prompt)
 {
   struct termios oterm, term;
   int ch;
-  char *p, *ttystring, *buf;
+  char *p;
   FILE *fout, *fin;
-
-  if(!(buf = (char *)calloc((size_t)(PASSWORD_LEN+1), sizeof(char))))
-    adios(NULL, "unable to allocate string storage");
+  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.
    */
 
-  if((ttystring = (char *)ttyname(fileno(stdin))) == NULL) {
+  if (!istty || !(fout = fin = fopen("/dev/tty", "w+"))) {
     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;
@@ -75,16 +75,17 @@ getpass(const char *prompt)
       (void)tcsetattr(fileno(fin), TCSANOW, &term);
     }
 
-  for (p = buf; (ch = getc(fin)) != EOF && ch != '\n';)
-    if (p < buf + PASSWORD_LEN)
-      *p++ = ch;
+  for (p = buf; (ch = getc(fin)) != EOF &&
+                 ch != '\n' &&
+	         p < buf + MAX_PASSWORD_LEN;)
+    *p++ = ch;
   *p = '\0';
 
-  if(ttystring != NULL) {
+  if (istty) {
     (void)tcsetattr(fileno(fin), TCSANOW, &oterm);
     rewind(fout);
     (void)fputc('\n', fout);
     (void)fclose(fin);
   }
-  return((char *)buf);
+  return buf;
 }