diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-04-08 10:19:17 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-04-08 10:21:51 +0200 |
| commit | 34a01b2cf737d946ddb140618e28c3048ab7a229 (patch) | |
| tree | aa03f4ff1e5ce459a11579f7b845a4a3ddf608a1 | |
| parent | upstream commit (diff) | |
| download | openssh-34a01b2cf737d946ddb140618e28c3048ab7a229.tar.xz openssh-34a01b2cf737d946ddb140618e28c3048ab7a229.zip | |
upstream commit
whitespace at EOL
Upstream-ID: 5beffd4e001515da12851b974e2323ae4aa313b6
| -rw-r--r-- | sftp-client.c | 4 | ||||
| -rw-r--r-- | sftp.c | 8 |
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 @@ -/* $OpenBSD: sftp-client.c,v 1.121 2016/02/11 02:21:34 djm Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.122 2016/04/08 08:19:17 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -1601,7 +1601,7 @@ do_upload(struct sftp_conn *conn, const char *local_path, if (resume) { /* Get remote file size if it exists */ if ((c = do_stat(conn, remote_path, 0)) == NULL) { - close(local_fd); + close(local_fd); return -1; } @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.172 2016/02/15 09:47:49 dtucker Exp $ */ +/* $OpenBSD: sftp.c,v 1.173 2016/04/08 08:19:17 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -735,7 +735,7 @@ process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd, resume |= global_aflag; if (!quiet && resume) - printf("Resuming upload of %s to %s\n", g.gl_pathv[i], + printf("Resuming upload of %s to %s\n", g.gl_pathv[i], abs_dst); else if (!quiet && !resume) 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, static int parse_args(const char **cpp, int *ignore_errors, int *aflag, - int *fflag, int *hflag, int *iflag, int *lflag, int *pflag, + int *fflag, int *hflag, int *iflag, int *lflag, int *pflag, int *rflag, int *sflag, unsigned long *n_arg, char **path1, char **path2) { @@ -1397,7 +1397,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd, int err_abort) { char *path1, *path2, *tmp; - int ignore_errors = 0, aflag = 0, fflag = 0, hflag = 0, + int ignore_errors = 0, aflag = 0, fflag = 0, hflag = 0, iflag = 0; int lflag = 0, pflag = 0, rflag = 0, sflag = 0; int cmdnum, i; |