hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-16 23:57:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Not go to interactive mode, if login failed for URLs, just

Browse Source 
exit(1). Dedicated to Jordan.
This commit is contained in:
Andrey A. Chernov 1995-01-21 01:37:22 +00:00
parent f76c8e8cc3
commit f3b2d1fae4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=5760
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/ncftp/main.c
View File

@ -345,7 +345,8 @@ Examples:\n\
makeargv();
/* setpeer uses this to tell if it was called from the cmd-line. */
eventnumber = 0L;
(void) cmdOpen(margc, margv);
if (cmdOpen(margc, margv) != NOERR)
exit(1);
}
eventnumber = 1L;

12
usr.bin/ncftp/open.c
View File

@ -29,6 +29,7 @@ int anon_open = dANONOPEN;
/* Anonymous logins by default? */
int connected = 0; /* TRUE if connected to server */
/* If TRUE, set binary each connection. */
int www = 0; /* TRUE if use URL */
Hostname hostname; /* Name of current host */
RemoteSiteInfo gRmtInfo;
#ifdef GATEWAY
@ -107,7 +108,7 @@ void InitOpenOptions(OpenOptions *openopt)
int GetOpenOptions(int argc, char **argv, OpenOptions *openopt)
{
int opt, www;
int opt;
char *cp, *hostp, *cpath;
/* First setup the openopt variables. */
@ -467,6 +468,7 @@ int Open(OpenOptions *openopt)
int siteInRC;
char *user, *pass, *acct;
int login_verbosity, oldv;
int result = CMDERR;
macnum = 0; /* Reset macros. */
@ -593,6 +595,7 @@ int Open(OpenOptions *openopt)
*/
(void) _cd(NULL);
}
result = NOERR;
break; /* we are connected, so break the redial loop. */
/* end if we are connected */
} else {
@ -606,7 +609,7 @@ nextdial:
disconnect(0, NULL);
continue; /* Try re-dialing. */
}
return (NOERR);
return (result);
} /* Open */
@ -615,6 +618,7 @@ nextdial:
int cmdOpen(int argc, char **argv)
{
OpenOptions openopt;
int result = NOERR;
/* If there is already a site open, close that one so we can
* open a new one.
@ -631,9 +635,9 @@ int cmdOpen(int argc, char **argv)
gRmtInfo.hasMDTM = 1;
if ((GetOpenOptions(argc, argv, &openopt) == USAGE) ||
(Open(&openopt) == USAGE))
((result = Open(&openopt)) == USAGE))
return USAGE;
return NOERR;
return (www ? result : NOERR);
} /* cmdOpen */
/* eof open.c */