diff options
| author | lukem <lukem@NetBSD.org> | 2001-04-12 02:28:59 +0000 |
|---|---|---|
| committer | lukem <lukem@NetBSD.org> | 2001-04-12 02:28:59 +0000 |
| commit | 748a2d7987a6533edc87877b60650a606fac0827 (patch) | |
| tree | 30a56ff87c318b5a9523b6a7eaa94810c216debd /libexec | |
| parent | 5274818efccba665457012267c360ee33fb7223b (diff) | |
minor knf post aidan's oob rototill
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/ftpcmd.y | 6 | ||||
| -rw-r--r-- | libexec/ftpd/ftpd.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index f722132359d..7b405b77a0f 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -1,4 +1,4 @@ -/* $NetBSD: ftpcmd.y,v 1.61 2001/04/10 01:41:18 itojun Exp $ */ +/* $NetBSD: ftpcmd.y,v 1.62 2001/04/12 02:28:59 lukem Exp $ */ /*- * Copyright (c) 1997-2000 The NetBSD Foundation, Inc. @@ -83,7 +83,7 @@ #if 0 static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #else -__RCSID("$NetBSD: ftpcmd.y,v 1.61 2001/04/10 01:41:18 itojun Exp $"); +__RCSID("$NetBSD: ftpcmd.y,v 1.62 2001/04/12 02:28:59 lukem Exp $"); #endif #endif /* not lint */ @@ -1426,6 +1426,7 @@ toolong(int signo) void ftp_handle_line(char *cp) { + cmdp = cp; yyparse(); } @@ -1433,6 +1434,7 @@ ftp_handle_line(char *cp) void ftp_loop(void) { + while (1) { (void) signal(SIGALRM, toolong); (void) alarm(curclass.timeout); diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 9f1db6ef7ea..5c62dc16702 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftpd.c,v 1.123 2001/04/01 23:04:31 aidan Exp $ */ +/* $NetBSD: ftpd.c,v 1.124 2001/04/12 02:28:59 lukem Exp $ */ /* * Copyright (c) 1997-2000 The NetBSD Foundation, Inc. @@ -109,7 +109,7 @@ __COPYRIGHT( #if 0 static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: ftpd.c,v 1.123 2001/04/01 23:04:31 aidan Exp $"); +__RCSID("$NetBSD: ftpd.c,v 1.124 2001/04/12 02:28:59 lukem Exp $"); #endif #endif /* not lint */ @@ -2184,8 +2184,10 @@ dologout(int status) _exit(status); } -void abor(void) +void +abor(void) { + tmpline[0] = '\0'; is_oob = 0; reply(426, "Transfer aborted. Data connection closed."); @@ -2193,8 +2195,10 @@ void abor(void) longjmp(urgcatch, 1); } -void statxfer(void) +void +statxfer(void) { + tmpline[0] = '\0'; is_oob = 0; if (file_size != (off_t) -1) |
