d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move variable externs into extern.h so they are checked against the definitions.

Browse Source
This commit is contained in:
David E. O'Brien 2009-04-07 20:34:34 +00:00
parent bf2d1caf3c
commit ec85f7fa39
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libexec/ftpd/extern.h
View File

@ -73,6 +73,35 @@ void yyerror(char *);
int yyparse(void); int yyparse(void);
int ls_main(int, char **); int ls_main(int, char **);
extern int assumeutf8;
extern char cbuf[];
extern union sockunion data_dest;
extern int epsvall;
extern int form;
extern int ftpdebug;
extern int guest;
extern union sockunion his_addr;
extern char *homedir;
extern int hostinfo;
extern char *hostname;
extern int maxtimeout;
extern int logged_in;
extern int logging;
extern int noepsv;
extern int noguestretr;
extern int noretr;
extern int paranoid;
extern struct passwd *pw;
extern int pdata;
extern char proctitle[];
extern int readonly;
extern off_t restart_point;
extern int timeout;
extern char tmpline[];
extern int type;
extern char *typenames[]; /* defined in <arpa/ftp.h> included from ftpd.c */
extern int usedefault;
struct sockaddr_in; struct sockaddr_in;
struct sockaddr_in6; struct sockaddr_in6;
union sockunion { union sockunion {

27
libexec/ftpd/ftpcmd.y
View File

@ -76,31 +76,6 @@ __FBSDID("$FreeBSD$");
#include "extern.h" #include "extern.h"
#include "pathnames.h" #include "pathnames.h"
extern union sockunion data_dest, his_addr;
extern int hostinfo;
extern int logged_in;
extern struct passwd *pw;
extern int guest;
extern char *homedir;
extern int paranoid;
extern int logging;
extern int type;
extern int form;
extern int ftpdebug;
extern int timeout;
extern int maxtimeout;
extern int pdata;
extern char *hostname;
extern char proctitle[];
extern int usedefault;
extern char tmpline[];
extern int readonly;
extern int assumeutf8;
extern int noepsv;
extern int noretr;
extern int noguestretr;
extern char *typenames[]; /* defined in <arpa/ftp.h> included from ftpd.c */
off_t restart_point; off_t restart_point;
static int cmd_type; static int cmd_type;
@ -110,8 +85,6 @@ static int state;
char cbuf[512]; char cbuf[512];
char *fromname = NULL; char *fromname = NULL;
extern int epsvall;
%} %}
%union { %union {

3
libexec/ftpd/ftpd.c
View File

@ -105,9 +105,6 @@ __FBSDID("$FreeBSD$");
static char version[] = "Version 6.00LS"; static char version[] = "Version 6.00LS";
#undef main #undef main
extern off_t restart_point;
extern char cbuf[];
union sockunion ctrl_addr; union sockunion ctrl_addr;
union sockunion data_source; union sockunion data_source;
union sockunion data_dest; union sockunion data_dest;