From 417b31c079bd97c3f56e9eb1e215e47e0593e811 Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Sun, 18 Oct 2009 18:52:15 +0000 Subject: [PATCH] Fix double definition of a variable, add extern. svn path=/trunk/; revision=43571 --- reactos/base/applications/network/ftp/ftp.c | 7 ----- .../base/applications/network/ftp/ftp_var.h | 26 +++++++++---------- reactos/base/applications/network/ftp/main.c | 25 +++++++++++++----- 3 files changed, 31 insertions(+), 27 deletions(-) diff --git a/reactos/base/applications/network/ftp/ftp.c b/reactos/base/applications/network/ftp/ftp.c index a40162373e8..2b09522fb51 100644 --- a/reactos/base/applications/network/ftp/ftp.c +++ b/reactos/base/applications/network/ftp/ftp.c @@ -1136,13 +1136,6 @@ null();// (void) signal(SIGINT,oldintr); null();// (void) signal(SIGINT,oldintr); } -/* - * Need to start a listen on the data channel - * before we send the command, otherwise the - * server's connect may fail. - */ -int sendport = -1; - int initconn() { diff --git a/reactos/base/applications/network/ftp/ftp_var.h b/reactos/base/applications/network/ftp/ftp_var.h index dbac29bea3b..a0a99b23ee5 100644 --- a/reactos/base/applications/network/ftp/ftp_var.h +++ b/reactos/base/applications/network/ftp/ftp_var.h @@ -101,7 +101,7 @@ extern int mapflag; /* use mapin mapout templates on file names */ extern int code; /* return/reply code for ftp command */ extern int crflag; /* if 1, strip car. rets. on ascii gets */ extern char pasv[64]; /* passive port for proxy data connection */ -extern int passivemode; /* passive mode enabled */ +extern int passivemode; /* passive mode enabled */ extern char *altarg; /* argv[1] with no shell-like preprocessing */ extern char ntin[17]; /* input translation table */ extern char ntout[17]; /* output translation table */ @@ -126,8 +126,8 @@ extern char *stringbase; /* current scan point in line buffer */ extern char argbuf[200]; /* argument storage buffer */ extern char *argbase; /* current storage point in arg buffer */ extern int margc; /* count of arguments on input line */ -extern const char *margv[20]; /* args parsed from input line */ -extern int cpend; /* flag: if != 0, then pending server reply */ +extern const char *margv[20]; /* args parsed from input line */ +extern int cpend; /* flag: if != 0, then pending server reply */ extern int mflag; /* flag: if != 0, then active multi command */ extern int options; /* used during socket creation */ @@ -138,21 +138,21 @@ extern int options; /* used during socket creation */ struct cmd { const char *c_name; /* name of command */ const char *c_help; /* help string */ - char c_bell; /* give bell when command completes */ - char c_conn; /* must be connected to use command */ - char c_proxy; /* proxy server may execute */ - void (*c_handler)(); /* function to call */ + char c_bell; /* give bell when command completes */ + char c_conn; /* must be connected to use command */ + char c_proxy; /* proxy server may execute */ + void (*c_handler)(); /* function to call */ }; struct macel { - char mac_name[9]; /* macro name */ - char *mac_start; /* start of macro in macbuf */ - char *mac_end; /* end of macro in macbuf */ + char mac_name[9]; /* macro name */ + char *mac_start; /* start of macro in macbuf */ + char *mac_end; /* end of macro in macbuf */ }; -int macnum; /* number of defined macros */ -struct macel macros[16]; -char macbuf[4096]; +extern int macnum; /* number of defined macros */ +extern struct macel macros[16]; +extern char macbuf[4096]; #if defined(__ANSI__) || defined(sparc) typedef void sig_t; diff --git a/reactos/base/applications/network/ftp/main.c b/reactos/base/applications/network/ftp/main.c index aaf42d12e6e..745e908d868 100644 --- a/reactos/base/applications/network/ftp/main.c +++ b/reactos/base/applications/network/ftp/main.c @@ -58,11 +58,11 @@ void intr(); void lostpeer(); char *getlogin(); -short portnum; +short portnum; -char home[128]; +char home[128]; char *globerr; -int autologin; +int autologin; @@ -72,7 +72,7 @@ int autologin; */ int trace; /* trace packets exchanged */ int hash; /* print # for each buffer transferred */ -int sendport; /* use PORT cmd for each data connection */ +//int sendport; /* use PORT cmd for each data connection */ int verbose; /* print messages coming back from server */ int connected; /* connected to server */ int fromatty; /* input is from a terminal */ @@ -81,7 +81,7 @@ int debug; /* debugging level */ int bell; /* ring bell on cmd completion */ int doglob; /* glob local file names */ int proxy; /* proxy server connection active */ -int passivemode; +int passivemode; int proxflag; /* proxy connection exists */ int sunique; /* store files on server with unique name */ int runique; /* store local files with unique name */ @@ -115,12 +115,23 @@ char *stringbase; /* current scan point in line buffer */ char argbuf[200]; /* argument storage buffer */ char *argbase; /* current storage point in arg buffer */ int margc; /* count of arguments on input line */ -const char *margv[20]; /* args parsed from input line */ -int cpend; /* flag: if != 0, then pending server reply */ +const char *margv[20]; /* args parsed from input line */ +int cpend; /* flag: if != 0, then pending server reply */ int mflag; /* flag: if != 0, then active multi command */ int options; /* used during socket creation */ +int macnum; /* number of defined macros */ +struct macel macros[16]; +char macbuf[4096]; + +/* + * Need to start a listen on the data channel + * before we send the command, otherwise the + * server's connect may fail. + */ +int sendport = -1; + static const char *slurpstring();