summaryrefslogtreecommitdiff
path: root/libexec/ftpd/ftpd.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-07-08 21:18:14 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-07-08 21:18:14 +0000
commit699c4ce680db1fb49447b9e177bccaa2b451e33c (patch)
tree5abc4259a7dcc07ab250be730cfe703ce01ffaaf /libexec/ftpd/ftpd.c
parentdc7875ea2fd93df64c33fcce973754bcd62b2343 (diff)
-Wall
Diffstat (limited to 'libexec/ftpd/ftpd.c')
-rw-r--r--libexec/ftpd/ftpd.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 6bf02253eb7..d41754d26aa 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftpd.c,v 1.102 2001/07/03 21:17:56 millert Exp $ */
+/* $OpenBSD: ftpd.c,v 1.103 2001/07/08 21:18:07 deraadt Exp $ */
/* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */
/*
@@ -73,7 +73,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94";
#else
-static char rcsid[] = "$OpenBSD: ftpd.c,v 1.102 2001/07/03 21:17:56 millert Exp $";
+static char rcsid[] = "$OpenBSD: ftpd.c,v 1.103 2001/07/08 21:18:07 deraadt Exp $";
#endif
#endif /* not lint */
@@ -1576,7 +1576,8 @@ receive_data(instr, outstr)
FILE *instr, *outstr;
{
int c;
- int cnt, bare_lfs = 0;
+ int cnt;
+ volatile int bare_lfs = 0;
char buf[BUFSIZ];
transflag++;
@@ -1790,7 +1791,6 @@ printaddr:
}
/* EPRT/EPSV */
-epsvonly:
{
u_char af;
@@ -2567,9 +2567,10 @@ send_file_list(whichf)
DIR *dirp = NULL;
struct dirent *dir;
FILE *dout = NULL;
- char **dirlist, *dirname;
+ char **dirlist;
+ char *dirname;
int simple = 0;
- int freeglob = 0;
+ volatile int freeglob = 0;
glob_t gl;
if (strpbrk(whichf, "~{[*?") != NULL) {