summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Src/Modules/zftp.c9
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index aafc58f89..0dfe07a36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-25 Peter Stephenson <pws@cambridgesiliconradio.com>
+
+ * 11567: Src/Modules/zftp.c: fix fcntl() argument for FD_CLOEXEC.
+
2000-05-25 Sven Wischnowsky <wischnow@zsh.org>
* 11565: Completion/Base/_in_vared, Completion/Commands/_complete_debug,
diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c
index 3252b9d90..1aa527953 100644
--- a/Src/Modules/zftp.c
+++ b/Src/Modules/zftp.c
@@ -1303,8 +1303,7 @@ zfgetdata(char *name, char *rest, char *cmd, int getsize)
#endif
#if defined(F_SETFD) && defined(FD_CLOEXEC)
/* If the shell execs a program, we don't want this fd left open. */
- len = FD_CLOEXEC;
- fcntl(zfsess->dfd, F_SETFD, &len);
+ fcntl(zfsess->dfd, F_SETFD, FD_CLOEXEC);
#endif
return 0;
@@ -1988,8 +1987,7 @@ zftp_open(char *name, char **args, int flags)
#if defined(F_SETFD) && defined(FD_CLOEXEC)
/* If the shell execs a program, we don't want this fd left open. */
- len = FD_CLOEXEC;
- fcntl(zfsess->cfd, F_SETFD, &len);
+ fcntl(zfsess->cfd, F_SETFD, FD_CLOEXEC);
#endif
len = sizeof(zfsess->sock);
@@ -2057,8 +2055,7 @@ zftp_open(char *name, char **args, int flags)
DPUTS(zfstatfd == -1, "zfstatfd not created");
#if defined(F_SETFD) && defined(FD_CLOEXEC)
/* If the shell execs a program, we don't want this fd left open. */
- len = FD_CLOEXEC;
- fcntl(zfstatfd, F_SETFD, &len);
+ fcntl(zfstatfd, F_SETFD, FD_CLOEXEC);
#endif
unlink(fname);
}