X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/486543a109b8b1ae0a893d3e96711de97c81a96c..297d398b09441e5cbfee439d4bbc772a2807d848:/scp.c

diff --git a/scp.c b/scp.c
index f359c6e8..8f70a53f 100644
--- a/scp.c
+++ b/scp.c
@@ -178,7 +178,7 @@ static void print_stats(char *name, unsigned long size, unsigned long done,
 
 /*
  *  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)
 {
@@ -270,7 +270,7 @@ static void source(char *src)
     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;
     }
@@ -425,7 +425,7 @@ static void sink(char *targ)
     char namebuf[2048];
     char ch;
     int targisdir = 0;
-    int settime = 0;
+    int settime;
     int exists;
     DWORD attr;
     HANDLE f;
@@ -438,7 +438,7 @@ static void sink(char *targ)
     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)
@@ -498,7 +498,7 @@ static void sink(char *targ)
 	    strcpy(namebuf, targ);
 	}
 	attr = GetFileAttributes(namebuf);
-	exists = (attr != -1);
+	exists = (attr != (DWORD)-1);
 
 	if (buf[0] == 'D') {
 	    if (exists && (attr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
@@ -540,7 +540,7 @@ static void sink(char *targ)
 
 	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)
 		bump("Lost connection");
@@ -592,7 +592,7 @@ static void toremote(int argc, char *argv[])
 
     targ = argv[argc-1];
 
-    /* Seperate host from filename */
+    /* Separate host from filename */
     host = targ;
     targ = colon(targ);
     if (targ == NULL)
@@ -602,7 +602,7 @@ static void toremote(int argc, char *argv[])
 	targ = ".";
     /* Substitute "." for emtpy target */
 
-    /* Seperate host and username */
+    /* Separate host and username */
     user = host;
     host = strrchr(host, '@');
     if (host == NULL) {
@@ -694,7 +694,7 @@ static void tolocal(int argc, char *argv[])
     src = argv[0];
     targ = argv[1];
 
-    /* Seperate host from filename */
+    /* Separate host from filename */
     host = src;
     src = colon(src);
     if (src == NULL)
@@ -704,7 +704,7 @@ static void tolocal(int argc, char *argv[])
 	src = ".";
     /* Substitute "." for empty filename */
 
-    /* Seperate username and hostname */
+    /* Separate username and hostname */
     user = host;
     host = strrchr(host, '@');
     if (host == NULL) {
@@ -730,9 +730,62 @@ static void tolocal(int argc, char *argv[])
 }
 
 /*
+ *  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_recv(&c, 1) > 0)
+	fputc(c, stdout);	       /* thank heavens for buffered I/O */
+}
+
+/*
  *  Initialize the Win$ock driver.
  */
-static void init_winsock()
+static void init_winsock(void)
 {
     WORD winsock_ver;
     WSADATA wsadata;
@@ -748,12 +801,13 @@ static void init_winsock()
 /*
  *  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");
@@ -770,6 +824,7 @@ static void usage()
 int main(int argc, char *argv[])
 {
     int i;
+    int list = 0;
 
     init_winsock();
 
@@ -791,6 +846,8 @@ int main(int argc, char *argv[])
 	    portnumber = atoi(argv[++i]);
 	else if (strcmp(argv[i], "-pw") == 0 && i+1 < argc)
 	    password = argv[++i];
+	else if (strcmp(argv[i], "-ls") == 0)
+	    list = 1;
 	else if (strcmp(argv[i], "--") == 0)
 	{ i++; break; }
 	else
@@ -799,15 +856,23 @@ int main(int argc, char *argv[])
     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;