mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

* ftpfs.c: Use HAVE_STRUCT_LINGER_L_LINGER instead of

Browse Source 
HAVE_STRUCT_LINGER.
This commit is contained in:
Pavel Roskin 2003-10-29 17:23:35 +00:00
parent b733f1fa6e
commit cea13079c3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vfs/ChangeLog
View File

@ -1,5 +1,8 @@
2003-10-29 Pavel Roskin <proski@gnu.org>
* ftpfs.c: Use HAVE_STRUCT_LINGER_L_LINGER instead of
HAVE_STRUCT_LINGER.
* Makefile.am: Compile utilvfs.c even without USE_VFS_NET.
* utilvfs.c (vfs_split_url): Only compile with USE_NETCODE
defined.

8
vfs/ftpfs.c
View File

@ -1294,7 +1294,7 @@ ftpfs_file_store(struct vfs_class *me, struct vfs_s_fh *fh, char *name, char *lo
{
int h, sock, n;
off_t total;
#ifdef HAVE_STRUCT_LINGER
#ifdef HAVE_STRUCT_LINGER_L_LINGER
struct linger li;
#else
int flag_one = 1;
@ -1312,7 +1312,7 @@ ftpfs_file_store(struct vfs_class *me, struct vfs_s_fh *fh, char *name, char *lo
close(h);
return -1;
}
#ifdef HAVE_STRUCT_LINGER
#ifdef HAVE_STRUCT_LINGER_L_LINGER
li.l_onoff = 1;
li.l_linger = 120;
setsockopt(sock, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof(li));
@ -1564,7 +1564,7 @@ ftpfs_fh_open (struct vfs_class *me, struct vfs_s_fh *fh, int flags,
fh->u.ftp.append = 0;
/* File will be written only, so no need to retrieve it from ftp server */
if (((flags & O_WRONLY) == O_WRONLY) && !(flags & (O_RDONLY | O_RDWR))) {
#ifdef HAVE_STRUCT_LINGER
#ifdef HAVE_STRUCT_LINGER_L_LINGER
struct linger li;
#else
int li = 1;
@ -1597,7 +1597,7 @@ ftpfs_fh_open (struct vfs_class *me, struct vfs_s_fh *fh, int flags,
if (fh->handle < 0)
return -1;
#ifdef HAVE_STRUCT_LINGER
#ifdef HAVE_STRUCT_LINGER_L_LINGER
li.l_onoff = 1;
li.l_linger = 120;
#endif