- markus@cvs.openbsd.org 2001/03/23 13:10:57
[sftp-int.c]
fix put, upload to _absolute_ path, ok djm@
diff --git a/ChangeLog b/ChangeLog
index 36289c8..6c61cbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
- markus@cvs.openbsd.org 2001/03/23 12:02:49
[auth1.c]
authctxt is now passed to do_authenticated
+ - markus@cvs.openbsd.org 2001/03/23 13:10:57
+ [sftp-int.c]
+ fix put, upload to _absolute_ path, ok djm@
20010323
- OpenBSD CVS Sync
@@ -4698,4 +4701,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1012 2001/03/24 00:37:59 mouring Exp $
+$Id: ChangeLog,v 1.1013 2001/03/24 00:39:12 mouring Exp $
diff --git a/sftp-int.c b/sftp-int.c
index 8e45f86..aa69d80 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -26,7 +26,7 @@
/* XXX: recursive operations */
#include "includes.h"
-RCSID("$OpenBSD: sftp-int.c,v 1.31 2001/03/16 13:44:24 markus Exp $");
+RCSID("$OpenBSD: sftp-int.c,v 1.32 2001/03/23 13:10:57 markus Exp $");
#include "buffer.h"
#include "xmalloc.h"
@@ -451,9 +451,12 @@
xfree(tmp);
} else
abs_dst = xstrdup(tmp_dst);
- } else if (infer_path(g.gl_pathv[0], &abs_dst)) {
- err = -1;
- goto out;
+ } else {
+ if (infer_path(g.gl_pathv[0], &abs_dst)) {
+ err = -1;
+ goto out;
+ }
+ abs_dst = make_absolute(abs_dst, pwd);
}
printf("Uploading %s to %s\n", g.gl_pathv[0], abs_dst);
err = do_upload(in, out, g.gl_pathv[0], abs_dst, pflag);