Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-21 20:50:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix double definition of a variable, add extern.

Browse source 
svn path=/trunk/; revision=43571
This commit is contained in:
Dmitry Gorbachev 2009-10-18 18:52:15 +00:00
parent 9698fa5426
commit 417b31c079
3 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/base/applications/network/ftp/ftp.c
View file

@ -1136,13 +1136,6 @@ null();// (void) signal(SIGINT,oldintr);
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 int
initconn() initconn()
{ {

26
reactos/base/applications/network/ftp/ftp_var.h
View file

@ -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 code; /* return/reply code for ftp command */
extern int crflag; /* if 1, strip car. rets. on ascii gets */ extern int crflag; /* if 1, strip car. rets. on ascii gets */
extern char pasv[64]; /* passive port for proxy data connection */ 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 *altarg; /* argv[1] with no shell-like preprocessing */
extern char ntin[17]; /* input translation table */ extern char ntin[17]; /* input translation table */
extern char ntout[17]; /* output 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 argbuf[200]; /* argument storage buffer */
extern char *argbase; /* current storage point in arg buffer */ extern char *argbase; /* current storage point in arg buffer */
extern int margc; /* count of arguments on input line */ extern int margc; /* count of arguments on input line */
extern const char *margv[20]; /* args parsed from input line */ extern const char *margv[20]; /* args parsed from input line */
extern int cpend; /* flag: if != 0, then pending server reply */ extern int cpend; /* flag: if != 0, then pending server reply */
extern int mflag; /* flag: if != 0, then active multi command */ extern int mflag; /* flag: if != 0, then active multi command */
extern int options; /* used during socket creation */ extern int options; /* used during socket creation */
@ -138,21 +138,21 @@ extern int options; /* used during socket creation */
struct cmd { struct cmd {
const char *c_name; /* name of command */ const char *c_name; /* name of command */
const char *c_help; /* help string */ const char *c_help; /* help string */
char c_bell; /* give bell when command completes */ char c_bell; /* give bell when command completes */
char c_conn; /* must be connected to use command */ char c_conn; /* must be connected to use command */
char c_proxy; /* proxy server may execute */ char c_proxy; /* proxy server may execute */
void (*c_handler)(); /* function to call */ void (*c_handler)(); /* function to call */
}; };
struct macel { struct macel {
char mac_name[9]; /* macro name */ char mac_name[9]; /* macro name */
char *mac_start; /* start of macro in macbuf */ char *mac_start; /* start of macro in macbuf */
char *mac_end; /* end of macro in macbuf */ char *mac_end; /* end of macro in macbuf */
}; };
int macnum; /* number of defined macros */ extern int macnum; /* number of defined macros */
struct macel macros[16]; extern struct macel macros[16];
char macbuf[4096]; extern char macbuf[4096];
#if defined(__ANSI__) || defined(sparc) #if defined(__ANSI__) || defined(sparc)
typedef void sig_t; typedef void sig_t;

25
reactos/base/applications/network/ftp/main.c
View file

@ -58,11 +58,11 @@ void intr();
void lostpeer(); void lostpeer();
char *getlogin(); char *getlogin();
short portnum; short portnum;
char home[128]; char home[128];
char *globerr; char *globerr;
int autologin; int autologin;
@ -72,7 +72,7 @@ int autologin;
*/ */
int trace; /* trace packets exchanged */ int trace; /* trace packets exchanged */
int hash; /* print # for each buffer transferred */ 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 verbose; /* print messages coming back from server */
int connected; /* connected to server */ int connected; /* connected to server */
int fromatty; /* input is from a terminal */ int fromatty; /* input is from a terminal */
@ -81,7 +81,7 @@ int debug; /* debugging level */
int bell; /* ring bell on cmd completion */ int bell; /* ring bell on cmd completion */
int doglob; /* glob local file names */ int doglob; /* glob local file names */
int proxy; /* proxy server connection active */ int proxy; /* proxy server connection active */
int passivemode; int passivemode;
int proxflag; /* proxy connection exists */ int proxflag; /* proxy connection exists */
int sunique; /* store files on server with unique name */ int sunique; /* store files on server with unique name */
int runique; /* store local files 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 argbuf[200]; /* argument storage buffer */
char *argbase; /* current storage point in arg buffer */ char *argbase; /* current storage point in arg buffer */
int margc; /* count of arguments on input line */ int margc; /* count of arguments on input line */
const char *margv[20]; /* args parsed from input line */ const char *margv[20]; /* args parsed from input line */
int cpend; /* flag: if != 0, then pending server reply */ int cpend; /* flag: if != 0, then pending server reply */
int mflag; /* flag: if != 0, then active multi command */ int mflag; /* flag: if != 0, then active multi command */
int options; /* used during socket creation */ 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(); static const char *slurpstring();