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/extern.h,v
rcsdiff: /ftp/cvs/cvsroot/src/usr.bin/ftp/extern.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.64.2.5
retrieving revision 1.65
diff -u -p -r1.64.2.5 -r1.65
--- src/usr.bin/ftp/extern.h	2005/07/24 10:29:52	1.64.2.5
+++ src/usr.bin/ftp/extern.h	2005/04/11 01:43:31	1.65
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.64.2.5 2005/07/24 10:29:52 tron Exp $	*/
+/*	$NetBSD: extern.h,v 1.65 2005/04/11 01:43:31 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1996-2005 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
 /*
  * Copyright (C) 1997 and 1998 WIDE Project.
  * All rights reserved.
- *
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -82,7 +82,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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
@@ -141,7 +141,6 @@ int	ftp_login(const char *, const char *
 void	get(int, char **);
 struct cmd *getcmd(const char *);
 int	getit(int, char **, int, const char *);
-int	getline(FILE *, char *, size_t, const char **);
 struct option *getoption(const char *);
 char   *getoptionvalue(const char *);
 void	getremoteinfo(void);
@@ -171,7 +170,7 @@ void	mls(int, char **);
 void	mlst(int, char **);
 void	modtime(int, char **);
 void	mput(int, char **);
-const char *onoff(int);
+char   *onoff(int);
 void	opts(int, char **);
 void	newer(int, char **);
 void	page(int, char **);
@@ -190,7 +189,7 @@ void	quote1(const char *, int, char **);
 void	recvrequest(const char *, const char *, const char *,
 	    const char *, int, int);
 void	reget(int, char **);
-char   *remglob(char **, int, const char **);
+char   *remglob(char **, int, char **);
 time_t	remotemodtime(const char *, int);
 off_t	remotesize(const char *, int);
 void	removedir(int, char **);
@@ -200,7 +199,8 @@ void	restart(int, char **);
 void	rmthelp(int, char **);
 void	rmtstatus(int, char **);
 char   *rprompt(void);
-int	ruserpass(const char *, char **, char **, char **);
+int	ruserpass(const char *, const char **, const char **,
+	    const char **);
 void	sendrequest(const char *, const char *, const char *, int);
 void	setascii(int, char **);
 void	setbell(int, char **);
@@ -248,7 +248,7 @@ void	updatelocalcwd(void);
 void	updateremotecwd(void);
 void	usage(void);
 void	user(int, char **);
-int	xconnect(int, const struct sockaddr *, socklen_t);
+int	xconnect(int, const struct sockaddr *, int);
 int	xlisten(int, int);
 int	xpoll(struct pollfd *, int, int);
 void   *xmalloc(size_t);