From ed899eb597a8901ff7322cba809660515ec0d601 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Thu, 25 Jul 2013 15:40:00 -0700 Subject: [PATCH] - (tim) [sftp-client.c] Use of a gcc extension trips up native compilers on Solaris and UnixWare. Feedback and OK djm@ --- ChangeLog | 2 ++ sftp-client.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9ba325874..741fe7cf5 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 cb4efd3ea..f4f1970b6 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",