(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.
This commit is contained in:
Markus Armbruster 2007-12-14 06:59:09 +00:00
parent 43cceac785
commit 3807cffe52
3 changed files with 0 additions and 12 deletions

View file

@ -65,7 +65,6 @@ recvline(int s, char *buf)
int cc; int cc;
size = 1024; size = 1024;
(void)alarm(30);
ptr = buf; ptr = buf;
n = recv(s, ptr, size, MSG_PEEK); n = recv(s, ptr, size, MSG_PEEK);
if (n <= 0) { if (n <= 0) {
@ -108,7 +107,6 @@ recvline(int s, char *buf)
return 0; return 0;
} }
buf[newline] = '\0'; buf[newline] = '\0';
(void)alarm(0);
if (!isxdigit(buf[0]) || buf[1] != ' ') { if (!isxdigit(buf[0]) || buf[1] != ' ') {
fprintf(stderr, "Malformed line %s\n", buf); fprintf(stderr, "Malformed line %s\n", buf);
return 0; return 0;

View file

@ -42,15 +42,6 @@
#include "ringbuf.h" #include "ringbuf.h"
#include "secure.h" #include "secure.h"
/*
* Ignore alarm for WIN32 client
*/
int
alarm(int time)
{
return 0;
}
/* /*
* Get user name in the WIN32 environment * Get user name in the WIN32 environment
*/ */

View file

@ -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_createfd(const char *fname, int oflag, ...);
extern int w32_openhandle(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 struct passwd *w32_getpw(void);
extern char *getpass(char *prompt); extern char *getpass(char *prompt);
extern void sysdep_init(void); extern void sysdep_init(void);