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

Merge.

Browse Source
This commit is contained in:
ache 1995-03-09 17:40:56 +00:00
parent 1fcb4ac137
commit b3bfdc6852
5 changed files with 46 additions and 9 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 ncftp-1.9.2.tgz
cd ncftp-1.9.2
tar zxvf ncftp-1.9.3.tgz
cd ncftp-1.9.3
rm Makefile
cvs import src/usr.bin/ncftp mgleason ncftp_1_9_2
cvs import src/usr.bin/ncftp mgleason ncftp_1_9_3

13
usr.bin/ncftp/ftp.c
View File

@ -1737,6 +1737,19 @@ int initconn(void)
rval = 1;
goto Return;
}
#ifdef LINGER /* If puts don't complete, you could try this. */
{
struct linger li;
li.l_onoff = 1;
li.l_linger = 900;
if (setsockopt(data, SOL_SOCKET, SO_LINGER,
(char *)&li, sizeof(struct linger)) < 0)
{
PERROR("initconn", "setsockopt(SO_LINGER)");
}
}
#endif /* LINGER */
if (options & SO_DEBUG &&
setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof(on)) < 0 ) {
PERROR("initconn", "setscokopt (ignored)");

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

@ -2,7 +2,7 @@
#define _main_c_
#define FTP_VERSION "1.9.2 (January 20, 1995)"
#define FTP_VERSION "1.9.3 (March 5, 1995)"
/* #define BETA 1 */ /* If defined, it prints a little warning message. */

5
usr.bin/ncftp/main.h
View File

@ -3,11 +3,6 @@
#ifndef _main_h_
#define _main_h_
/* $RCSfile: main.h,v $
* $Revision: 14020.12 $
* $Date: 93/05/21 05:45:33 $
*/
struct userinfo {
str32 username;
string homedir;

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

@ -328,8 +328,23 @@ extern int errno;
# ifdef __alpha /* DEC OSF/1 */
# define GETCWDSIZET 1
# endif
# ifndef System
# define System "DEC OSF/1"
# endif
#endif
#ifdef DELL
# ifndef System
# define System "DELL SVR4 Issue 2.2"
# endif
# ifndef HAS_DOMAINNAME
# define HAS_DOMAINNAME 1
# endif
# ifndef LINGER
# define LINGER /* SVR4/386 Streams TCP/IP bug on close */
# endif
#endif /* DELL */
/* -------------------------------------------------------------------- */
#ifdef _SYSV
@ -412,6 +427,20 @@ extern int errno;
# define NO_CONST 1 /* avoid prototype conflict */
#endif
#ifdef __NetBSD__
# define System "NetBSD"
# define GZCAT "/usr/bin/zcat"
# define HERROR 1
# define TERMIOS 1
# define HAS_GETCWD 1
# define HAS_DOMAINNAME 1
# define U_WAIT 1
# define GETCWDSIZET 1
# define NO_CONST 1 /* avoid prototype conflict */
# include <sys/types.h>
# include <sys/param.h>
#endif
#ifdef BSD
# ifndef __FreeBSD__
# ifndef SYSDIRH