diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-01-16 06:39:28 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-01-16 06:39:28 +0000 |
| commit | b9fc9a728fce9c4289b7e9a992665e28d5629a54 (patch) | |
| tree | 72b2433e418dfa1aef5fcf8305617b97979a25d8 /usr.bin/ftp/cmds.c | |
| parent | improve checksum parsing slightly. now handles filenames with spaces. (diff) | |
| download | wireguard-openbsd-b9fc9a728fce9c4289b7e9a992665e28d5629a54.tar.xz wireguard-openbsd-b9fc9a728fce9c4289b7e9a992665e28d5629a54.zip | |
Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)
Diffstat (limited to 'usr.bin/ftp/cmds.c')
| -rw-r--r-- | usr.bin/ftp/cmds.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c index d918391edc5..e0dc7f24e45 100644 --- a/usr.bin/ftp/cmds.c +++ b/usr.bin/ftp/cmds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmds.c,v 1.72 2014/08/16 07:49:27 deraadt Exp $ */ +/* $OpenBSD: cmds.c,v 1.73 2015/01/16 06:40:08 deraadt Exp $ */ /* $NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $ */ /* @@ -281,7 +281,7 @@ usage: oldintr = signal(SIGINT, mabort); (void)setjmp(jabort); if (proxy) { - char *cp, *tp2, tmpbuf[MAXPATHLEN]; + char *cp, *tp2, tmpbuf[PATH_MAX]; while ((cp = remglob(argv, 0, NULL)) != NULL) { if (*cp == '\0') { @@ -696,7 +696,7 @@ setprompt(int argc, char *argv[]) void setgate(int argc, char *argv[]) { - static char gsbuf[MAXHOSTNAMELEN]; + static char gsbuf[HOST_NAME_MAX+1]; if (argc > 3) { fprintf(ttyout, "usage: %s [on | off | host [port]]\n", @@ -800,7 +800,7 @@ setdebug(int argc, char *argv[]) void lcd(int argc, char *argv[]) { - char buf[MAXPATHLEN]; + char buf[PATH_MAX]; char *oldargv1; if (argc < 2) @@ -993,7 +993,7 @@ shell(int argc, char *argv[]) { pid_t pid; sig_t old1, old2; - char shellnam[MAXPATHLEN], *shellp, *namep; + char shellnam[PATH_MAX], *shellp, *namep; int wait_status; old1 = signal (SIGINT, SIG_IGN); @@ -1120,7 +1120,7 @@ pwd(int argc, char *argv[]) void lpwd(int argc, char *argv[]) { - char buf[MAXPATHLEN]; + char buf[PATH_MAX]; if (getcwd(buf, sizeof(buf)) != NULL) fprintf(ttyout, "Local directory %s\n", buf); @@ -1462,10 +1462,10 @@ setnmap(int argc, char *argv[]) cp = strchr(altarg, ' '); } *cp = '\0'; - (void)strncpy(mapin, altarg, MAXPATHLEN - 1); + (void)strncpy(mapin, altarg, PATH_MAX - 1); while (*++cp == ' ') continue; - (void)strncpy(mapout, cp, MAXPATHLEN - 1); + (void)strncpy(mapout, cp, PATH_MAX - 1); } void |