Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- cast arg to is*() to unsigned char. 

- don't require d_namlen to exist
- don't recompute the length of the file everytime around the loop.
This commit is contained in:
christos 1998-05-20 00:53:57 +00:00
parent acb3ba5670
commit da64e19c34
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.bin/ftp/complete.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $ */ /* $NetBSD: complete.c,v 1.12 1998/05/20 00:53:57 christos Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -40,7 +40,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $"); __RCSID("$NetBSD: complete.c,v 1.12 1998/05/20 00:53:57 christos Exp $");
#endif /* not lint */ #endif /* not lint */
/* /*
@ -174,6 +174,7 @@ complete_local(word, list)
DIR *dd; DIR *dd;
struct dirent *dp; struct dirent *dp;
unsigned char rv; unsigned char rv;
size_t len;
if ((file = strrchr(word, '/')) == NULL) { if ((file = strrchr(word, '/')) == NULL) {
dir[0] = '.'; dir[0] = '.';
@ -195,12 +196,20 @@ complete_local(word, list)
words = sl_init(); words = sl_init();
len = strlen(file);
for (dp = readdir(dd); dp != NULL; dp = readdir(dd)) { for (dp = readdir(dd); dp != NULL; dp = readdir(dd)) {
if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
continue; continue;
if (strlen(file) > dp->d_namlen)
#ifndef __SVR4
if (len > dp->d_namlen)
continue; continue;
if (strncmp(file, dp->d_name, strlen(file)) == 0) { #else
if (len > strlen(dp->d_name))
continue;
#endif
if (strncmp(file, dp->d_name, len) == 0) {
char *tcp; char *tcp;
tcp = strdup(dp->d_name); tcp = strdup(dp->d_name);
@ -345,7 +354,7 @@ complete(el, ch)
/* check for 'continuation' completes (which are uppercase) */ /* check for 'continuation' completes (which are uppercase) */
if ((cursor_argc > celems) && (celems > 0) if ((cursor_argc > celems) && (celems > 0)
&& isupper(c->c_complete[celems-1])) && isupper((unsigned char) c->c_complete[celems-1]))
cursor_argc = celems; cursor_argc = celems;
if (cursor_argc > celems) if (cursor_argc > celems)