summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2017-01-20 01:19:19 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2017-01-20 01:19:19 +0000
commit0cd8797016db3513154e74017b6fc2e734743466 (patch)
tree45cb83ccee0091bdc7221a5c9c65f55118a7e161 /usr.bin
parent57b37314059f8b61f1abec441194c4819a9670e2 (diff)
#ifndef SMALL around a couple of non-SMALL labels.
ok deraadt@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ftp/small.c4
-rw-r--r--usr.bin/ftp/util.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/ftp/small.c b/usr.bin/ftp/small.c
index 3f85130baaf..66d31d59e0d 100644
--- a/usr.bin/ftp/small.c
+++ b/usr.bin/ftp/small.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: small.c,v 1.7 2016/12/16 17:44:59 krw Exp $ */
+/* $OpenBSD: small.c,v 1.8 2017/01/20 01:19:18 krw Exp $ */
/* $NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $ */
/*
@@ -289,7 +289,9 @@ usage:
recvrequest("RETR", argv[2], argv[1], mode,
argv[1] != oldargv1 || argv[2] != oldargv2 || !interactive, loc);
restart_point = 0;
+#ifndef SMALL
freegetit:
+#endif
if (oldargv2 != globargv2) /* free up after globulize() */
free(globargv2);
return (rval);
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index 8629f8faea3..1dd258c1928 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.82 2017/01/11 13:40:24 zhuk Exp $ */
+/* $OpenBSD: util.c,v 1.83 2017/01/20 01:19:18 krw Exp $ */
/* $NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $ */
/*-
@@ -438,7 +438,9 @@ remglob2(char *argv[], int doswitch, char **errbuf, FILE **ftemp, char *type)
return (NULL);
}
}
+#ifndef SMALL
again:
+#endif
if (fgets(buf, sizeof(buf), *ftemp) == NULL) {
(void)fclose(*ftemp);
*ftemp = NULL;