* to licensing issues.)
*/
-#include <windows.h>
-#ifndef AUTO_WINSOCK
-#ifdef WINSOCK_TWO
-#include <winsock2.h>
-#else
-#include <winsock.h>
-#endif
-#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#define PUTTY_DO_GLOBALS
#include "putty.h"
+#include "psftp.h"
#include "ssh.h"
#include "sftp.h"
-#include "winstuff.h"
#include "storage.h"
-#define TIME_POSIX_TO_WIN(t, ft) (*(LONGLONG*)&(ft) = \
- ((LONGLONG) (t) + (LONGLONG) 11644473600) * (LONGLONG) 10000000)
-#define TIME_WIN_TO_POSIX(ft, t) ((t) = (unsigned long) \
- ((*(LONGLONG*)&(ft)) / (LONGLONG) 10000000 - (LONGLONG) 11644473600))
-
-/* GUI Adaptation - Sept 2000 */
-
-/* This is just a base value from which the main message numbers are
- * derived. */
-#define WM_APP_BASE 0x8000
-
-/* These two pass a single character value in wParam. They represent
- * the visible output from PSCP. */
-#define WM_STD_OUT_CHAR ( WM_APP_BASE+400 )
-#define WM_STD_ERR_CHAR ( WM_APP_BASE+401 )
-
-/* These pass a transfer status update. WM_STATS_CHAR passes a single
- * character in wParam, and is called repeatedly to pass the name of
- * the file, terminated with "\n". WM_STATS_SIZE passes the size of
- * the file being transferred in wParam. WM_STATS_ELAPSED is called
- * to pass the elapsed time (in seconds) in wParam, and
- * WM_STATS_PERCENT passes the percentage of the transfer which is
- * complete, also in wParam. */
-#define WM_STATS_CHAR ( WM_APP_BASE+402 )
-#define WM_STATS_SIZE ( WM_APP_BASE+403 )
-#define WM_STATS_PERCENT ( WM_APP_BASE+404 )
-#define WM_STATS_ELAPSED ( WM_APP_BASE+405 )
-
-/* These are used at the end of a run to pass an error code in
- * wParam: zero means success, nonzero means failure. WM_RET_ERR_CNT
- * is used after a copy, and WM_LS_RET_ERR_CNT is used after a file
- * list operation. */
-#define WM_RET_ERR_CNT ( WM_APP_BASE+406 )
-#define WM_LS_RET_ERR_CNT ( WM_APP_BASE+407 )
-
-/* More transfer status update messages. WM_STATS_DONE passes the
- * number of bytes sent so far in wParam. WM_STATS_ETA passes the
- * estimated time to completion (in seconds). WM_STATS_RATEBS passes
- * the average transfer rate (in bytes per second). */
-#define WM_STATS_DONE ( WM_APP_BASE+408 )
-#define WM_STATS_ETA ( WM_APP_BASE+409 )
-#define WM_STATS_RATEBS ( WM_APP_BASE+410 )
-
static int list = 0;
static int verbose = 0;
static int recursive = 0;
static int prev_stats_len = 0;
static int scp_unsafe_mode = 0;
static int errs = 0;
-/* GUI Adaptation - Sept 2000 */
-#define NAME_STR_MAX 2048
-static char statname[NAME_STR_MAX + 1];
-static unsigned long statsize = 0;
-static unsigned long statdone = 0;
-static unsigned long stateta = 0;
-static unsigned long statratebs = 0;
-static int statperct = 0;
-static unsigned long statelapsed = 0;
static int gui_mode = 0;
-static char *gui_hwnd = NULL;
static int using_sftp = 0;
static Backend *back;
static void *backhandle;
+static Config cfg;
static void source(char *src);
static void rsource(char *src);
static void sink(char *targ, char *src);
-/* GUI Adaptation - Sept 2000 */
-static void tell_char(FILE * stream, char c);
-static void tell_str(FILE * stream, char *str);
-static void tell_user(FILE * stream, char *fmt, ...);
-static void gui_update_stats(char *name, unsigned long size,
- int percentage, unsigned long elapsed,
- unsigned long done, unsigned long eta,
- unsigned long ratebs);
/*
* The maximum amount of queued data we accept before we stop and
assert(len == 0);
}
-/* GUI Adaptation - Sept 2000 */
-static void send_msg(HWND h, UINT message, WPARAM wParam)
-{
- while (!PostMessage(h, message, wParam, 0))
- SleepEx(1000, TRUE);
-}
-
static void tell_char(FILE * stream, char c)
{
if (!gui_mode)
fputc(c, stream);
- else {
- unsigned int msg_id = WM_STD_OUT_CHAR;
- if (stream == stderr)
- msg_id = WM_STD_ERR_CHAR;
- send_msg((HWND) atoi(gui_hwnd), msg_id, (WPARAM) c);
- }
+ else
+ gui_send_char(stream == stderr, c);
}
static void tell_str(FILE * stream, char *str)
sfree(str2);
}
-static void gui_update_stats(char *name, unsigned long size,
- int percentage, unsigned long elapsed,
- unsigned long done, unsigned long eta,
- unsigned long ratebs)
-{
- unsigned int i;
-
- if (strcmp(name, statname) != 0) {
- for (i = 0; i < strlen(name); ++i)
- send_msg((HWND) atoi(gui_hwnd), WM_STATS_CHAR,
- (WPARAM) name[i]);
- send_msg((HWND) atoi(gui_hwnd), WM_STATS_CHAR, (WPARAM) '\n');
- strcpy(statname, name);
- }
- if (statsize != size) {
- send_msg((HWND) atoi(gui_hwnd), WM_STATS_SIZE, (WPARAM) size);
- statsize = size;
- }
- if (statdone != done) {
- send_msg((HWND) atoi(gui_hwnd), WM_STATS_DONE, (WPARAM) done);
- statdone = done;
- }
- if (stateta != eta) {
- send_msg((HWND) atoi(gui_hwnd), WM_STATS_ETA, (WPARAM) eta);
- stateta = eta;
- }
- if (statratebs != ratebs) {
- send_msg((HWND) atoi(gui_hwnd), WM_STATS_RATEBS, (WPARAM) ratebs);
- statratebs = ratebs;
- }
- if (statelapsed != elapsed) {
- send_msg((HWND) atoi(gui_hwnd), WM_STATS_ELAPSED,
- (WPARAM) elapsed);
- statelapsed = elapsed;
- }
- if (statperct != percentage) {
- send_msg((HWND) atoi(gui_hwnd), WM_STATS_PERCENT,
- (WPARAM) percentage);
- statperct = percentage;
- }
-}
-
/*
* Print an error message and perform a fatal exit.
*/
sfree(str2);
errs++;
- if (gui_mode) {
- unsigned int msg_id = WM_RET_ERR_CNT;
- if (list)
- msg_id = WM_LS_RET_ERR_CNT;
- while (!PostMessage
- ((HWND) atoi(gui_hwnd), msg_id, (WPARAM) errs,
- 0 /*lParam */ ))SleepEx(1000, TRUE);
- }
+ if (gui_mode)
+ gui_send_errcount(list, errs);
cleanup_exit(1);
}
sfree(str2);
errs++;
- if (gui_mode) {
- unsigned int msg_id = WM_RET_ERR_CNT;
- if (list)
- msg_id = WM_LS_RET_ERR_CNT;
- while (!PostMessage
- ((HWND) atoi(gui_hwnd), msg_id, (WPARAM) errs,
- 0 /*lParam */ ))SleepEx(1000, TRUE);
- }
+ if (gui_mode)
+ gui_send_errcount(list, errs);
cleanup_exit(1);
}
sfree(str2);
errs++;
- if (gui_mode) {
- unsigned int msg_id = WM_RET_ERR_CNT;
- if (list)
- msg_id = WM_LS_RET_ERR_CNT;
- while (!PostMessage
- ((HWND) atoi(gui_hwnd), msg_id, (WPARAM) errs,
- 0 /*lParam */ ))SleepEx(1000, TRUE);
- }
+ if (gui_mode)
+ gui_send_errcount(list, errs);
cleanup_exit(1);
}
/*
- * Be told what socket we're supposed to be using.
+ * In pscp, all agent requests should be synchronous, so this is a
+ * never-called stub.
*/
-static SOCKET scp_ssh_socket;
-char *do_select(SOCKET skt, int startup)
+void agent_schedule_callback(void (*callback)(void *, void *, int),
+ void *callback_ctx, void *data, int len)
{
- if (startup)
- scp_ssh_socket = skt;
- else
- scp_ssh_socket = INVALID_SOCKET;
- return NULL;
+ assert(!"We shouldn't be here");
}
-extern int select_result(WPARAM, LPARAM);
/*
* Receive a block of data from the SSH link. Block until all data
static unsigned outlen; /* how much data required */
static unsigned char *pending = NULL; /* any spare data */
static unsigned pendlen = 0, pendsize = 0; /* length and phys. size of buffer */
-int from_backend(void *frontend, int is_stderr, char *data, int datalen)
+int from_backend(void *frontend, int is_stderr, const char *data, int datalen)
{
unsigned char *p = (unsigned char *) data;
unsigned len = (unsigned) datalen;
- assert(len > 0);
-
/*
* stderr data is just spouted to local stderr and otherwise
* ignored.
*/
if (is_stderr) {
- fwrite(data, 1, len, stderr);
+ if (len > 0)
+ fwrite(data, 1, len, stderr);
return 0;
}
if (!outptr)
return 0;
- if (outlen > 0) {
+ if ((outlen > 0) && (len > 0)) {
unsigned used = outlen;
if (used > len)
used = len;
if (len > 0) {
if (pendsize < pendlen + len) {
pendsize = pendlen + len + 4096;
- pending = (pending ? srealloc(pending, pendsize) :
- smalloc(pendsize));
+ pending = sresize(pending, pendsize, unsigned char);
if (!pending)
fatalbox("Out of memory");
}
return 0;
}
-static int scp_process_network_event(void)
-{
- fd_set readfds;
-
- FD_ZERO(&readfds);
- FD_SET(scp_ssh_socket, &readfds);
- if (select(1, &readfds, NULL, NULL, NULL) < 0)
- return 0; /* doom */
- select_result((WPARAM) scp_ssh_socket, (LPARAM) FD_READ);
- return 1;
-}
static int ssh_scp_recv(unsigned char *buf, int len)
{
outptr = buf;
}
while (outlen > 0) {
- if (!scp_process_network_event())
+ if (ssh_sftp_loop_iteration() < 0)
return 0; /* doom */
}
*/
static void ssh_scp_init(void)
{
- if (scp_ssh_socket == INVALID_SOCKET)
- return;
while (!back->sendok(backhandle)) {
- fd_set readfds;
- FD_ZERO(&readfds);
- FD_SET(scp_ssh_socket, &readfds);
- if (select(1, &readfds, NULL, NULL, NULL) < 0)
+ if (ssh_sftp_loop_iteration() < 0)
return; /* doom */
- select_result((WPARAM) scp_ssh_socket, (LPARAM) FD_READ);
}
using_sftp = !ssh_fallback_cmd(backhandle);
+ if (verbose) {
+ if (using_sftp)
+ tell_user(stderr, "Using SFTP");
+ else
+ tell_user(stderr, "Using SCP1");
+ }
}
/*
ssh_scp_recv(&ch, 1);
}
- if (gui_mode) {
- unsigned int msg_id = WM_RET_ERR_CNT;
- if (list)
- msg_id = WM_LS_RET_ERR_CNT;
- while (!PostMessage
- ((HWND) atoi(gui_hwnd), msg_id, (WPARAM) errs,
- 0 /*lParam */ ))SleepEx(1000, TRUE);
- }
+ if (gui_mode)
+ gui_send_errcount(list, errs);
cleanup_exit(1);
}
*/
static void do_cmd(char *host, char *user, char *cmd)
{
- char *err, *realhost;
- DWORD namelen;
+ const char *err;
+ char *realhost;
+ void *logctx;
if (host == NULL || host[0] == '\0')
bump("Empty host name");
strncpy(cfg.username, user, sizeof(cfg.username) - 1);
cfg.username[sizeof(cfg.username) - 1] = '\0';
} else if (cfg.username[0] == '\0') {
- namelen = 0;
- if (GetUserName(user, &namelen) == FALSE)
+ user = get_username();
+ if (!user)
bump("Empty user name");
- user = smalloc(namelen * sizeof(char));
- GetUserName(user, &namelen);
- if (verbose)
- tell_user(stderr, "Guessing user name: %s", user);
- strncpy(cfg.username, user, sizeof(cfg.username) - 1);
- cfg.username[sizeof(cfg.username) - 1] = '\0';
- free(user);
+ else {
+ if (verbose)
+ tell_user(stderr, "Guessing user name: %s", user);
+ strncpy(cfg.username, user, sizeof(cfg.username) - 1);
+ cfg.username[sizeof(cfg.username) - 1] = '\0';
+ sfree(user);
+ }
}
/*
back = &ssh_backend;
- err = back->init(NULL, &backhandle, cfg.host, cfg.port, &realhost, 0);
+ err = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port, &realhost,0);
if (err != NULL)
bump("ssh_init: %s", err);
- logctx = log_init(NULL);
+ logctx = log_init(NULL, &cfg);
back->provide_logctx(backhandle, logctx);
+ console_provide_logctx(logctx);
ssh_scp_init();
if (verbose && realhost != NULL)
tell_user(stderr, "Connected to %s\n", realhost);
pct = (int) (100 * (done * 1.0 / size));
- if (gui_mode)
- /* GUI Adaptation - Sept 2000 */
+ if (gui_mode) {
gui_update_stats(name, size, pct, elap, done, eta,
(unsigned long) ratebs);
- else {
+ } else {
len = printf("\r%-25.25s | %10ld kB | %5.1f kB/s | ETA: %8s | %3d%%",
name, done / 1024, ratebs / 1024.0, etastr, pct);
if (len < prev_stats_len)
if (done == size)
printf("\n");
+
+ fflush(stdout);
}
}
struct fxp_handle *dirh;
struct fxp_names *names;
struct fxp_name *ournames;
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
int nnames, namesize;
int i;
printf("Listing directory %s\n", dirname);
- dirh = fxp_opendir(dirname);
+ sftp_register(req = fxp_opendir_send(dirname));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ dirh = fxp_opendir_recv(pktin, rreq);
+
if (dirh == NULL) {
printf("Unable to open %s: %s\n", dirname, fxp_error());
} else {
while (1) {
- names = fxp_readdir(dirh);
+ sftp_register(req = fxp_readdir_send(dirh));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ names = fxp_readdir_recv(pktin, rreq);
+
if (names == NULL) {
if (fxp_error_type() == SSH_FX_EOF)
break;
if (nnames + names->nnames >= namesize) {
namesize += names->nnames + 128;
- ournames =
- srealloc(ournames, namesize * sizeof(*ournames));
+ ournames = sresize(ournames, namesize, struct fxp_name);
}
for (i = 0; i < names->nnames; i++)
names->nnames = 0; /* prevent free_names */
fxp_free_names(names);
}
- fxp_close(dirh);
+ sftp_register(req = fxp_close_send(dirh));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ fxp_close_recv(pktin, rreq);
/*
* Now we have our filenames. Sort them by actual file
static unsigned long scp_sftp_mtime, scp_sftp_atime;
static int scp_has_times;
static struct fxp_handle *scp_sftp_filehandle;
+static struct fxp_xfer *scp_sftp_xfer;
static uint64 scp_sftp_fileoffset;
void scp_source_setup(char *target, int shouldbedir)
* Find out whether the target filespec is in fact a
* directory.
*/
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
struct fxp_attrs attrs;
+ int ret;
if (!fxp_init()) {
tell_user(stderr, "unable to initialise SFTP: %s", fxp_error());
return;
}
- if (!fxp_stat(target, &attrs) ||
- !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS))
+ sftp_register(req = fxp_stat_send(target));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ ret = fxp_stat_recv(pktin, rreq, &attrs);
+
+ if (!ret || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS))
scp_sftp_targetisdir = 0;
else
scp_sftp_targetisdir = (attrs.permissions & 0040000) != 0;
{
if (using_sftp) {
char *fullname;
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+
if (scp_sftp_targetisdir) {
fullname = dupcat(scp_sftp_remotepath, "/", name, NULL);
} else {
fullname = dupstr(scp_sftp_remotepath);
}
- scp_sftp_filehandle =
- fxp_open(fullname, SSH_FXF_WRITE | SSH_FXF_CREAT | SSH_FXF_TRUNC);
+
+ sftp_register(req = fxp_open_send(fullname, SSH_FXF_WRITE |
+ SSH_FXF_CREAT | SSH_FXF_TRUNC));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ scp_sftp_filehandle = fxp_open_recv(pktin, rreq);
+
if (!scp_sftp_filehandle) {
tell_user(stderr, "pscp: unable to open %s: %s",
fullname, fxp_error());
return 1;
}
scp_sftp_fileoffset = uint64_make(0, 0);
+ scp_sftp_xfer = xfer_upload_init(scp_sftp_filehandle,
+ scp_sftp_fileoffset);
sfree(fullname);
return 0;
} else {
int scp_send_filedata(char *data, int len)
{
if (using_sftp) {
+ int ret;
+ struct sftp_packet *pktin;
+
if (!scp_sftp_filehandle) {
return 1;
}
- if (!fxp_write(scp_sftp_filehandle, data, scp_sftp_fileoffset, len)) {
- tell_user(stderr, "error while writing: %s\n", fxp_error());
- errs++;
- return 1;
+
+ while (!xfer_upload_ready(scp_sftp_xfer)) {
+ pktin = sftp_recv();
+ ret = xfer_upload_gotpkt(scp_sftp_xfer, pktin);
+ if (!ret) {
+ tell_user(stderr, "error while writing: %s\n", fxp_error());
+ errs++;
+ return 1;
+ }
}
+
+ xfer_upload_data(scp_sftp_xfer, data, len);
+
scp_sftp_fileoffset = uint64_add32(scp_sftp_fileoffset, len);
return 0;
} else {
* we have space in the buffer again.
*/
while (bufsize > MAX_SCP_BUFSIZE) {
- if (!scp_process_network_event())
+ if (ssh_sftp_loop_iteration() < 0)
return 1;
bufsize = back->sendbuffer(backhandle);
}
{
if (using_sftp) {
struct fxp_attrs attrs;
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+ int ret;
+
+ while (!xfer_done(scp_sftp_xfer)) {
+ pktin = sftp_recv();
+ xfer_upload_gotpkt(scp_sftp_xfer, pktin);
+ }
+ xfer_cleanup(scp_sftp_xfer);
+
if (!scp_sftp_filehandle) {
return 1;
}
attrs.flags = SSH_FILEXFER_ATTR_ACMODTIME;
attrs.atime = scp_sftp_atime;
attrs.mtime = scp_sftp_mtime;
- if (!fxp_fsetstat(scp_sftp_filehandle, attrs)) {
+ sftp_register(req = fxp_fsetstat_send(scp_sftp_filehandle, attrs));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ ret = fxp_fsetstat_recv(pktin, rreq);
+ if (!ret) {
tell_user(stderr, "unable to set file times: %s\n", fxp_error());
errs++;
}
}
- fxp_close(scp_sftp_filehandle);
+ sftp_register(req = fxp_close_send(scp_sftp_filehandle));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ fxp_close_recv(pktin, rreq);
scp_has_times = 0;
return 0;
} else {
char *fullname;
char const *err;
struct fxp_attrs attrs;
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+ int ret;
+
if (scp_sftp_targetisdir) {
fullname = dupcat(scp_sftp_remotepath, "/", name, NULL);
} else {
* exists and is a directory we will assume we were either
* successful or it didn't matter.
*/
- if (!fxp_mkdir(fullname))
+ sftp_register(req = fxp_mkdir_send(fullname));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ ret = fxp_mkdir_recv(pktin, rreq);
+
+ if (!ret)
err = fxp_error();
else
err = "server reported no error";
- if (!fxp_stat(fullname, &attrs) ||
- !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) ||
+
+ sftp_register(req = fxp_stat_send(fullname));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ ret = fxp_stat_recv(pktin, rreq, &attrs);
+
+ if (!ret || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) ||
!(attrs.permissions & 0040000)) {
tell_user(stderr, "unable to create directory %s: %s",
fullname, err);
* wildcardness comes before the final slash) and arrange
* things so that a dirstack entry will be set up.
*/
- newsource = smalloc(1+strlen(source));
+ newsource = snewn(1+strlen(source), char);
if (!wc_unescape(newsource, source)) {
/* Yes, here we go; it's a wildcard. Bah. */
char *dupsource, *lastpart, *dirpart, *wildcard;
* wildcard escapes from the directory part, throwing
* an error if it contains a real wildcard.
*/
- dirpart = smalloc(1+strlen(dupsource));
+ dirpart = snewn(1+strlen(dupsource), char);
if (!wc_unescape(dirpart, dupsource)) {
tell_user(stderr, "%s: multiple-level wildcards unsupported",
source);
char *fname;
int must_free_fname;
struct fxp_attrs attrs;
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
int ret;
if (!scp_sftp_dirstack_head) {
* Now we have a filename. Stat it, and see if it's a file
* or a directory.
*/
- ret = fxp_stat(fname, &attrs);
+ sftp_register(req = fxp_stat_send(fname));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ ret = fxp_stat_recv(pktin, rreq, &attrs);
+
if (!ret || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS)) {
tell_user(stderr, "unable to identify %s: %s", fname,
ret ? "file type not supplied" : fxp_error());
* list), we must push the other (target,namelist) pair
* on a stack.
*/
- dirhandle = fxp_opendir(fname);
+ sftp_register(req = fxp_opendir_send(fname));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ dirhandle = fxp_opendir_recv(pktin, rreq);
+
if (!dirhandle) {
tell_user(stderr, "scp: unable to open directory %s: %s",
fname, fxp_error());
while (1) {
int i;
- names = fxp_readdir(dirhandle);
+ sftp_register(req = fxp_readdir_send(dirhandle));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ names = fxp_readdir_recv(pktin, rreq);
+
if (names == NULL) {
if (fxp_error_type() == SSH_FX_EOF)
break;
}
if (nnames + names->nnames >= namesize) {
namesize += names->nnames + 128;
- ournames =
- srealloc(ournames, namesize * sizeof(*ournames));
+ ournames = sresize(ournames, namesize, struct fxp_name);
}
for (i = 0; i < names->nnames; i++)
ournames[nnames++] = names->names[i];
names->nnames = 0; /* prevent free_names */
fxp_free_names(names);
}
- fxp_close(dirhandle);
+ sftp_register(req = fxp_close_send(dirhandle));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ fxp_close_recv(pktin, rreq);
- newitem = smalloc(sizeof(struct scp_sftp_dirstack));
+ newitem = snew(struct scp_sftp_dirstack);
newitem->next = scp_sftp_dirstack_head;
newitem->names = ournames;
newitem->namepos = 0;
bump("Lost connection");
if (i >= bufsize) {
bufsize = i + 128;
- act->buf = srealloc(act->buf, bufsize);
+ act->buf = sresize(act->buf, bufsize, char);
}
act->buf[i++] = ch;
} while (ch != '\n');
int scp_accept_filexfer(void)
{
if (using_sftp) {
- scp_sftp_filehandle =
- fxp_open(scp_sftp_currentname, SSH_FXF_READ);
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+
+ sftp_register(req = fxp_open_send(scp_sftp_currentname, SSH_FXF_READ));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ scp_sftp_filehandle = fxp_open_recv(pktin, rreq);
+
if (!scp_sftp_filehandle) {
tell_user(stderr, "pscp: unable to open %s: %s",
scp_sftp_currentname, fxp_error());
return 1;
}
scp_sftp_fileoffset = uint64_make(0, 0);
+ scp_sftp_xfer = xfer_download_init(scp_sftp_filehandle,
+ scp_sftp_fileoffset);
sfree(scp_sftp_currentname);
return 0;
} else {
int scp_recv_filedata(char *data, int len)
{
if (using_sftp) {
- int actuallen = fxp_read(scp_sftp_filehandle, data,
- scp_sftp_fileoffset, len);
- if (actuallen == -1 && fxp_error_type() != SSH_FX_EOF) {
+ struct sftp_packet *pktin;
+ int ret, actuallen;
+ void *vbuf;
+
+ xfer_download_queue(scp_sftp_xfer);
+ pktin = sftp_recv();
+ ret = xfer_download_gotpkt(scp_sftp_xfer, pktin);
+
+ if (ret < 0) {
tell_user(stderr, "pscp: error while reading: %s", fxp_error());
errs++;
return -1;
}
- if (actuallen < 0)
+
+ if (xfer_download_data(scp_sftp_xfer, &vbuf, &actuallen)) {
+ /*
+ * This assertion relies on the fact that the natural
+ * block size used in the xfer manager is at most that
+ * used in this module. I don't like crossing layers in
+ * this way, but it'll do for now.
+ */
+ assert(actuallen <= len);
+ memcpy(data, vbuf, actuallen);
+ sfree(vbuf);
+ } else
actuallen = 0;
scp_sftp_fileoffset = uint64_add32(scp_sftp_fileoffset, actuallen);
int scp_finish_filerecv(void)
{
if (using_sftp) {
- fxp_close(scp_sftp_filehandle);
+ struct sftp_packet *pktin;
+ struct sftp_request *req, *rreq;
+
+ /*
+ * Ensure that xfer_done() will work correctly, so we can
+ * clean up any outstanding requests from the file
+ * transfer.
+ */
+ xfer_set_error(scp_sftp_xfer);
+ while (!xfer_done(scp_sftp_xfer)) {
+ void *vbuf;
+ int len;
+
+ pktin = sftp_recv();
+ xfer_download_gotpkt(scp_sftp_xfer, pktin);
+ if (xfer_download_data(scp_sftp_xfer, &vbuf, &len))
+ sfree(vbuf);
+ }
+ xfer_cleanup(scp_sftp_xfer);
+
+ sftp_register(req = fxp_close_send(scp_sftp_filehandle));
+ rreq = sftp_find_request(pktin = sftp_recv());
+ assert(rreq == req);
+ fxp_close_recv(pktin, rreq);
return 0;
} else {
back->send(backhandle, "", 1);
static void source(char *src)
{
unsigned long size;
+ unsigned long mtime, atime;
char *last;
- HANDLE f;
- DWORD attr;
+ RFile *f;
+ int attr;
unsigned long i;
unsigned long stat_bytes;
time_t stat_starttime, stat_lasttime;
- attr = GetFileAttributes(src);
- if (attr == (DWORD) - 1) {
- run_err("%s: No such file or directory", src);
+ attr = file_type(src);
+ if (attr == FILE_TYPE_NONEXISTENT ||
+ attr == FILE_TYPE_WEIRD) {
+ run_err("%s: %s file or directory", src,
+ (attr == FILE_TYPE_WEIRD ? "Not a" : "No such"));
return;
}
- if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {
+ if (attr == FILE_TYPE_DIRECTORY) {
if (recursive) {
/*
* Avoid . and .. directories.
if (last == src && strchr(src, ':') != NULL)
last = strchr(src, ':') + 1;
- f = CreateFile(src, GENERIC_READ, FILE_SHARE_READ, NULL,
- OPEN_EXISTING, 0, 0);
- if (f == INVALID_HANDLE_VALUE) {
+ f = open_existing_file(src, &size, &mtime, &atime);
+ if (f == NULL) {
run_err("%s: Cannot open file", src);
return;
}
-
if (preserve) {
- FILETIME actime, wrtime;
- unsigned long mtime, atime;
- GetFileTime(f, NULL, &actime, &wrtime);
- TIME_WIN_TO_POSIX(actime, atime);
- TIME_WIN_TO_POSIX(wrtime, mtime);
if (scp_send_filetimes(mtime, atime))
return;
}
- size = GetFileSize(f, NULL);
if (verbose)
tell_user(stderr, "Sending file %s, size=%lu", last, size);
if (scp_send_filename(last, size, 0644))
for (i = 0; i < size; i += 4096) {
char transbuf[4096];
- DWORD j, k = 4096;
+ int j, k = 4096;
if (i + k > size)
k = size - i;
- if (!ReadFile(f, transbuf, k, &j, NULL) || j != k) {
+ if ((j = read_from_file(f, transbuf, k)) != k) {
if (statistics)
printf("\n");
bump("%s: Read error", src);
}
}
- CloseHandle(f);
+ close_rfile(f);
(void) scp_send_finish();
}
*/
static void rsource(char *src)
{
- char *last, *findfile;
+ char *last;
char *save_target;
- HANDLE dir;
- WIN32_FIND_DATA fdat;
- int ok;
+ DirHandle *dir;
if ((last = strrchr(src, '/')) == NULL)
last = src;
if (scp_send_dirname(last, 0755))
return;
- findfile = dupcat(src, "/*", NULL);
- dir = FindFirstFile(findfile, &fdat);
- ok = (dir != INVALID_HANDLE_VALUE);
- while (ok) {
- if (strcmp(fdat.cFileName, ".") == 0 ||
- strcmp(fdat.cFileName, "..") == 0) {
- /* ignore . and .. */
- } else {
- char *foundfile = dupcat(src, "/", fdat.cFileName, NULL);
+ dir = open_directory(src);
+ if (dir != NULL) {
+ char *filename;
+ while ((filename = read_filename(dir)) != NULL) {
+ char *foundfile = dupcat(src, "/", filename, NULL);
source(foundfile);
sfree(foundfile);
+ sfree(filename);
}
- ok = FindNextFile(dir, &fdat);
}
- FindClose(dir);
- sfree(findfile);
+ close_directory(dir);
(void) scp_send_enddir();
char *destfname;
int targisdir = 0;
int exists;
- DWORD attr;
- HANDLE f;
+ int attr;
+ WFile *f;
unsigned long received;
int wrerror = 0;
unsigned long stat_bytes;
time_t stat_starttime, stat_lasttime;
char *stat_name;
- attr = GetFileAttributes(targ);
- if (attr != (DWORD) - 1 && (attr & FILE_ATTRIBUTE_DIRECTORY) != 0)
+ attr = file_type(targ);
+ if (attr == FILE_TYPE_DIRECTORY)
targisdir = 1;
if (targetshouldbedirectory && !targisdir)
}
if (targ[0] != '\0')
- destfname = dupcat(targ, "\\", striptarget, NULL);
+ destfname = dir_file_cat(targ, striptarget);
else
destfname = dupstr(striptarget);
} else {
*/
destfname = dupstr(targ);
}
- attr = GetFileAttributes(destfname);
- exists = (attr != (DWORD) - 1);
+ attr = file_type(destfname);
+ exists = (attr != FILE_TYPE_NONEXISTENT);
if (act.action == SCP_SINK_DIR) {
- if (exists && (attr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+ if (exists && attr != FILE_TYPE_DIRECTORY) {
run_err("%s: Not a directory", destfname);
continue;
}
if (!exists) {
- if (!CreateDirectory(destfname, NULL)) {
+ if (!create_directory(destfname)) {
run_err("%s: Cannot create directory", destfname);
continue;
}
continue;
}
- f = CreateFile(destfname, GENERIC_WRITE, 0, NULL,
- CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
- if (f == INVALID_HANDLE_VALUE) {
+ f = open_new_file(destfname);
+ if (f == NULL) {
run_err("%s: Cannot create file", destfname);
continue;
}
received = 0;
while (received < act.size) {
char transbuf[4096];
- DWORD blksize, read, written;
+ int blksize, read;
blksize = 4096;
- if (blksize > act.size - received)
+ if (blksize > (int)(act.size - received))
blksize = act.size - received;
read = scp_recv_filedata(transbuf, blksize);
if (read <= 0)
bump("Lost connection");
if (wrerror)
continue;
- if (!WriteFile(f, transbuf, read, &written, NULL) ||
- written != read) {
+ if (write_to_file(f, transbuf, read) != (int)read) {
wrerror = 1;
/* FIXME: in sftp we can actually abort the transfer */
if (statistics)
received += read;
}
if (act.settime) {
- FILETIME actime, wrtime;
- TIME_POSIX_TO_WIN(act.atime, actime);
- TIME_POSIX_TO_WIN(act.mtime, wrtime);
- SetFileTime(f, NULL, &actime, &wrtime);
+ set_file_times(f, act.mtime, act.atime);
}
- CloseHandle(f);
+ close_wfile(f);
if (wrerror) {
run_err("%s: Write error", destfname);
continue;
{
char *src, *targ, *host, *user;
char *cmd;
- int i;
+ int i, wc_type;
targ = argv[argc - 1];
}
if (argc == 2) {
- /* Find out if the source filespec covers multiple files
- if so, we should set the targetshouldbedirectory flag */
- HANDLE fh;
- WIN32_FIND_DATA fdat;
if (colon(argv[0]) != NULL)
bump("%s: Remote to remote not supported", argv[0]);
- fh = FindFirstFile(argv[0], &fdat);
- if (fh == INVALID_HANDLE_VALUE)
+
+ wc_type = test_wildcard(argv[0], 1);
+ if (wc_type == WCTYPE_NONEXISTENT)
bump("%s: No such file or directory\n", argv[0]);
- if (FindNextFile(fh, &fdat))
+ else if (wc_type == WCTYPE_WILDCARD)
targetshouldbedirectory = 1;
- FindClose(fh);
}
cmd = dupprintf("scp%s%s%s%s -t %s",
scp_source_setup(targ, targetshouldbedirectory);
for (i = 0; i < argc - 1; i++) {
- char *srcpath, *last;
- HANDLE dir;
- WIN32_FIND_DATA fdat;
src = argv[i];
if (colon(src) != NULL) {
tell_user(stderr, "%s: Remote to remote not supported\n", src);
continue;
}
- /*
- * Trim off the last pathname component of `src', to
- * provide the base pathname which will be prepended to
- * filenames returned from Find{First,Next}File.
- */
- srcpath = dupstr(src);
- last = stripslashes(srcpath, 1);
- *last = '\0';
-
- dir = FindFirstFile(src, &fdat);
- if (dir == INVALID_HANDLE_VALUE) {
+ wc_type = test_wildcard(src, 1);
+ if (wc_type == WCTYPE_NONEXISTENT) {
run_err("%s: No such file or directory", src);
continue;
- }
- do {
+ } else if (wc_type == WCTYPE_FILENAME) {
+ source(src);
+ continue;
+ } else {
+ WildcardMatcher *wc;
char *filename;
- /*
- * Ensure that . and .. are never matched by wildcards,
- * but only by deliberate action.
- */
- if (!strcmp(fdat.cFileName, ".") ||
- !strcmp(fdat.cFileName, "..")) {
- /*
- * Find*File has returned a special dir. We require
- * that _either_ `src' ends in a backslash followed
- * by that string, _or_ `src' is precisely that
- * string.
- */
- int len = strlen(src), dlen = strlen(fdat.cFileName);
- if (len == dlen && !strcmp(src, fdat.cFileName)) {
- /* ok */ ;
- } else if (len > dlen + 1 && src[len - dlen - 1] == '\\' &&
- !strcmp(src + len - dlen, fdat.cFileName)) {
- /* ok */ ;
- } else
- continue; /* ignore this one */
+
+ wc = begin_wildcard_matching(src);
+ if (wc == NULL) {
+ run_err("%s: No such file or directory", src);
+ continue;
}
- filename = dupcat(srcpath, fdat.cFileName, NULL);
- source(filename);
- sfree(filename);
- } while (FindNextFile(dir, &fdat));
- FindClose(dir);
- sfree(srcpath);
+
+ while ((filename = wildcard_get_filename(wc)) != NULL) {
+ source(filename);
+ sfree(filename);
+ }
+
+ finish_wildcard_matching(wc);
+ }
}
}
user = NULL;
}
- cmd = smalloc(4 * strlen(src) + 100);
+ cmd = snewn(4 * strlen(src) + 100, char);
strcpy(cmd, "ls -la '");
p = cmd + strlen(cmd);
for (q = src; *q; q++) {
}
/*
- * Initialize the Win$ock driver.
- */
-static void init_winsock(void)
-{
- WORD winsock_ver;
- WSADATA wsadata;
-
- winsock_ver = MAKEWORD(1, 1);
- if (WSAStartup(winsock_ver, &wsadata))
- bump("Unable to initialise WinSock");
- if (LOBYTE(wsadata.wVersion) != 1 || HIBYTE(wsadata.wVersion) != 1)
- bump("WinSock version is incompatible with 1.1");
-}
-
-/*
* Short description of parameters.
*/
static void usage(void)
}
/*
- * Main program (no, really?)
+ * Main program. (Called `psftp_main' because it gets called from
+ * *sftp.c; bit silly, I know, but it had to be called _something_.)
*/
-int main(int argc, char *argv[])
+int psftp_main(int argc, char *argv[])
{
int i;
default_protocol = PROT_TELNET;
- flags = FLAG_STDERR;
+ flags = FLAG_STDERR
+#ifdef FLAG_SYNCAGENT
+ | FLAG_SYNCAGENT
+#endif
+ ;
cmdline_tooltype = TOOLTYPE_FILETRANSFER;
ssh_get_line = &console_get_line;
- init_winsock();
sk_init();
for (i = 1; i < argc; i++) {
} else if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "-?") == 0) {
usage();
} else if (strcmp(argv[i], "-gui") == 0 && i + 1 < argc) {
- gui_hwnd = argv[++i];
+ gui_enable(argv[++i]);
gui_mode = 1;
console_batch_mode = TRUE;
} else if (strcmp(argv[i], "-ls") == 0) {
back->special(backhandle, TS_EOF);
ssh_scp_recv(&ch, 1);
}
- WSACleanup();
random_save_seed();
- /* GUI Adaptation - August 2000 */
- if (gui_mode) {
- unsigned int msg_id = WM_RET_ERR_CNT;
- if (list)
- msg_id = WM_LS_RET_ERR_CNT;
- while (!PostMessage
- ((HWND) atoi(gui_hwnd), msg_id, (WPARAM) errs,
- 0 /*lParam */ ))SleepEx(1000, TRUE);
- }
+ if (gui_mode)
+ gui_send_errcount(list, errs);
+
+ cmdline_cleanup();
+ console_provide_logctx(NULL);
+ back->free(backhandle);
+ backhandle = NULL;
+ back = NULL;
+ sk_cleanup();
return (errs == 0 ? 0 : 1);
}
projects / u / mdw / putty / blobdiff