diff options
| author | pst <pst@FreeBSD.org> | 1997-12-13 20:38:21 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1997-12-13 20:38:21 +0000 |
| commit | 5ff5a36e72d385d6aeacd844c482b8045dbc147d (patch) | |
| tree | efc37af8df64054bcc13f979ffbae7a4303972f1 /usr.bin/ftp/complete.c | |
| parent | 7f8db0dd299e62df2aa8f56158134d1af1cbbcce (diff) | |
| download | FreeBSD-src-5ff5a36e72d385d6aeacd844c482b8045dbc147d.zip FreeBSD-src-5ff5a36e72d385d6aeacd844c482b8045dbc147d.tar.gz | |
Sync with NetBSD v1.3.
Keep I8N1 and quarantine port code. Replace our security fix with NetBSD's
(their idea was better).
Diffstat (limited to 'usr.bin/ftp/complete.c')
| -rw-r--r-- | usr.bin/ftp/complete.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/usr.bin/ftp/complete.c b/usr.bin/ftp/complete.c index 689c1f8..901a916 100644 --- a/usr.bin/ftp/complete.c +++ b/usr.bin/ftp/complete.c @@ -1,5 +1,5 @@ -/* $Id: complete.c,v 1.2 1997/06/27 09:30:04 ache Exp $ */ -/* $NetBSD: complete.c,v 1.8 1997/05/24 16:34:30 lukem Exp $ */ +/* $Id$ */ +/* $NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -27,8 +27,8 @@ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN @@ -38,8 +38,11 @@ */ #ifndef SMALL + +#include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$Id: complete.c,v 1.2 1997/06/27 09:30:04 ache Exp $"; +__RCSID("$Id$"); +__RCSID_SOURCE("$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $"); #endif /* not lint */ /* @@ -81,7 +84,8 @@ complete_ambiguous(word, list, words) { char insertstr[MAXPATHLEN]; char *lastmatch; - int i, j, matchlen, wordlen; + int i, j; + size_t matchlen, wordlen; wordlen = strlen(word); if (words->sl_cur == 0) @@ -135,7 +139,7 @@ complete_command(word, list) { struct cmd *c; StringList *words; - int wordlen; + size_t wordlen; unsigned char rv; words = sl_init(); @@ -302,7 +306,8 @@ complete(el, ch) struct cmd *c; const LineInfo *lf; - int len, celems, dolist; + int celems, dolist; + size_t len; lf = el_line(el); len = lf->lastchar - lf->buffer; @@ -364,4 +369,5 @@ complete(el, ch) return (CC_ERROR); } -#endif + +#endif /* !SMALL */ |
