summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2013-07-25 15:40:00 -0700
committerTim Rice <tim@multitalents.net>2013-07-25 15:40:00 -0700
commited899eb597a8901ff7322cba809660515ec0d601 (patch)
tree9536ed46c7b6662b57569f9fc91405b52f0b023d
parente9e936d33b4b1d77ffbaace9438cb2f1469c1dc7 (diff)
- (tim) [sftp-client.c] Use of a gcc extension trips up native compilers on
Solaris and UnixWare. Feedback and OK djm@
-rw-r--r--ChangeLog2
-rw-r--r--sftp-client.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ba32587..741fe7cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@
- djm@cvs.openbsd.org 2013/06/21 02:26:26
[regress/sftp-cmds.sh regress/test-exec.sh]
unbreak sftp-cmds for renamed test data (s/ls/data/)
+ - (tim) [sftp-client.c] Use of a gcc extension trips up native compilers on
+ Solaris and UnixWare. Feedback and OK djm@
20130720
- (djm) OpenBSD CVS Sync
diff --git a/sftp-client.c b/sftp-client.c
index cb4efd3e..f4f1970b 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1051,7 +1051,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
return(-1);
}
- local_fd = open(local_path, O_WRONLY | O_CREAT | (resume ? : O_TRUNC),
+ local_fd = open(local_path, O_WRONLY | O_CREAT | (resume ? 0 : O_TRUNC),
mode | S_IWUSR);
if (local_fd == -1) {
error("Couldn't open local file \"%s\" for writing: %s",