Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/usr.bin/ftp/complete.c,v rcsdiff: /ftp/cvs/cvsroot/src/usr.bin/ftp/complete.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.21.2.1 retrieving revision 1.22 diff -u -p -r1.21.2.1 -r1.22 --- src/usr.bin/ftp/complete.c 1999/06/25 01:14:57 1.21.2.1 +++ src/usr.bin/ftp/complete.c 1999/06/12 18:07:34 1.22 @@ -1,4 +1,4 @@ -/* $NetBSD: complete.c,v 1.21.2.1 1999/06/25 01:14:57 cgd Exp $ */ +/* $NetBSD: complete.c,v 1.22 1999/06/12 18:07:34 christos Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -36,9 +36,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifndef SMALL + #include #ifndef lint -__RCSID("$NetBSD: complete.c,v 1.21.2.1 1999/06/25 01:14:57 cgd Exp $"); +__RCSID("$NetBSD: complete.c,v 1.22 1999/06/12 18:07:34 christos Exp $"); #endif /* not lint */ /* @@ -56,8 +58,6 @@ __RCSID("$NetBSD: complete.c,v 1.21.2.1 #include "ftp_var.h" -#ifndef NO_EDITCOMPLETE - static int comparstr __P((const void *, const void *)); static unsigned char complete_ambiguous __P((char *, int, StringList *)); static unsigned char complete_command __P((char *, int)); @@ -220,10 +220,10 @@ complete_local(word, list) continue; #if defined(__SVR4) || defined(__linux__) - if (len > strlen(dp->d_name)) + if (len > dp->d_namlen) continue; #else - if (len > dp->d_namlen) + if (len > strlen(dp->d_name)) continue; #endif if (strncmp(file, dp->d_name, len) == 0) { @@ -411,4 +411,4 @@ complete(el, ch) return (CC_ERROR); } -#endif /* !NO_EDITCOMPLETE */ +#endif /* !SMALL */