[sftp-int.c]
     fix put, upload to _absolute_ path, ok djm@
This commit is contained in:
Ben Lindstrom 2001-03-24 00:39:12 +00:00
parent 9e2057cb34
commit 7527f8b52d
2 changed files with 11 additions and 5 deletions

View File

@ -7,6 +7,9 @@
- markus@cvs.openbsd.org 2001/03/23 12:02:49 - markus@cvs.openbsd.org 2001/03/23 12:02:49
[auth1.c] [auth1.c]
authctxt is now passed to do_authenticated 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 20010323
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4698,4 +4701,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

View File

@ -26,7 +26,7 @@
/* XXX: recursive operations */ /* XXX: recursive operations */
#include "includes.h" #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 "buffer.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -451,9 +451,12 @@ process_put(int in, int out, char *src, char *dst, char *pwd, int pflag)
xfree(tmp); xfree(tmp);
} else } else
abs_dst = xstrdup(tmp_dst); abs_dst = xstrdup(tmp_dst);
} else if (infer_path(g.gl_pathv[0], &abs_dst)) { } else {
err = -1; if (infer_path(g.gl_pathv[0], &abs_dst)) {
goto out; err = -1;
goto out;
}
abs_dst = make_absolute(abs_dst, pwd);
} }
printf("Uploading %s to %s\n", g.gl_pathv[0], abs_dst); printf("Uploading %s to %s\n", g.gl_pathv[0], abs_dst);
err = do_upload(in, out, g.gl_pathv[0], abs_dst, pflag); err = do_upload(in, out, g.gl_pathv[0], abs_dst, pflag);