(recvline): Remove the timeout feature. There are many other places

where the client could wait indefinitely for the server.  The user can
always interrupt.

[_WIN32] (alarm): Unused, remove.

diff --git a/src/client/expect.c b/src/client/expect.c
index 7ac8008c7b564e21f6cd283e4a51102ad44e7c3d..b681668a6fcd43b6ae93bbdad07eb990246ddfee 100644 (file)
--- a/src/client/expect.c
+++ b/src/client/expect.c
@@ -65,7 +65,6 @@ recvline(int s, char *buf)
     int cc;
 
     size = 1024;
-    (void)alarm(30);
     ptr = buf;
     n = recv(s, ptr, size, MSG_PEEK);
     if (n <= 0) {
@@ -108,7 +107,6 @@ recvline(int s, char *buf)
        return 0;
     }
     buf[newline] = '\0';
-    (void)alarm(0);
     if (!isxdigit(buf[0]) || buf[1] != ' ') {
        fprintf(stderr, "Malformed line %s\n", buf);
        return 0;

diff --git a/src/client/sysdep_w32.c b/src/client/sysdep_w32.c
index 9a3bad92fc4b31bc59c6f52a061990a8ce302488..4b0925dc36c453201cc5184e417a9cfdfa97e397 100644 (file)
--- a/src/client/sysdep_w32.c
+++ b/src/client/sysdep_w32.c
@@ -42,15 +42,6 @@
 #include "ringbuf.h"
 #include "secure.h"
 
-/*
- * Ignore alarm for WIN32 client
- */
-int 
-alarm(int time)
-{
-    return 0;
-}
-
 /*
  * Get user name in the WIN32 environment
  */

diff --git a/src/client/sysdep_w32.h b/src/client/sysdep_w32.h
index 2cb5580eba6d9ead0bd24c93ca09781712785b7a..8721aca8deaa079fdc651b8dfe766feff62ea3b4 100644 (file)
--- a/src/client/sysdep_w32.h
+++ b/src/client/sysdep_w32.h
@@ -74,7 +74,6 @@ extern ssize_t w32_writev_socket(int fd, const struct iovec *iov,
 extern int w32_createfd(const char *fname, int oflag, ...);
 extern int w32_openhandle(const char *fname, int oflag);
 
-extern int alarm(int time);
 extern struct passwd *w32_getpw(void);
 extern char *getpass(char *prompt);
 extern void sysdep_init(void);