[src/netbsd-1-4]: src/usr.bin/ftp pull up revs 1.22-1.24 from trunk. (cgd)

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/63c2d3992381
branches:  netbsd-1-4
changeset: 469051:63c2d3992381
user:      cgd <cgd%NetBSD.org@localhost>
date:      Fri Jun 25 01:14:57 1999 +0000

description:
pull up revs 1.22-1.24 from trunk. (cgd)

diffstat:

 usr.bin/ftp/complete.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (52 lines):

diff -r 79e80d0207d7 -r 63c2d3992381 usr.bin/ftp/complete.c
--- a/usr.bin/ftp/complete.c    Fri Jun 25 01:14:47 1999 +0000
+++ b/usr.bin/ftp/complete.c    Fri Jun 25 01:14:57 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: complete.c,v 1.21 1999/03/08 03:09:08 lukem Exp $      */
+/*     $NetBSD: complete.c,v 1.21.2.1 1999/06/25 01:14:57 cgd Exp $    */
 
 /*-
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -36,11 +36,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SMALL
-
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: complete.c,v 1.21 1999/03/08 03:09:08 lukem Exp $");
+__RCSID("$NetBSD: complete.c,v 1.21.2.1 1999/06/25 01:14:57 cgd Exp $");
 #endif /* not lint */
 
 /*
@@ -58,6 +56,8 @@
 
 #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));
@@ -219,11 +219,11 @@
                if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
                        continue;
 
-#ifndef __SVR4
-               if (len > dp->d_namlen)
+#if defined(__SVR4) || defined(__linux__)
+               if (len > strlen(dp->d_name))
                        continue;
 #else
-               if (len > strlen(dp->d_name))
+               if (len > dp->d_namlen)
                        continue;
 #endif
                if (strncmp(file, dp->d_name, len) == 0) {
@@ -411,4 +411,4 @@
        return (CC_ERROR);
 }
 
-#endif /* !SMALL */
+#endif /* !NO_EDITCOMPLETE */