fix bug where inc crashed on failing to reopen the terminal

diff --git a/ChangeLog b/ChangeLog
index 66187bffbddf93e1f7a84fabe55225b7e0c30632..44dc21717a1bbe9e4211a5162a1ba3f6bc9d6671 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-21  Oliver Kiddle  <okiddle@yahoo.co.uk>
+
+       * sbr/getpass.c fix bug where inc crashed on failing to reopen
+       the terminal
+

 2005-01-27  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
        * Added -proxy option to inc and msgchk. Based on old patch
 2005-01-27  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
        * Added -proxy option to inc and msgchk. Based on old patch

diff --git a/sbr/getpass.c b/sbr/getpass.c
index b33a3f8edaa840d7613c65c3d4bb0421f08d930b..6bc2cb8af0eaf62ff1264b6f11522f5adba96e89 100644 (file)
--- a/sbr/getpass.c
+++ b/sbr/getpass.c
@@ -35,7 +35,7 @@
 
 #include <stdio.h>
 #include <termios.h>
 
 #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
 #include "h/mh.h"     /* for adios() */
 
 /* We don't use MAX_PASS here because the maximum password length on a remote


@@ -52,21 +52,21 @@ nmh_getpass(const char *prompt)
 {
   struct termios oterm, term;
   int ch;
 {
   struct termios oterm, term;
   int ch;

-  char *p, *ttystring;
+  char *p;

   FILE *fout, *fin;
   static char  buf[MAX_PASSWORD_LEN + 1];
   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) {
+  if (!istty || !(fout = fin = fopen("/dev/tty", "w+"))) {

     fout = stderr;
     fin = stdin;
   }
   else /* Reading directly from terminal here */
     {
     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)tcgetattr(fileno(fin), &oterm);
       term = oterm; /* Save original info */
       term.c_lflag &= ~ECHO;


@@ -81,7 +81,7 @@ nmh_getpass(const char *prompt)
     *p++ = ch;
   *p = '\0';
 
     *p++ = ch;
   *p = '\0';
 

-  if(ttystring != NULL) {
+  if (istty) {

     (void)tcsetattr(fileno(fin), TCSANOW, &oterm);
     rewind(fout);
     (void)fputc('\n', fout);
     (void)tcsetattr(fileno(fin), TCSANOW, &oterm);
     rewind(fout);
     (void)fputc('\n', fout);