nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-18 03:28:07 -05:00
Code Issues Projects Releases Wiki Activity

Update online help for "-r" and "--" options to get/put commands.

Browse Source 
Use command name in error messages rather than hardcoded "get:"/"put:".

[originally from svn r5002]
This commit is contained in:
Jacob Nevins 2004-12-17 12:15:17 +00:00
parent f4246872c4
commit cf44c428e3
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
psftp.c
View File

@ -1003,14 +1003,14 @@ int sftp_general_get(struct sftp_command *cmd, int restart, int multiple)
} else if (!strcmp(cmd->words[i], "-r")) { } else if (!strcmp(cmd->words[i], "-r")) {
recurse = TRUE; recurse = TRUE;
} else { } else {
printf("get: unrecognised option '%s'\n", cmd->words[i]); printf("%s: unrecognised option '%s'\n", cmd->words[0], cmd->words[i]);
return 0; return 0;
} }
i++; i++;
} }
if (i >= cmd->nwords) { if (i >= cmd->nwords) {
printf("get: expects a filename\n"); printf("%s: expects a filename\n", cmd->words[0]);
return 0; return 0;
} }
@ -1089,14 +1089,14 @@ int sftp_general_put(struct sftp_command *cmd, int restart, int multiple)
} else if (!strcmp(cmd->words[i], "-r")) { } else if (!strcmp(cmd->words[i], "-r")) {
recurse = TRUE; recurse = TRUE;
} else { } else {
printf("put: unrecognised option '%s'\n", cmd->words[i]); printf("%s: unrecognised option '%s'\n", cmd->words[0], cmd->words[i]);
return 0; return 0;
} }
i++; i++;
} }
if (i >= cmd->nwords) { if (i >= cmd->nwords) {
printf("put: expects a filename\n"); printf("%s: expects a filename\n", cmd->words[0]);
return 0; return 0;
} }
@ -1668,10 +1668,12 @@ static struct sftp_cmd_lookup {
}, },
{ {
"dir", TRUE, "list contents of a remote directory", "dir", TRUE, "list contents of a remote directory",
" [ <directory-name> ]\n" " [ <directory-name> ]/[ <wildcard> ]\n"
" List the contents of a specified directory on the server.\n" " List the contents of a specified directory on the server.\n"
" If <directory-name> is not given, the current working directory\n" " If <directory-name> is not given, the current working directory\n"
" will be listed.\n", " is assumed.\n"
" If <wildcard> is given, it is treated as a set of files to\n"
" list; otherwise, all files are listed.\n",
sftp_cmd_ls sftp_cmd_ls
}, },
{ {
@ -1679,10 +1681,11 @@ static struct sftp_cmd_lookup {
}, },
{ {
"get", TRUE, "download a file from the server to your local machine", "get", TRUE, "download a file from the server to your local machine",
" <filename> [ <local-filename> ]\n" " [ -r ] [ -- ] <filename> [ <local-filename> ]\n"
" Downloads a file on the server and stores it locally under\n" " Downloads a file on the server and stores it locally under\n"
" the same name, or under a different one if you supply the\n" " the same name, or under a different one if you supply the\n"
" argument <local-filename>.\n", " argument <local-filename>.\n"
" If -r specified, recursively fetch a directory.\n",
sftp_cmd_get sftp_cmd_get
}, },
{ {
@ -1713,10 +1716,11 @@ static struct sftp_cmd_lookup {
}, },
{ {
"mget", TRUE, "download multiple files at once", "mget", TRUE, "download multiple files at once",
" <filename-or-wildcard> [ <filename-or-wildcard>... ]\n" " [ -r ] [ -- ] <filename-or-wildcard> [ <filename-or-wildcard>... ]\n"
" Downloads many files from the server, storing each one under\n" " Downloads many files from the server, storing each one under\n"
" the same name it has on the server side. You can use wildcards\n" " the same name it has on the server side. You can use wildcards\n"
" such as \"*.c\" to specify lots of files at once.\n", " such as \"*.c\" to specify lots of files at once.\n"
" If -r specified, recursively fetch files and directories.\n",
sftp_cmd_mget sftp_cmd_mget
}, },
{ {
@ -1730,7 +1734,8 @@ static struct sftp_cmd_lookup {
" <filename-or-wildcard> [ <filename-or-wildcard>... ]\n" " <filename-or-wildcard> [ <filename-or-wildcard>... ]\n"
" Uploads many files to the server, storing each one under the\n" " Uploads many files to the server, storing each one under the\n"
" same name it has on the client side. You can use wildcards\n" " same name it has on the client side. You can use wildcards\n"
" such as \"*.c\" to specify lots of files at once.\n", " such as \"*.c\" to specify lots of files at once.\n"
" If -r specified, recursively store files and directories.\n",
sftp_cmd_mput sftp_cmd_mput
}, },
{ {
@ -1750,10 +1755,11 @@ static struct sftp_cmd_lookup {
}, },
{ {
"put", TRUE, "upload a file from your local machine to the server", "put", TRUE, "upload a file from your local machine to the server",
" <filename> [ <remote-filename> ]\n" " [ -r ] [ -- ] <filename> [ <remote-filename> ]\n"
" Uploads a file to the server and stores it there under\n" " Uploads a file to the server and stores it there under\n"
" the same name, or under a different one if you supply the\n" " the same name, or under a different one if you supply the\n"
" argument <remote-filename>.\n", " argument <remote-filename>.\n"
" If -r specified, recursively store a directory.\n",
sftp_cmd_put sftp_cmd_put
}, },
{ {
@ -1768,10 +1774,11 @@ static struct sftp_cmd_lookup {
}, },
{ {
"reget", TRUE, "continue downloading a file", "reget", TRUE, "continue downloading a file",
" <filename> [ <local-filename> ]\n" " [ -r ] [ -- ] <filename> [ <local-filename> ]\n"
" Works exactly like the \"get\" command, but the local file\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" " must already exist. The download will begin at the end of the\n"
" file. This is for resuming a download that was interrupted.\n", " file. This is for resuming a download that was interrupted.\n"
" If -r specified, resume interrupted \"get -r\".\n",
sftp_cmd_reget sftp_cmd_reget
}, },
{ {
@ -1784,10 +1791,11 @@ static struct sftp_cmd_lookup {
}, },
{ {
"reput", TRUE, "continue uploading a file", "reput", TRUE, "continue uploading a file",
" <filename> [ <remote-filename> ]\n" " [ -r ] [ -- ] <filename> [ <remote-filename> ]\n"
" Works exactly like the \"put\" command, but the remote file\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" " must already exist. The upload will begin at the end of the\n"
" file. This is for resuming an upload that was interrupted.\n", " file. This is for resuming an upload that was interrupted.\n"
" If -r specified, resume interrupted \"put -r\".\n",
sftp_cmd_reput sftp_cmd_reput
}, },
{ {