summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sftp-client.c4
-rw-r--r--sftp.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/sftp-client.c b/sftp-client.c
index d49bfaaba..cd990579e 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-client.c,v 1.121 2016/02/11 02:21:34 djm Exp $ */ 1/* $OpenBSD: sftp-client.c,v 1.122 2016/04/08 08:19:17 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -1601,7 +1601,7 @@ do_upload(struct sftp_conn *conn, const char *local_path,
1601 if (resume) { 1601 if (resume) {
1602 /* Get remote file size if it exists */ 1602 /* Get remote file size if it exists */
1603 if ((c = do_stat(conn, remote_path, 0)) == NULL) { 1603 if ((c = do_stat(conn, remote_path, 0)) == NULL) {
1604 close(local_fd); 1604 close(local_fd);
1605 return -1; 1605 return -1;
1606 } 1606 }
1607 1607
diff --git a/sftp.c b/sftp.c
index 2077219fa..3d2d13aaf 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.172 2016/02/15 09:47:49 dtucker Exp $ */ 1/* $OpenBSD: sftp.c,v 1.173 2016/04/08 08:19:17 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -735,7 +735,7 @@ process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd,
735 735
736 resume |= global_aflag; 736 resume |= global_aflag;
737 if (!quiet && resume) 737 if (!quiet && resume)
738 printf("Resuming upload of %s to %s\n", g.gl_pathv[i], 738 printf("Resuming upload of %s to %s\n", g.gl_pathv[i],
739 abs_dst); 739 abs_dst);
740 else if (!quiet && !resume) 740 else if (!quiet && !resume)
741 printf("Uploading %s to %s\n", g.gl_pathv[i], abs_dst); 741 printf("Uploading %s to %s\n", g.gl_pathv[i], abs_dst);
@@ -1205,7 +1205,7 @@ makeargv(const char *arg, int *argcp, int sloppy, char *lastquote,
1205 1205
1206static int 1206static int
1207parse_args(const char **cpp, int *ignore_errors, int *aflag, 1207parse_args(const char **cpp, int *ignore_errors, int *aflag,
1208 int *fflag, int *hflag, int *iflag, int *lflag, int *pflag, 1208 int *fflag, int *hflag, int *iflag, int *lflag, int *pflag,
1209 int *rflag, int *sflag, 1209 int *rflag, int *sflag,
1210 unsigned long *n_arg, char **path1, char **path2) 1210 unsigned long *n_arg, char **path1, char **path2)
1211{ 1211{
@@ -1397,7 +1397,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
1397 int err_abort) 1397 int err_abort)
1398{ 1398{
1399 char *path1, *path2, *tmp; 1399 char *path1, *path2, *tmp;
1400 int ignore_errors = 0, aflag = 0, fflag = 0, hflag = 0, 1400 int ignore_errors = 0, aflag = 0, fflag = 0, hflag = 0,
1401 iflag = 0; 1401 iflag = 0;
1402 int lflag = 0, pflag = 0, rflag = 0, sflag = 0; 1402 int lflag = 0, pflag = 0, rflag = 0, sflag = 0;
1403 int cmdnum, i; 1403 int cmdnum, i;