[src/trunk]: src/lib/libc/gen add timeout.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71d28a461b89
branches:  trunk
changeset: 778783:71d28a461b89
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Apr 13 14:39:34 2012 +0000

description:
add timeout.

diffstat:

 lib/libc/gen/getpass.3 |  13 ++++++++++---
 lib/libc/gen/getpass.c |  35 ++++++++++++++++++++++++++---------
 2 files changed, 36 insertions(+), 12 deletions(-)

diffs (130 lines):

diff -r c7393360fd7b -r 71d28a461b89 lib/libc/gen/getpass.3
--- a/lib/libc/gen/getpass.3    Fri Apr 13 14:16:27 2012 +0000
+++ b/lib/libc/gen/getpass.3    Fri Apr 13 14:39:34 2012 +0000
@@ -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 @@
 .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
diff -r c7393360fd7b -r 71d28a461b89 lib/libc/gen/getpass.c
--- a/lib/libc/gen/getpass.c    Fri Apr 13 14:16:27 2012 +0000
+++ b/lib/libc/gen/getpass.c    Fri Apr 13 14:39:34 2012 +0000
@@ -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 @@
 #include <termios.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <poll.h>
 
 #ifdef __weak_alias
 __weak_alias(getpassfd,_getpassfd)
@@ -78,7 +79,8 @@
  */
 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 @@
        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 @@
        } 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 @@
        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