Module Name: src
Committed By: christos
Date: Fri Apr 13 14:39:34 UTC 2012
Modified Files:
src/lib/libc/gen: getpass.3 getpass.c
Log Message:
add timeout.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/gen/getpass.3
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/gen/getpass.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/getpass.3
diff -u src/lib/libc/gen/getpass.3:1.18 src/lib/libc/gen/getpass.3:1.19
--- src/lib/libc/gen/getpass.3:1.18 Fri Apr 13 02:38:18 2012
+++ src/lib/libc/gen/getpass.3 Fri Apr 13 10:39:34 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: getpass.3,v 1.18 2012/04/13 06:38:18 wiz Exp $
+.\" $NetBSD: getpass.3,v 1.19 2012/04/13 14:39:34 christos Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)getpass.3 8.1 (Berkeley) 6/4/93
.\"
-.Dd April 12, 2012
+.Dd April 13, 2012
.Dt GETPASS 3
.Os
.Sh NAME
@@ -44,7 +44,7 @@
.Ft char *
.Fn getpass_r "const char *prompt" "char *buf" "size_t buflen"
.Ft char *
-.Fn getpassfd "const char *prompt" "char *buf" "size_t buflen" "int fd[3]" "int flags"
+.Fn getpassfd "const char *prompt" "char *buf" "size_t buflen" "int fd[3]" "int flags" "int timeout"
.Sh DESCRIPTION
The
.Fn getpass
@@ -105,6 +105,13 @@ for each character entered.
.It Dv GETPASS_ECHO
Echo characters as they are typed.
.El
+Finally if the
+.Fa timeout
+argument is non zero,
+.Fn getpassfd
+will wait for
+.Fa timeout
+seconds for input after each character before returning an error.
.Sh RETURN VALUES
The
.Fn getpass
Index: src/lib/libc/gen/getpass.c
diff -u src/lib/libc/gen/getpass.c:1.22 src/lib/libc/gen/getpass.c:1.23
--- src/lib/libc/gen/getpass.c:1.22 Fri Apr 13 10:16:27 2012
+++ src/lib/libc/gen/getpass.c Fri Apr 13 10:39:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: getpass.c,v 1.22 2012/04/13 14:16:27 christos Exp $ */
+/* $NetBSD: getpass.c,v 1.23 2012/04/13 14:39:34 christos Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getpass.c,v 1.22 2012/04/13 14:16:27 christos Exp $");
+__RCSID("$NetBSD: getpass.c,v 1.23 2012/04/13 14:39:34 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -49,6 +49,7 @@ __RCSID("$NetBSD: getpass.c,v 1.22 2012/
#include <termios.h>
#include <unistd.h>
#include <fcntl.h>
+#include <poll.h>
#ifdef __weak_alias
__weak_alias(getpassfd,_getpassfd)
@@ -78,7 +79,8 @@ __weak_alias(getpass,_getpass)
*/
char *
/*ARGSUSED*/
-getpassfd(const char *prompt, char *buf, size_t len, int fd[], int flags)
+getpassfd(const char *prompt, char *buf, size_t len, int fd[], int flags,
+ int tout)
{
struct termios gt;
char c;
@@ -123,15 +125,30 @@ getpassfd(const char *prompt, char *buf,
c = '\1';
lnext = false;
for (size_t l = 0; c != '\0'; ) {
+ if (tout) {
+ struct pollfd pfd;
+ pfd.fd = fd[0];
+ pfd.events = POLLIN|POLLRDNORM;
+ pfd.revents = 0;
+ switch (poll(&pfd, 1, tout * 1000)) {
+ case 0:
+ errno = ENODATA;
+ /*FALLTHROUGH*/
+ case -1:
+ goto restore;
+ default:
+ break;
+ }
+ }
if (read(fd[0], &c, 1) != 1)
goto restore;
-#define beep() do \
- if (flags & GETPASS_NO_BEEP) \
- (void)write(fd[2], "\a", 1); \
+#define beep() \
+ do \
+ if (flags & GETPASS_NO_BEEP) \
+ (void)write(fd[2], "\a", 1); \
while (/*CONSTCOND*/ 0)
#define erase() (void)write(fd[1], "\b \b", 3)
-
#define C(a, b) (gt.c_cc[(a)] == _POSIX_VDISABLE ? (b) : gt.c_cc[(a)])
if (lnext) {
@@ -270,7 +287,7 @@ getpass_r(const char *prompt, char *buf,
} else
opentty = true;
- rv = getpassfd(prompt, buf, len, fd, 0);
+ rv = getpassfd(prompt, buf, len, fd, 0, 0);
if (opentty) {
int serrno = errno;
@@ -313,7 +330,7 @@ main(int argc, char *argv[])
char buf[28];
int fd[3] = { 0, 1, 2 };
printf("[%s]\n", getpassfd("foo>", buf, sizeof(buf), fd,
- GETPASS_ECHO_STAR));
+ GETPASS_ECHO_STAR, 2));
return 0;
}
#endif
