/*
* scp.c - Scp (Secure Copy) client for PuTTY.
- * Joris van Rantwijk, Aug 1999, Nov 1999.
+ * Joris van Rantwijk, Simon Tatham
*
* This is mainly based on ssh-1.2.26/scp.c by Timo Rinne & Tatu Ylonen.
* They, in turn, used stuff from BSD rcp.
+ *
+ * Adaptations to enable connecting a GUI by L. Gunnarsson - Sept 2000
*/
#include <windows.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
+/* GUI Adaptation - Sept 2000 */
+#include <winuser.h>
+#include <winbase.h>
#define PUTTY_DO_GLOBALS
#include "putty.h"
#define TIME_WIN_TO_POSIX(ft, t) ((t) = (unsigned long) \
((*(LONGLONG*)&(ft)) / (LONGLONG) 10000000 - (LONGLONG) 11644473600))
-int verbose = 0;
+/* GUI Adaptation - Sept 2000 */
+#define WM_APP_BASE 0x8000
+#define WM_STD_OUT_CHAR ( WM_APP_BASE+400 )
+#define WM_STD_ERR_CHAR ( WM_APP_BASE+401 )
+#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 )
+#define WM_RET_ERR_CNT ( WM_APP_BASE+406 )
+#define WM_LS_RET_ERR_CNT ( WM_APP_BASE+407 )
+
+static int verbose = 0;
static int recursive = 0;
static int preserve = 0;
static int targetshouldbedirectory = 0;
static char *password = NULL;
static int errs = 0;
static int connection_open = 0;
+/* GUI Adaptation - Sept 2000 */
+#define NAME_STR_MAX 2048
+static char statname[NAME_STR_MAX+1];
+static unsigned long statsize = 0;
+static int statperct = 0;
+static time_t statelapsed = 0;
+static int gui_mode = 0;
+static char *gui_hwnd = NULL;
static void source(char *src);
static void rsource(char *src);
static void sink(char *targ);
+/* 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 send_char_msg(unsigned int msg_id, char c);
+static void send_str_msg(unsigned int msg_id, char *str);
+static void gui_update_stats(char *name, unsigned long size, int percentage, time_t elapsed);
+
+/*
+ * These functions are needed to link with ssh.c, but never get called.
+ */
+void term_out(void)
+{
+ abort();
+}
+void begin_session(void) {
+}
+
+/* GUI Adaptation - Sept 2000 */
+void send_msg(HWND h, UINT message, WPARAM wParam)
+{
+ while (!PostMessage( h, message, wParam, 0))
+ SleepEx(1000,TRUE);
+}
+
+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 );
+ }
+}
+
+void tell_str(FILE *stream, char *str)
+{
+ unsigned int i;
+
+ for( i = 0; i < strlen(str); ++i )
+ tell_char(stream, str[i]);
+}
+
+void tell_user(FILE *stream, char *fmt, ...)
+{
+ char str[0x100]; /* Make the size big enough */
+ va_list ap;
+ va_start(ap, fmt);
+ vsprintf(str, fmt, ap);
+ va_end(ap);
+ strcat(str, "\n");
+ tell_str(stream, str);
+}
+
+void gui_update_stats(char *name, unsigned long size, int percentage, time_t elapsed)
+{
+ 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 (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.
*/
void fatalbox(char *fmt, ...)
{
+ char str[0x100]; /* Make the size big enough */
+ va_list ap;
+ va_start(ap, fmt);
+ strcpy(str, "Fatal:");
+ vsprintf(str+strlen(str), fmt, ap);
+ va_end(ap);
+ strcat(str, "\n");
+ tell_str(stderr, str);
+
+ exit(1);
+}
+void connection_fatal(char *fmt, ...)
+{
+ char str[0x100]; /* Make the size big enough */
va_list ap;
va_start(ap, fmt);
- fprintf(stderr, "Fatal: ");
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, "\n");
+ strcpy(str, "Fatal:");
+ vsprintf(str+strlen(str), fmt, ap);
va_end(ap);
+ strcat(str, "\n");
+ tell_str(stderr, str);
+
exit(1);
}
*/
static void bump(char *fmt, ...)
{
+ char str[0x100]; /* Make the size big enough */
va_list ap;
va_start(ap, fmt);
- fprintf(stderr, "Fatal: ");
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, "\n");
+ strcpy(str, "Fatal:");
+ vsprintf(str+strlen(str), fmt, ap);
va_end(ap);
+ strcat(str, "\n");
+ tell_str(stderr, str);
+
if (connection_open) {
char ch;
- ssh_send_eof();
- ssh_recv(&ch, 1);
+ ssh_scp_send_eof();
+ ssh_scp_recv(&ch, 1);
}
exit(1);
}
-void ssh_get_password(char *prompt, char *str, int maxlen)
+static int get_password(const char *prompt, char *str, int maxlen)
{
HANDLE hin, hout;
DWORD savemode, i;
if (password) {
- strncpy(str, password, maxlen);
- str[maxlen-1] = '\0';
- password = NULL;
- return;
+ static int tried_once = 0;
+
+ if (tried_once) {
+ return 0;
+ } else {
+ strncpy(str, password, maxlen);
+ str[maxlen-1] = '\0';
+ tried_once = 1;
+ return 1;
+ }
}
- hin = GetStdHandle(STD_INPUT_HANDLE);
- hout = GetStdHandle(STD_OUTPUT_HANDLE);
- if (hin == INVALID_HANDLE_VALUE || hout == INVALID_HANDLE_VALUE)
- bump("Cannot get standard input/output handles");
+ /* GUI Adaptation - Sept 2000 */
+ if (gui_mode) {
+ if (maxlen>0) str[0] = '\0';
+ } else {
+ hin = GetStdHandle(STD_INPUT_HANDLE);
+ hout = GetStdHandle(STD_OUTPUT_HANDLE);
+ if (hin == INVALID_HANDLE_VALUE || hout == INVALID_HANDLE_VALUE)
+ bump("Cannot get standard input/output handles");
+
+ GetConsoleMode(hin, &savemode);
+ SetConsoleMode(hin, (savemode & (~ENABLE_ECHO_INPUT)) |
+ ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT);
- GetConsoleMode(hin, &savemode);
- SetConsoleMode(hin, (savemode & (~ENABLE_ECHO_INPUT)) |
- ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT);
+ WriteFile(hout, prompt, strlen(prompt), &i, NULL);
+ ReadFile(hin, str, maxlen-1, &i, NULL);
- WriteFile(hout, prompt, strlen(prompt), &i, NULL);
- ReadFile(hin, str, maxlen-1, &i, NULL);
+ SetConsoleMode(hin, savemode);
- SetConsoleMode(hin, savemode);
+ if ((int)i > maxlen) i = maxlen-1; else i = i - 2;
+ str[i] = '\0';
- if ((int)i > maxlen) i = maxlen-1; else i = i - 2;
- str[i] = '\0';
+ WriteFile(hout, "\r\n", 2, &i, NULL);
+ }
- WriteFile(hout, "\r\n", 2, &i, NULL);
+ return 1;
}
/*
if (portnumber)
cfg.port = portnumber;
- err = ssh_init(cfg.host, cfg.port, cmd, &realhost);
+ err = ssh_scp_init(cfg.host, cfg.port, cmd, &realhost);
if (err != NULL)
bump("ssh_init: %s", err);
if (verbose && realhost != NULL)
- fprintf(stderr, "Connected to %s\n", realhost);
+ tell_user(stderr, "Connected to %s\n", realhost);
connection_open = 1;
}
char etastr[10];
int pct;
- if (now > start)
- ratebs = (float) done / (now - start);
- else
- ratebs = (float) done;
+ /* GUI Adaptation - Sept 2000 */
+ if (gui_mode)
+ gui_update_stats(name, size, ((done *100) / size), now-start);
+ else {
+ if (now > start)
+ ratebs = (float) done / (now - start);
+ else
+ ratebs = (float) done;
- if (ratebs < 1.0)
- eta = size - done;
- else
- eta = (unsigned long) ((size - done) / ratebs);
- sprintf(etastr, "%02ld:%02ld:%02ld",
- eta / 3600, (eta % 3600) / 60, eta % 60);
+ if (ratebs < 1.0)
+ eta = size - done;
+ else
+ eta = (unsigned long) ((size - done) / ratebs);
+ sprintf(etastr, "%02ld:%02ld:%02ld",
+ eta / 3600, (eta % 3600) / 60, eta % 60);
- pct = (int) (100.0 * (float) done / size);
+ pct = (int) (100.0 * (float) done / size);
- printf("\r%-25.25s | %10ld kB | %5.1f kB/s | ETA: %8s | %3d%%",
- name, done / 1024, ratebs / 1024.0,
- etastr, pct);
+ printf("\r%-25.25s | %10ld kB | %5.1f kB/s | ETA: %8s | %3d%%",
+ name, done / 1024, ratebs / 1024.0,
+ etastr, pct);
- if (done == size)
- printf("\n");
+ if (done == size)
+ printf("\n");
+ }
}
/*
* Find a colon in str and return a pointer to the colon.
- * This is used to seperate hostname from filename.
+ * This is used to separate hostname from filename.
*/
static char * colon(char *str)
{
char ch, resp, rbuf[2048];
int p;
- if (ssh_recv(&resp, 1) <= 0)
+ if (ssh_scp_recv(&resp, 1) <= 0)
bump("Lost connection");
p = 0;
case 1: /* error */
case 2: /* fatal error */
do {
- if (ssh_recv(&ch, 1) <= 0)
+ if (ssh_scp_recv(&ch, 1) <= 0)
bump("Protocol error: Lost connection");
rbuf[p++] = ch;
} while (p < sizeof(rbuf) && ch != '\n');
rbuf[p-1] = '\0';
if (resp == 1)
- fprintf(stderr, "%s\n", rbuf);
+ tell_user(stderr, "%s\n", rbuf);
else
bump("%s", rbuf);
errs++;
strcpy(str, "\01scp: ");
vsprintf(str+strlen(str), fmt, ap);
strcat(str, "\n");
- ssh_send(str, strlen(str));
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, "\n");
+ ssh_scp_send(str, strlen(str));
+ tell_user(stderr, "%s",str);
va_end(ap);
}
time_t stat_starttime, stat_lasttime;
attr = GetFileAttributes(src);
- if (attr == -1) {
+ if (attr == (DWORD)-1) {
run_err("%s: No such file or directory", src);
return;
}
f = CreateFile(src, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, 0, 0);
if (f == INVALID_HANDLE_VALUE) {
- run_err("%s: Cannot open file");
+ run_err("%s: Cannot open file", src);
return;
}
TIME_WIN_TO_POSIX(actime, atime);
TIME_WIN_TO_POSIX(wrtime, mtime);
sprintf(buf, "T%lu 0 %lu 0\n", mtime, atime);
- ssh_send(buf, strlen(buf));
+ ssh_scp_send(buf, strlen(buf));
if (response())
return;
}
size = GetFileSize(f, NULL);
sprintf(buf, "C0644 %lu %s\n", size, last);
if (verbose)
- fprintf(stderr, "Sending file modes: %s", buf);
- ssh_send(buf, strlen(buf));
+ tell_user(stderr, "Sending file modes: %s", buf);
+ ssh_scp_send(buf, strlen(buf));
if (response())
return;
if (statistics) printf("\n");
bump("%s: Read error", src);
}
- ssh_send(transbuf, k);
+ ssh_scp_send(transbuf, k);
if (statistics) {
stat_bytes += k;
if (time(NULL) != stat_lasttime ||
}
CloseHandle(f);
- ssh_send("", 1);
+ ssh_scp_send("", 1);
(void) response();
}
sprintf(buf, "D0755 0 %s\n", last);
if (verbose)
- fprintf(stderr, "Entering directory: %s", buf);
- ssh_send(buf, strlen(buf));
+ tell_user(stderr, "Entering directory: %s", buf);
+ ssh_scp_send(buf, strlen(buf));
if (response())
return;
FindClose(dir);
sprintf(buf, "E\n");
- ssh_send(buf, strlen(buf));
+ ssh_scp_send(buf, strlen(buf));
(void) response();
}
char namebuf[2048];
char ch;
int targisdir = 0;
- int settime = 0;
+ int settime;
int exists;
DWORD attr;
HANDLE f;
char *stat_name;
attr = GetFileAttributes(targ);
- if (attr != -1 && (attr & FILE_ATTRIBUTE_DIRECTORY) != 0)
+ if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_DIRECTORY) != 0)
targisdir = 1;
if (targetshouldbedirectory && !targisdir)
bump("%s: Not a directory", targ);
- ssh_send("", 1);
+ ssh_scp_send("", 1);
while (1) {
settime = 0;
gottime:
- if (ssh_recv(&ch, 1) <= 0)
+ if (ssh_scp_recv(&ch, 1) <= 0)
return;
if (ch == '\n')
bump("Protocol error: Unexpected newline");
i = 0;
buf[i++] = ch;
do {
- if (ssh_recv(&ch, 1) <= 0)
+ if (ssh_scp_recv(&ch, 1) <= 0)
bump("Lost connection");
buf[i++] = ch;
} while (i < sizeof(buf) && ch != '\n');
buf[i-1] = '\0';
switch (buf[0]) {
case '\01': /* error */
- fprintf(stderr, "%s\n", buf+1);
+ tell_user(stderr, "%s\n", buf+1);
errs++;
continue;
case '\02': /* fatal error */
bump("%s", buf+1);
case 'E':
- ssh_send("", 1);
+ ssh_scp_send("", 1);
return;
case 'T':
if (sscanf(buf, "T%ld %*d %ld %*d",
&mtime, &atime) == 2) {
settime = 1;
- ssh_send("", 1);
+ ssh_scp_send("", 1);
goto gottime;
}
bump("Protocol error: Illegal time format");
strcpy(namebuf, targ);
}
attr = GetFileAttributes(namebuf);
- exists = (attr != -1);
+ exists = (attr != (DWORD)-1);
if (buf[0] == 'D') {
if (exists && (attr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
continue;
}
- ssh_send("", 1);
+ ssh_scp_send("", 1);
if (statistics) {
stat_bytes = 0;
for (i = 0; i < size; i += 4096) {
char transbuf[4096];
- int j, k = 4096;
+ DWORD j, k = 4096;
if (i + k > size) k = size - i;
- if (ssh_recv(transbuf, k) == 0)
+ if (ssh_scp_recv(transbuf, k) == 0)
bump("Lost connection");
if (wrerror) continue;
if (! WriteFile(f, transbuf, k, &j, NULL) || j != k) {
run_err("%s: Write error", namebuf);
continue;
}
- ssh_send("", 1);
+ ssh_scp_send("", 1);
}
}
targ = argv[argc-1];
- /* Seperate host from filename */
+ /* Separate host from filename */
host = targ;
targ = colon(targ);
if (targ == NULL)
targ = ".";
/* Substitute "." for emtpy target */
- /* Seperate host and username */
+ /* Separate host and username */
user = host;
host = strrchr(host, '@');
if (host == NULL) {
WIN32_FIND_DATA fdat;
src = argv[i];
if (colon(src) != NULL) {
- fprintf(stderr,
- "%s: Remote to remote not supported\n", src);
+ tell_user(stderr, "%s: Remote to remote not supported\n", src);
errs++;
continue;
}
char namebuf[2048];
if (strlen(src) + strlen(fdat.cFileName) >=
sizeof(namebuf)) {
- fprintf(stderr, "%s: Name too long", src);
+ tell_user(stderr, "%s: Name too long", src);
continue;
}
strcpy(namebuf, src);
src = argv[0];
targ = argv[1];
- /* Seperate host from filename */
+ /* Separate host from filename */
host = src;
src = colon(src);
if (src == NULL)
src = ".";
/* Substitute "." for empty filename */
- /* Seperate username and hostname */
+ /* Separate username and hostname */
user = host;
host = strrchr(host, '@');
if (host == NULL) {
}
/*
+ * We will issue a list command to get a remote directory.
+ */
+static void get_dir_list(int argc, char *argv[])
+{
+ char *src, *host, *user;
+ char *cmd, *p, *q;
+ char c;
+
+ src = argv[0];
+
+ /* Separate host from filename */
+ host = src;
+ src = colon(src);
+ if (src == NULL)
+ bump("Local to local copy not supported");
+ *src++ = '\0';
+ if (*src == '\0')
+ src = ".";
+ /* Substitute "." for empty filename */
+
+ /* Separate username and hostname */
+ user = host;
+ host = strrchr(host, '@');
+ if (host == NULL) {
+ host = user;
+ user = NULL;
+ } else {
+ *host++ = '\0';
+ if (*user == '\0')
+ user = NULL;
+ }
+
+ cmd = smalloc(4*strlen(src) + 100);
+ strcpy(cmd, "ls -la '");
+ p = cmd + strlen(cmd);
+ for (q = src; *q; q++) {
+ if (*q == '\'') {
+ *p++ = '\''; *p++ = '\\'; *p++ = '\''; *p++ = '\'';
+ } else {
+ *p++ = *q;
+ }
+ }
+ *p++ = '\'';
+ *p = '\0';
+
+ do_cmd(host, user, cmd);
+ sfree(cmd);
+
+ while (ssh_scp_recv(&c, 1) > 0)
+ tell_char(stdout, c);
+}
+
+/*
* Initialize the Win$ock driver.
*/
-static void init_winsock()
+static void init_winsock(void)
{
WORD winsock_ver;
WSADATA wsadata;
/*
* Short description of parameters.
*/
-static void usage()
+static void usage(void)
{
printf("PuTTY Secure Copy client\n");
printf("%s\n", ver);
- printf("Usage: scp [options] [user@]host:source target\n");
- printf(" scp [options] source [source...] [user@]host:target\n");
+ printf("Usage: pscp [options] [user@]host:source target\n");
+ printf(" pscp [options] source [source...] [user@]host:target\n");
+ printf(" pscp [options] -ls user@host:filespec\n");
printf("Options:\n");
printf(" -p preserve file attributes\n");
printf(" -q quiet, don't show statistics\n");
printf(" -v show verbose messages\n");
printf(" -P port connect to specified port\n");
printf(" -pw passw login with specified password\n");
+ /* GUI Adaptation - Sept 2000 */
+ printf(" -gui hWnd GUI mode with the windows handle for receiving messages\n");
exit(1);
}
int main(int argc, char *argv[])
{
int i;
+ int list = 0;
+ default_protocol = PROT_TELNET;
+
+ flags = FLAG_STDERR;
+ ssh_get_password = &get_password;
init_winsock();
for (i = 1; i < argc; i++) {
if (argv[i][0] != '-')
break;
if (strcmp(argv[i], "-v") == 0)
- verbose = 1;
+ verbose = 1, flags |= FLAG_VERBOSE;
else if (strcmp(argv[i], "-r") == 0)
recursive = 1;
else if (strcmp(argv[i], "-p") == 0)
portnumber = atoi(argv[++i]);
else if (strcmp(argv[i], "-pw") == 0 && i+1 < argc)
password = argv[++i];
+ else if (strcmp(argv[i], "-gui") == 0 && i+1 < argc) {
+ gui_hwnd = argv[++i];
+ gui_mode = 1;
+ } else if (strcmp(argv[i], "-ls") == 0)
+ list = 1;
else if (strcmp(argv[i], "--") == 0)
{ i++; break; }
else
argc -= i;
argv += i;
- if (argc < 2)
- usage();
- if (argc > 2)
- targetshouldbedirectory = 1;
+ if (list) {
+ if (argc != 1)
+ usage();
+ get_dir_list(argc, argv);
- if (colon(argv[argc-1]) != NULL)
- toremote(argc, argv);
- else
- tolocal(argc, argv);
+ } else {
+
+ if (argc < 2)
+ usage();
+ if (argc > 2)
+ targetshouldbedirectory = 1;
+
+ if (colon(argv[argc-1]) != NULL)
+ toremote(argc, argv);
+ else
+ tolocal(argc, argv);
+ }
if (connection_open) {
char ch;
- ssh_send_eof();
- ssh_recv(&ch, 1);
+ ssh_scp_send_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);
+ }
return (errs == 0 ? 0 : 1);
}
projects / u / mdw / putty / blobdiff