From de47eb59bb829423b1d0f47ba13099073999b3cb Mon Sep 17 00:00:00 2001
From: Nicolas Planel <nplanel@mandriva.com>
Date: Wed, 29 Oct 2003 16:07:11 +0000
Subject: Corporate Server 2.1.1 release

---
 mdk-stage1/dietlibc/libcruft/getpass.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'mdk-stage1/dietlibc/libcruft/getpass.c')

diff --git a/mdk-stage1/dietlibc/libcruft/getpass.c b/mdk-stage1/dietlibc/libcruft/getpass.c
index 3da7cd2b3..2183284b3 100644
--- a/mdk-stage1/dietlibc/libcruft/getpass.c
+++ b/mdk-stage1/dietlibc/libcruft/getpass.c
@@ -3,30 +3,42 @@
 #include <limits.h>
 #include <fcntl.h>
 #include <string.h>
+#include <errno.h>
+
+static inline int _tcsetattr(int fd,int optional,struct termios *termios_p) {
+  int tmp;
+  for (;;) {
+    if ((tmp=tcsetattr(fd,optional,termios_p)))
+      if (errno==EINTR) continue;
+    break;
+  }
+  return tmp;
+}
 
 char *getpass(const char* prompt) {
   struct termios old,tmp;
   int out,in=open("/dev/tty",O_RDWR);
   int doclose=(in>=0);
   static char buf[PASS_MAX];
-  if (doclose) { in=0; out=2; } else out=in;
+  if (!doclose) { in=0; out=2; } else out=in;
   if (!tcgetattr(in,&old)) {
     tmp=old;
     tmp.c_lflag &= ~(ECHO|ISIG);
-    tcsetattr(in,TCSAFLUSH,&tmp);
+    _tcsetattr(in,TCSAFLUSH,&tmp);
   }
   write(out,prompt,strlen(prompt));
   {
     int nread,ofs=0;
     for (;;) {
-      nread=read(in,buf+ofs,PASS_MAX-ofs);
-      if (nread<0) {
+      nread=read(in,buf+ofs,1);
+      if (nread<=0) {
+	if (errno==EINTR) continue;
 	buf[ofs]=0;
 	break;
       } else if (ofs+nread>=PASS_MAX) {
 	buf[PASS_MAX-1]=0;
 	break;
-      } else if (buf[ofs+nread-1]=='\n') {
+      } else if (buf[ofs]=='\n') {
 	buf[ofs+nread-1]=0;
 	break;
       }
@@ -34,7 +46,7 @@ char *getpass(const char* prompt) {
     }
     write(out,"\n",1);
   }
-  tcsetattr(in,TCSAFLUSH,&old);
+  _tcsetattr(in,TCSAFLUSH,&old);
   if (doclose) close(in);
   return buf;
 }
-- 
cgit v1.2.1