X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/83567e4316d605a55fa987ae535de96cb8203806..77603464f5b4231df69eb20ca278062bd7aae9fb:/psftp.c

diff --git a/psftp.c b/psftp.c
index 508ab8cd..4678c97a 100644
--- a/psftp.c
+++ b/psftp.c
@@ -189,6 +189,11 @@ static int bare_name_compare(const void *av, const void *bv)
     return strcmp(*a, *b);
 }
 
+static void not_connected(void)
+{
+    printf("psftp: not connected to a host; use \"open host.name\"\n");
+}
+
 /* ----------------------------------------------------------------------
  * The meat of the `get' and `put' commands.
  */
@@ -936,7 +941,7 @@ int sftp_cmd_quit(struct sftp_command *cmd)
 int sftp_cmd_close(struct sftp_command *cmd)
 {
     if (back == NULL) {
-	printf("psftp: not connected to a host; use \"open host.name\"\n");
+	not_connected();
 	return 0;
     }
 
@@ -966,7 +971,7 @@ int sftp_cmd_ls(struct sftp_command *cmd)
     int i;
 
     if (back == NULL) {
-	printf("psftp: not connected to a host; use \"open host.name\"\n");
+	not_connected();
 	return 0;
     }
 
@@ -1088,7 +1093,7 @@ int sftp_cmd_cd(struct sftp_command *cmd)
     char *dir;
 
     if (back == NULL) {
-	printf("psftp: not connected to a host; use \"open host.name\"\n");
+	not_connected();
 	return 0;
     }
 
@@ -1131,7 +1136,7 @@ int sftp_cmd_cd(struct sftp_command *cmd)
 int sftp_cmd_pwd(struct sftp_command *cmd)
 {
     if (back == NULL) {
-	printf("psftp: not connected to a host; use \"open host.name\"\n");
+	not_connected();
 	return 0;
     }
 
@@ -1155,7 +1160,7 @@ int sftp_general_get(struct sftp_command *cmd, int restart, int multiple)
     int recurse = FALSE;
 
     if (back == NULL) {
-	printf("psftp: not connected to a host; use \"open host.name\"\n");
+	not_connected();
 	return 0;
     }
 
@@ -1269,7 +1274,7 @@ int sftp_general_put(struct sftp_command *cmd, int restart, int multiple)
     int recurse = FALSE;
 
     if (back == NULL) {
-	printf("psftp: not connected to a host; use \"open host.name\"\n");
+	not_connected();
 	return 0;
     }
 
@@ -1370,7 +1375,7 @@ int sftp_cmd_mkdir(struct sftp_command *cmd)
     int i, ret;
 
     if (back == NULL) {
-	printf("psftp: not connected to a host; use \"open host.name\"\n");
+	not_connected();
 	return 0;
     }
 
@@ -1396,7 +1401,8 @@ int sftp_cmd_mkdir(struct sftp_command *cmd)
 	    printf("mkdir %s: %s\n", dir, fxp_error());
 	    sfree(dir);
 	    ret = 0;
-	}
+	} else
+	    printf("mkdir %s: OK\n", dir);
 
 	sfree(dir);
     }
@@ -1420,6 +1426,8 @@ static int sftp_action_rmdir(void *vctx, char *dir)
 	return 0;
     }
 
+    printf("rmdir %s: OK\n", dir);
+
     return 1;
 }
 
@@ -1428,7 +1436,7 @@ int sftp_cmd_rmdir(struct sftp_command *cmd)
     int i, ret;
 
     if (back == NULL) {
-	printf("psftp: not connected to a host; use \"open host.name\"\n");
+	not_connected();
 	return 0;
     }
 
@@ -1457,10 +1465,11 @@ static int sftp_action_rm(void *vctx, char *fname)
 
     if (!result) {
 	printf("rm %s: %s\n", fname, fxp_error());
-	sfree(fname);
 	return 0;
     }
 
+    printf("rm %s: OK\n", fname);
+
     return 1;
 }
 
