summaryrefslogtreecommitdiff
path: root/sftp-client.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-21 23:48:55 +1100
committerDamien Miller <djm@mindrot.org>2003-11-21 23:48:55 +1100
commita8e06cef35c205e1aa562513c6d034a10c8c9a6d (patch)
treecf8bdb4466f553088c020b9179cabd6eaf196075 /sftp-client.c
parent8c5e91c03fdd2693f0635f8b2a9904bffc94ce16 (diff)
- djm@cvs.openbsd.org 2003/11/21 11:57:03
[everything] unexpand and delete whitespace at EOL; ok markus@ (done locally and RCS IDs synced)
Diffstat (limited to 'sftp-client.c')
-rw-r--r--sftp-client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sftp-client.c b/sftp-client.c
index ffff0fe5a..8e657d1b5 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -28,7 +28,7 @@
28/* XXX: copy between two remote sites */ 28/* XXX: copy between two remote sites */
29 29
30#include "includes.h" 30#include "includes.h"
31RCSID("$OpenBSD: sftp-client.c,v 1.44 2003/06/28 16:23:06 deraadt Exp $"); 31RCSID("$OpenBSD: sftp-client.c,v 1.45 2003/11/21 11:57:03 djm Exp $");
32 32
33#include "openbsd-compat/sys-queue.h" 33#include "openbsd-compat/sys-queue.h"
34 34
@@ -798,7 +798,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
798 return(-1); 798 return(-1);
799 } 799 }
800 800
801 local_fd = open(local_path, O_WRONLY | O_CREAT | O_TRUNC, 801 local_fd = open(local_path, O_WRONLY | O_CREAT | O_TRUNC,
802 mode | S_IWRITE); 802 mode | S_IWRITE);
803 if (local_fd == -1) { 803 if (local_fd == -1) {
804 error("Couldn't open local file \"%s\" for writing: %s", 804 error("Couldn't open local file \"%s\" for writing: %s",
@@ -946,7 +946,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
946 /* Override umask and utimes if asked */ 946 /* Override umask and utimes if asked */
947#ifdef HAVE_FCHMOD 947#ifdef HAVE_FCHMOD
948 if (pflag && fchmod(local_fd, mode) == -1) 948 if (pflag && fchmod(local_fd, mode) == -1)
949#else 949#else
950 if (pflag && chmod(local_path, mode) == -1) 950 if (pflag && chmod(local_path, mode) == -1)
951#endif /* HAVE_FCHMOD */ 951#endif /* HAVE_FCHMOD */
952 error("Couldn't set mode on \"%s\": %s", local_path, 952 error("Couldn't set mode on \"%s\": %s", local_path,