* popen.c: Include ftpd_var.h

	* ftpd.c: Declare secure_fprintf, gunique, sgetsave, sgetpwnam,
	path_expand static.

	* ftpd_var.h: Add prototypes for getline, renamefrom, ftpd_popen,
	ftpd_pclose.

	* ftpcmd.y: Declare lookup, copy and urgsafe_getc static.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13545 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 33 insertions, 16 deletions

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 87fa52bd3..88a24f83b 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,15 @@
+2001-07-02  Ezra Peisach  <epeisach@mit.edu>
+
+	* popen.c: Include ftpd_var.h.
+
+	* ftpd.c: Declare secure_fprintf, gunique, sgetsave, sgetpwnam,
+	path_expand static.
+
+	* ftpd_var.h: Add prototypes for getline, renamefrom, ftpd_popen,
+	ftpd_pclose.
+
+	* ftpcmd.y: Declare lookup, copy and urgsafe_getc static.
+
 2001-06-22  Ezra Peisach  <epeisach@mit.edu>
 
 	* ftpcmd.y (help): Change local variable type to ftype.
diff --git a/src/appl/gssftp/ftpd/ftpcmd.y b/src/appl/gssftp/ftpd/ftpcmd.y
index 4d9089b85..282697e58 100644
--- a/src/appl/gssftp/ftpd/ftpcmd.y
+++ b/src/appl/gssftp/ftpd/ftpcmd.y
@@ -169,6 +169,7 @@ struct tab sitetab[];
 void sizecmd(char *);
 void help(struct tab *, char *);
 static int yylex(void);
+static char *copy(char *);
 %}
 
 %union { int num; char *str; }
@@ -653,8 +654,6 @@ cmd:		USER SP username CRLF
 	;
 rcmd:		RNFR check_login SP pathname CRLF
 		= {
-			char *renamefrom();
-
 			restart_point = (off_t) 0;
 			if ($2 && $4) {
 				fromname = renamefrom((char *) $4);
@@ -939,7 +938,7 @@ struct tab sitetab[] = {
 	{ NULL,   0,    0,    0,	0 }
 };
 
-struct tab *
+static struct tab *
 lookup(p, cmd)
 	register struct tab *p;
 	char *cmd;
@@ -954,7 +953,7 @@ lookup(p, cmd)
 /*
  * urgsafe_getc - hacked up getc to ignore EOF if SIOCATMARK returns TRUE
  */
-int
+static int
 urgsafe_getc(f)
 	FILE *f;
 {
@@ -979,6 +978,7 @@ urgsafe_getc(f)
 char *
 getline(s, n, iop)
 	char *s;
+	int n;
 	register FILE *iop;
 {
 	register int c;
@@ -1197,7 +1197,7 @@ yylex()
 	register char *cp, *cp2;
 	register struct tab *p;
 	int n;
-	char c, *copy();
+	char c;
 
 	for (;;) {
 		switch (state) {
@@ -1424,7 +1424,7 @@ upper(s)
 	}
 }
 
-char *
+static char *
 copy(s)
 	char *s;
 {
diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 592e53cd3..4aac16800 100644
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -240,7 +240,7 @@ int	swaitmax = SWAITMAX;
 int	swaitint = SWAITINT;
 
 void	lostconn(), myoob();
-FILE	*getdatasock(); 
+FILE	*getdatasock(char *); 
 #if defined(__STDC__)
 /* 
  * The following prototypes must be ANSI for systems for which
@@ -594,7 +594,7 @@ static char ttyline[20];
 /*
  * Helper function for sgetpwnam().
  */
-char *
+static char *
 sgetsave(s)
 	char *s;
 {
@@ -614,7 +614,7 @@ sgetsave(s)
  * the data returned must not be clobbered by any other command
  * (e.g., globbing).
  */
-struct passwd *
+static struct passwd *
 sgetpwnam(name)
 	char *name;
 {
@@ -653,7 +653,7 @@ sgetpwnam(name)
 /*
  * Expand the given pathname relative to the current working directory.
  */
-char *
+static char *
 path_expand(path)
        char *path;
 {
@@ -1303,7 +1303,7 @@ store_file(name, fmode, unique)
 	FILE *fout, *din;
 	struct stat st;
 	int (*closefunc)();
-	char *gunique();
+	static char *gunique();
 
 	if (logging > 1) syslog(LOG_NOTICE, "put %s", path_expand(name));
 
@@ -2237,7 +2237,7 @@ pasv_error:
  * The file named "local" is already known to exist.
  * Generates failure reply on error.
  */
-char *
+static char *
 gunique(local)
 	char *local;
 {
@@ -2636,10 +2636,10 @@ static char *onefile[] = {
  * FTP_BUFSIZ
  */
 #ifdef STDARG
-int
+static int
 secure_fprintf(FILE *stream, char *fmt, ...)
 #else
-int
+static int
 secure_fprintf(stream, fmt, p1, p2, p3, p4, p5)
 FILE *stream;
 char *fmt;
diff --git a/src/appl/gssftp/ftpd/ftpd_var.h b/src/appl/gssftp/ftpd/ftpd_var.h
index 12c4e853f..72580e7d7 100644
--- a/src/appl/gssftp/ftpd/ftpd_var.h
+++ b/src/appl/gssftp/ftpd/ftpd_var.h
@@ -57,10 +57,11 @@ void perror_reply(int, char *);
 void pwd(void);
 void removedir(char *);
 void renamecmd(char *, char *);
+char *renamefrom(char *);
 void retrieve(char *, char *);
 void send_file_list(char *);
 void setdlevel(int);
-void statcmd();
+void statcmd(void);
 void statfilecmd(char *);
 void store_file(char *, char *, int);
 void user(char *);
@@ -88,6 +89,9 @@ extern void lreply(int, char *, ...)
 
 /* ftpcmd.y */
 void upper(char *);
-
+char *getline(char *, int, FILE *);
 #endif /* FTPD_VAR_H__ */
 
+/* popen.c */
+FILE * ftpd_popen(char *, char *);
+int ftpd_pclose(FILE *);
diff --git a/src/appl/gssftp/ftpd/popen.c b/src/appl/gssftp/ftpd/popen.c
index c594504fd..317b6fa56 100644
--- a/src/appl/gssftp/ftpd/popen.c
+++ b/src/appl/gssftp/ftpd/popen.c
@@ -49,6 +49,7 @@ static char sccsid[] = "@(#)popen.c	5.9 (Berkeley) 2/25/91";
 #ifdef HAVE_VFORK_H
 #include <vfork.h>
 #endif
+#include "ftpd_var.h"
 
 /*
  * Special version of popen which avoids call to shell.  This insures noone