@@ -1469,7 +1478,7 @@ int sftp_cmd_rm(struct sftp_command *cmd)
     int i, ret;
 
     if (back == NULL) {
-	printf("psftp: not connected to a host; use \"open host.name\"\n");
+	not_connected();
 	return 0;
     }
 
@@ -1564,7 +1573,7 @@ int sftp_cmd_mv(struct sftp_command *cmd)
     int i, ret;
 
     if (back == NULL) {
-	printf("psftp: not connected to a host; use \"open host.name\"\n");
+	not_connected();
 	return 0;
     }
 
@@ -1588,6 +1597,7 @@ int sftp_cmd_mv(struct sftp_command *cmd)
     if ((cmd->nwords > 3 || is_wildcard(cmd->words[1])) && !ctx->dest_is_dir) {
 	printf("mv: multiple or wildcard arguments require the destination"
 	       " to be a directory\n");
+	sfree(ctx->dstfname);
 	return 0;
     }
 
@@ -1598,6 +1608,7 @@ int sftp_cmd_mv(struct sftp_command *cmd)
     for (i = 1; i < cmd->nwords-1; i++)
 	ret &= wildcard_iterate(cmd->words[i], sftp_action_mv, ctx);
 
+    sfree(ctx->dstfname);
     return ret;
 }
 
@@ -1622,7 +1633,6 @@ static int sftp_action_chmod(void *vctx, char *fname)
     if (!result || !(attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS)) {
 	printf("get attrs for %s: %s\n", fname,
 	       result ? "file permissions not provided" : fxp_error());
-	sfree(fname);
 	return 0;
     }
 
@@ -1642,7 +1652,6 @@ static int sftp_action_chmod(void *vctx, char *fname)
 
     if (!result) {
 	printf("set attrs for %s: %s\n", fname, fxp_error());
-	sfree(fname);
 	return 0;
     }
 
@@ -1658,7 +1667,7 @@ int sftp_cmd_chmod(struct sftp_command *cmd)
     struct sftp_context_chmod actx, *ctx = &actx;
 
     if (back == NULL) {
-	printf("psftp: not connected to a host; use \"open host.name\"\n");
+	not_connected();
 	return 0;
     }
 
