summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp-int.c11
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 36289c883..6c61cbe66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 - markus@cvs.openbsd.org 2001/03/23 12:02:49 7 - markus@cvs.openbsd.org 2001/03/23 12:02:49
8 [auth1.c] 8 [auth1.c]
9 authctxt is now passed to do_authenticated 9 authctxt is now passed to do_authenticated
10 - markus@cvs.openbsd.org 2001/03/23 13:10:57
11 [sftp-int.c]
12 fix put, upload to _absolute_ path, ok djm@
10 13
1120010323 1420010323
12 - OpenBSD CVS Sync 15 - OpenBSD CVS Sync
@@ -4698,4 +4701,4 @@
4698 - Wrote replacements for strlcpy and mkdtemp 4701 - Wrote replacements for strlcpy and mkdtemp
4699 - Released 1.0pre1 4702 - Released 1.0pre1
4700 4703
4701$Id: ChangeLog,v 1.1012 2001/03/24 00:37:59 mouring Exp $ 4704$Id: ChangeLog,v 1.1013 2001/03/24 00:39:12 mouring Exp $
diff --git a/sftp-int.c b/sftp-int.c
index 8e45f869b..aa69d802d 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -26,7 +26,7 @@
26/* XXX: recursive operations */ 26/* XXX: recursive operations */
27 27
28#include "includes.h" 28#include "includes.h"
29RCSID("$OpenBSD: sftp-int.c,v 1.31 2001/03/16 13:44:24 markus Exp $"); 29RCSID("$OpenBSD: sftp-int.c,v 1.32 2001/03/23 13:10:57 markus Exp $");
30 30
31#include "buffer.h" 31#include "buffer.h"
32#include "xmalloc.h" 32#include "xmalloc.h"
@@ -451,9 +451,12 @@ process_put(int in, int out, char *src, char *dst, char *pwd, int pflag)
451 xfree(tmp); 451 xfree(tmp);
452 } else 452 } else
453 abs_dst = xstrdup(tmp_dst); 453 abs_dst = xstrdup(tmp_dst);
454 } else if (infer_path(g.gl_pathv[0], &abs_dst)) { 454 } else {
455 err = -1; 455 if (infer_path(g.gl_pathv[0], &abs_dst)) {
456 goto out; 456 err = -1;
457 goto out;
458 }
459 abs_dst = make_absolute(abs_dst, pwd);
457 } 460 }
458 printf("Uploading %s to %s\n", g.gl_pathv[0], abs_dst); 461 printf("Uploading %s to %s\n", g.gl_pathv[0], abs_dst);
459 err = do_upload(in, out, g.gl_pathv[0], abs_dst, pflag); 462 err = do_upload(in, out, g.gl_pathv[0], abs_dst, pflag);