Changeset 264 in openpam

Timestamp:

Jul 14, 2003, 2:17:47 PM (18 years ago)

Author:

Dag-Erling Smørgrav

Message:

Use read(2) on fileno(stdin) rather than fgets(3). This make timeout
handling considerably simpler, eliminating the need for setjmp(3) and
evil global variables.

Portions submitted by: Dmitry V. Levin <ldv@…>

Location:

trunk

Files:

• configure.in (modified) (3 diffs)
• include/security/openpam.h (modified) (2 diffs)
• lib/openpam_ttyconv.c (modified) (5 diffs)

trunk/configure.in

@@ -1 @@
-dnl $P4: //depot/projects/openpam/configure.in#2 $
+dnl $P4: //depot/projects/openpam/configure.in#3 $
 
 AC_PREREQ(2.53)
@@ -7 +7 @@
 
 AC_CANONICAL_SYSTEM
+AC_C_VOLATILE
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
@@ -64 +65 @@
 AM_CONDITIONAL(WITH_PAM_UNIX, test "x$with_pam_unix" = "xyes")
 
+AC_PROG_INSTALL
+
 AC_CHECK_HEADERS(crypt.h)
 
-AC_PROG_INSTALL
+AC_CHECK_FUNCS(fpurge)
 
 DL_LIBS=

trunk/include/security/openpam.h

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam.h#24 $
+ * $P4: //depot/projects/openpam/include/security/openpam.h#25 $
  */
 
@@ -178 +178 @@
         struct pam_response **_resp,
         void *_data);
+
+extern int openpam_ttyconv_timeout;
 
 /*

trunk/lib/openpam_ttyconv.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#21 $
+ * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#22 $
  */
 
@@ -38 +38 @@
 
 #include <ctype.h>
+#include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
@@ -51 +52 @@
 
 int openpam_ttyconv_timeout = 0;
-static jmp_buf jmpenv;
-static int timed_out;
 
 static void
 timeout(int sig)
 {
-        timed_out = 1;
-        longjmp(jmpenv, sig);
+
+        (void)sig;
 }
 
@@ -68 +67 @@
         sigset_t saved_sigset, sigset;
         unsigned int saved_alarm;
+        int eof, error, fd, timed_out;
         size_t len;
         char *retval;
+        char ch;
 
         sigemptyset(&sigset);
@@ -80 +81 @@
         sigaction(SIGALRM, &action, &saved_action);
         fputs(msg, stdout);
+        fflush(stdout);
+#ifdef HAVE_FPURGE
+        fpurge(stdin);
+#endif
+        fd = fileno(stdin);
         buf[0] = '\0';
         timed_out = 0;
+        eof = error = timed_out = 0;
         saved_alarm = alarm(openpam_ttyconv_timeout);
-        if (setjmp(jmpenv) == 0)
-                fgets(buf, sizeof buf, stdin);
-        else
-                fputs(" timeout!\n", stderr);
+        ch = '\0';
+        for (len = 0; ch != '\n' && !eof && !error; ++len) {
+                switch (read(fd, &ch, 1)) {
+                case 1:
+                        if (len < PAM_MAX_RESP_SIZE - 1) {
+                                buf[len + 1] = '\0';
+                                buf[len] = ch;
+                        }
+                        break;
+                case 0:
+                        eof = 1;
+                        break;
+                default:
+                        error = errno;
+                        break;
+                }
+        }
         alarm(0);
         sigaction(SIGALRM, &saved_action, NULL);
         sigprocmask(SIG_SETMASK, &saved_sigset, NULL);
         alarm(saved_alarm);
-        if (timed_out || ferror(stdin) || feof(stdin)) {
+        if (error == EINTR)
+                fputs(" timeout!", stderr);
+        if (error || eof) {
+                fputs("\n", stderr);
                 memset(buf, 0, sizeof(buf));
                 return (NULL);