@@ -1892,7 +1901,7 @@ static struct sftp_cmd_lookup {
     },
     {
 	"cd", TRUE, "change your remote working directory",
-	    " [ <New working directory> ]\n"
+	    " [ <new working directory> ]\n"
 	    "  Change the remote working directory for your SFTP session.\n"
 	    "  If a new working directory is not supplied, you will be\n"
 	    "  returned to your home directory.\n",
@@ -1900,10 +1909,11 @@ static struct sftp_cmd_lookup {
     },
     {
 	"chmod", TRUE, "change file permissions and modes",
-	    " ( <octal-digits> | <modifiers> ) <filename>\n"
-	    "  Change the file permissions on a file or directory.\n"
-	    "  <octal-digits> can be any octal Unix permission specifier.\n"
-	    "  Alternatively, <modifiers> can include:\n"
+	    " <modes> <filename-or-wildcard> [ <filename-or-wildcard>... ]\n"
+	    "  Change the file permissions on one or more remote files or\n"
+	    "  directories.\n"
+	    "  <modes> can be any octal Unix permission specifier.\n"
+	    "  Alternatively, <modes> can include the following modifiers:\n"
 	    "    u+r     make file readable by owning user\n"
 	    "    u+w     make file writable by owning user\n"
 	    "    u+x     make file executable by owning user\n"
@@ -1934,16 +1944,16 @@ static struct sftp_cmd_lookup {
 	    sftp_cmd_close
     },
     {
-	"del", TRUE, "delete a file",
-	    " <filename>\n"
-	    "  Delete a file.\n",
+	"del", TRUE, "delete files on the remote server",
+	    " <filename-or-wildcard> [ <filename-or-wildcard>... ]\n"
+	    "  Delete a file or files from the server.\n",
 	    sftp_cmd_rm
     },
     {
 	"delete", FALSE, "del", NULL, sftp_cmd_rm
     },
     {
-	"dir", TRUE, "list contents of a remote directory",
+	"dir", TRUE, "list remote files",
 	    " [ <directory-name> ]/[ <wildcard> ]\n"
 	    "  List the contents of a specified directory on the server.\n"
 	    "  If <directory-name> is not given, the current working directory\n"
@@ -2000,9 +2010,9 @@ static struct sftp_cmd_lookup {
 	    sftp_cmd_mget
     },
     {
-	"mkdir", TRUE, "create a directory on the remote server",
-	    " <directory-name>\n"
-	    "  Creates a directory with the given name on the server.\n",
+	"mkdir", TRUE, "create directories on the remote server",
+	    " <directory-name> [ <directory-name>... ]\n"
+	    "  Creates directories with the given names on the server.\n",
 	    sftp_cmd_mkdir
     },
     {
@@ -2015,18 +2025,22 @@ static struct sftp_cmd_lookup {
 	    sftp_cmd_mput
     },
     {
-	"mv", TRUE, "move or rename a file on the remote server",
-	    " <source-filename> <destination-filename>\n"
-	    "  Moves or renames the file <source-filename> on the server,\n"
-	    "  so that it is accessible under the name <destination-filename>.\n",
+	"mv", TRUE, "move or rename file(s) on the remote server",
+	    " <source> [ <source>... ] <destination>\n"
+	    "  Moves or renames <source>(s) on the server to <destination>,\n"
+	    "  also on the server.\n"
+	    "  If <destination> specifies an existing directory, then <source>\n"
+	    "  may be a wildcard, and multiple <source>s may be given; all\n"
+	    "  source files are moved into <destination>.\n"
+	    "  Otherwise, <source> must specify a single file, which is moved\n"
+	    "  or renamed so that it is accessible under the name <destination>.\n",
 	    sftp_cmd_mv
     },
     {
 	"open", TRUE, "connect to a host",
 	    " [<user>@]<hostname> [<port>]\n"
 	    "  Establishes an SFTP connection to a given host. Only usable\n"
-	    "  when you did not already specify a host name on the command\n"
-	    "  line.\n",
+	    "  when you are not already connected to a server.\n",
 	    sftp_cmd_open
     },
     {
@@ -2049,7 +2063,7 @@ static struct sftp_cmd_lookup {
 	    sftp_cmd_quit
     },
     {
-	"reget", TRUE, "continue downloading a file",
+	"reget", TRUE, "continue downloading files",
 	    " [ -r ] [ -- ] <filename> [ <local-filename> ]\n"
 	    "  Works exactly like the \"get\" command, but the local file\n"
 	    "  must already exist. The download will begin at the end of the\n"
@@ -2066,7 +2080,7 @@ static struct sftp_cmd_lookup {
 	    sftp_cmd_mv
     },
     {
-	"reput", TRUE, "continue uploading a file",
+	"reput", TRUE, "continue uploading files",
 	    " [ -r ] [ -- ] <filename> [ <remote-filename> ]\n"
 	    "  Works exactly like the \"put\" command, but the remote file\n"
 	    "  must already exist. The upload will begin at the end of the\n"
@@ -2079,10 +2093,11 @@ static struct sftp_cmd_lookup {
 	    sftp_cmd_rm
     },
     {
-	"rmdir", TRUE, "remove a directory on the remote server",
-	    " <directory-name>\n"
+	"rmdir", TRUE, "remove directories on the remote server",
+	    " <directory-name> [ <directory-name>... ]\n"
 	    "  Removes the directory with the given name on the server.\n"
-	    "  The directory will not be removed unless it is empty.\n",
+	    "  The directory will not be removed unless it is empty.\n"
+	    "  Wildcards may be used to specify multiple directories.\n",
 	    sftp_cmd_rmdir
     }
 };