X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Flegacy%2Fgetpass.c;h=d51286c0b03b3b3e9109a1e20804dbb9d4f3c4a1;hb=d5e55ba3320c30310ca1d8938925d5424a652422;hp=d439a2a57fb606aa9f08c22b46320c9403597d76;hpb=b9bb8f67bbac9bab5314fb00974ad469476e936e;p=musl

diff --git a/src/legacy/getpass.c b/src/legacy/getpass.c
index d439a2a5..d51286c0 100644
--- a/src/legacy/getpass.c
+++ b/src/legacy/getpass.c
@@ -1,8 +1,9 @@
+#define _GNU_SOURCE
 #include <stdio.h>
-#include <string.h>
 #include <termios.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <string.h>
 
 char *getpass(const char *prompt)
 {
@@ -11,7 +12,7 @@ char *getpass(const char *prompt)
 	ssize_t l;
 	static char password[128];
 
-	if ((fd = open("/dev/tty", O_RDONLY|O_NOCTTY)) < 0) fd = 0;
+	if ((fd = open("/dev/tty", O_RDWR|O_NOCTTY|O_CLOEXEC)) < 0) return 0;
 
 	tcgetattr(fd, &t);
 	s = t;
@@ -22,18 +23,18 @@ char *getpass(const char *prompt)
 	tcsetattr(fd, TCSAFLUSH, &t);
 	tcdrain(fd);
 
-	fputs(prompt, stderr);
-	fflush(stderr);
+	dprintf(fd, "%s", prompt);
 
 	l = read(fd, password, sizeof password);
 	if (l >= 0) {
-		if (l > 0 && password[l-1] == '\n') l--;
+		if (l > 0 && password[l-1] == '\n' || l==sizeof password) l--;
 		password[l] = 0;
 	}
 
 	tcsetattr(fd, TCSAFLUSH, &s);
 
-	if (fd > 2) close(fd);
+	dprintf(fd, "\n");
+	close(fd);
 
-	return password;
+	return l<0 ? 0 : password;
 }