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

Merge...

Browse Source
This commit is contained in:
Andrey A. Chernov 1994-12-13 21:03:46 +00:00
parent 3aa0699930
commit 699204c2a5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=5097
6 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/ncftp/.cvsimport.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
tar zxvf ncftp186.tgz
cd ncftp186
tar zxvf ncftp187.tgz
cd ncftp187
rm Makefile
cvs import src/usr.bin/ncftp mgleason ncftp_1_8_6
cvs import src/usr.bin/ncftp mgleason ncftp_1_8_7

2
usr.bin/ncftp/Makefile
View File

@ -7,7 +7,7 @@ DPADD= $(LIBREADLINE) $(LIBTERMCAP)
LDADD= -lreadline -ltermcap
CFLAGS+= -DGZCAT=\"/usr/bin/gzcat\" -DREADLINE -DCURSES -DNO_CURSES_H \
-DSYSLOG -DTRY_ABOR -DGATEWAY -DPASSIVEMODE
-DSYSLOG -DTRY_ABOR -DGATEWAY
MK= $(CC) $(CFLAGS) $(LDADD)

9
usr.bin/ncftp/cmds.c
View File

@ -623,7 +623,7 @@ int mget(int argc, char **argv)
(void) Signal(SIGINT,oldintr);
activemcmd = 0;
if (!errs)
return NOERR;
return NOERR;
else
return CMDERR;
} /* mget */
@ -908,10 +908,9 @@ int mdelete(int argc, char **argv)
}
(void) Signal(SIGINT, oldintr);
activemcmd = 0;
if (!errs)
return NOERR;
else
if (errs > 0)
return CMDERR;
return NOERR;
} /* mdelete */
@ -1349,7 +1348,7 @@ close_up_shop(void)
int rcode = 0;
if (only_once++ > 0)
return;
return (0);
if (connected)
(void) disconnect(0, NULL);
rcode = WriteRecentSitesFile();

8
usr.bin/ncftp/defaults.h
View File

@ -44,6 +44,14 @@
#define dMPROMPT 0
#endif
#ifndef PASSIVEMODE
#define PASSIVEMODE 1
#endif
/* If passive FTP can be used, this specifies whether it is turned on
* by default. If not, we have passive mode available, but are using
* Port ftp by default.
*/
#ifndef dPASSIVE
#define dPASSIVE 1 /* Works for most folks... */
#endif

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

@ -1,13 +1,8 @@
/* main.c
*
* $RCSfile: main.c,v $
* $Revision: 14020.15 $
* $Date: 93/07/09 11:50:12 $
*/
/* main.c */
#define _main_c_
#define FTP_VERSION "1.8.6 (October 30, 1994)"
#define FTP_VERSION "1.8.7 (December 11, 1994)"
/* #define BETA 1 */ /* If defined, it prints a little warning message. */

9
usr.bin/ncftp/sys.h
View File

@ -399,15 +399,12 @@ extern int errno;
#endif /* BSDi */
#ifdef __FreeBSD__
# define System "FreeBSD"
# define GZCAT "/usr/bin/gzcat"
# define HAS_DOMAINNAME 1
# define System "FreeBSD"
# define GZCAT "/usr/bin/gzcat"
# define HAS_DOMAINNAME 1
# include <sys/types.h>
# include <sys/param.h> /* this two for BSD definition */
/* to avoid redefinition of it to 1 */
#if __FreeBSD__ > 1
# define SYSSELECTH 1
#endif
# define HERROR 1
# define TERMIOS 1
# define HAS_GETCWD 1