===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/complete.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/ftp/complete.c	2004/07/09 17:11:22	1.15
--- src/usr.bin/ftp/complete.c	2004/07/20 03:50:25	1.16
***************
*** 1,4 ****
! /*	$OpenBSD: complete.c,v 1.15 2004/07/09 17:11:22 millert Exp $	*/
  /*	$NetBSD: complete.c,v 1.10 1997/08/18 10:20:18 lukem Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: complete.c,v 1.16 2004/07/20 03:50:25 deraadt Exp $	*/
  /*	$NetBSD: complete.c,v 1.10 1997/08/18 10:20:18 lukem Exp $	*/
  
  /*-
***************
*** 39,45 ****
  
  #ifndef SMALL
  #ifndef lint
! static char rcsid[] = "$OpenBSD: complete.c,v 1.15 2004/07/09 17:11:22 millert Exp $";
  #endif /* not lint */
  
  /*
--- 39,45 ----
  
  #ifndef SMALL
  #ifndef lint
! static char rcsid[] = "$OpenBSD: complete.c,v 1.16 2004/07/20 03:50:25 deraadt Exp $";
  #endif /* not lint */
  
  /*
***************
*** 62,69 ****
  static unsigned char complete_remote(char *, int);
  
  static int
! comparstr(a, b)
! 	const void *a, *b;
  {
  	return (strcmp(*(char **)a, *(char **)b));
  }
--- 62,68 ----
  static unsigned char complete_remote(char *, int);
  
  static int
! comparstr(const void *a, const void *b)
  {
  	return (strcmp(*(char **)a, *(char **)b));
  }
***************
*** 79,88 ****
   *	words	stringlist containing possible matches
   */
  static unsigned char
! complete_ambiguous(word, list, words)
! 	char *word;
! 	int list;
! 	StringList *words;
  {
  	char insertstr[MAXPATHLEN];
  	char *lastmatch;
--- 78,84 ----
   *	words	stringlist containing possible matches
   */
  static unsigned char
! complete_ambiguous(char *word, int list, StringList *words)
  {
  	char insertstr[MAXPATHLEN];
  	char *lastmatch;
***************
*** 134,142 ****
   * Complete a command
   */
  static unsigned char
! complete_command(word, list)
! 	char *word;
! 	int list;
  {
  	struct cmd *c;
  	StringList *words;
--- 130,136 ----
   * Complete a command
   */
  static unsigned char
! complete_command(char *word, int list)
  {
  	struct cmd *c;
  	StringList *words;
***************
*** 162,170 ****
   * Complete a local file
   */
  static unsigned char
! complete_local(word, list)
! 	char *word;
! 	int list;
  {
  	StringList *words;
  	char dir[MAXPATHLEN];
--- 156,162 ----
   * Complete a local file
   */
  static unsigned char
! complete_local(char *word, int list)
  {
  	StringList *words;
  	char dir[MAXPATHLEN];
***************
*** 217,225 ****
   * Complete a remote file
   */
  static unsigned char
! complete_remote(word, list)
! 	char *word;
! 	int list;
  {
  	static StringList *dirlist;
  	static char	 lastdir[MAXPATHLEN];
--- 209,215 ----
   * Complete a remote file
   */
  static unsigned char
! complete_remote(char *word, int list)
  {
  	static StringList *dirlist;
  	static char	 lastdir[MAXPATHLEN];
***************
*** 298,306 ****
   * Generic complete routine
   */
  unsigned char
! complete(el, ch)
! 	EditLine *el;
! 	int ch;
  {
  	static char word[FTPBUFLEN];
  	static int lastc_argc, lastc_argo;
--- 288,294 ----
   * Generic complete routine
   */
  unsigned char
! complete(EditLine *el, int ch)
  {
  	static char word[FTPBUFLEN];
  	static int lastc_argc, lastc_argo;