* send buffer.
*/
+static int psftp_connect(char *userhost, char *user, int portnumber);
+static void do_sftp_init(void);
+
/* ----------------------------------------------------------------------
* sftp client state.
*/
}
}
+/*
+ * Return a pointer to the portion of str that comes after the last
+ * slash (or backslash or colon, if `local' is TRUE).
+ */
+static char *stripslashes(char *str, int local)
+{
+ char *p;
+
+ if (local) {
+ p = strchr(str, ':');
+ if (p) str = p+1;
+ }
+
+ p = strrchr(str, '/');
+ if (p) str = p+1;
+
+ if (local) {
+ p = strrchr(str, '\\');
+ if (p) str = p+1;
+ }
+
+ return str;
+}
+
/* ----------------------------------------------------------------------
* Actual sftp commands.
*/
char *dir, *cdir;
int i;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 2)
dir = ".";
else
struct fxp_handle *dirh;
char *dir;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 2)
dir = dupstr(homedir);
else
*/
int sftp_cmd_pwd(struct sftp_command *cmd)
{
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
printf("Remote directory is %s\n", pwd);
return 0;
}
uint64 offset;
FILE *fp;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 2) {
printf("get: expects a filename\n");
return 0;
printf("%s: %s\n", cmd->words[1], fxp_error());
return 0;
}
- outfname = (cmd->nwords == 2 ? cmd->words[1] : cmd->words[2]);
+ outfname = (cmd->nwords == 2 ?
+ stripslashes(cmd->words[1], 0) : cmd->words[2]);
fh = fxp_open(fname, SSH_FXF_READ);
if (!fh) {
uint64 offset;
FILE *fp;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 2) {
printf("put: expects a filename\n");
return 0;
}
fname = cmd->words[1];
- origoutfname = (cmd->nwords == 2 ? cmd->words[1] : cmd->words[2]);
+ origoutfname = (cmd->nwords == 2 ?
+ stripslashes(cmd->words[1], 1) : cmd->words[2]);
outfname = canonify(origoutfname);
if (!outfname) {
printf("%s: %s\n", origoutfname, fxp_error());
char *dir;
int result;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
if (cmd->nwords < 2) {
printf("mkdir: expects a directory\n");
char *dir;
int result;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
if (cmd->nwords < 2) {
printf("rmdir: expects a directory\n");
char *fname;
int result;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 2) {
printf("rm: expects a filename\n");
return 0;
char *srcfname, *dstfname;
int result;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 3) {
printf("mv: expects two filenames\n");
return 0;
struct fxp_attrs attrs;
unsigned attrs_clr, attrs_xor, oldperms, newperms;
+ if (back == NULL) {
+ printf("psftp: not connected to a host; use \"open host.name\"\n");
+ return 0;
+ }
+
if (cmd->nwords < 3) {
printf("chmod: expects a mode specifier and a filename\n");
return 0;
return 0;
}
+static int sftp_cmd_open(struct sftp_command *cmd)
+{
+ if (back != NULL) {
+ printf("psftp: already connected\n");
+ return 0;
+ }
+
+ if (cmd->nwords < 2) {
+ printf("open: expects a host name\n");
+ return 0;
+ }
+
+ if (psftp_connect(cmd->words[1], NULL, 0)) {
+ back = NULL; /* connection is already closed */
+ return -1; /* this is fatal */
+ }
+ do_sftp_init();
+}
+
static int sftp_cmd_help(struct sftp_command *cmd);
static struct sftp_cmd_lookup {
sftp_cmd_put
},
{
+ "open", "connect to a host",
+ " [<user>@]<hostname>\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",
+ sftp_cmd_open
+ },
+ {
"pwd", "print your remote working directory",
"\n"
" Print the current remote working directory for your SFTP session.\n",
return cmd;
}
-void do_sftp(int mode, int modeflags, char *batchfile)
+static void do_sftp_init(void)
{
- FILE *fp;
-
/*
* Do protocol initialisation.
*/
printf("Remote working directory is %s\n", homedir);
}
pwd = dupstr(homedir);
+}
+
+void do_sftp(int mode, int modeflags, char *batchfile)
+{
+ FILE *fp;
/*
* Batch mode?
}
/*
+ * Warn about the obsolescent key file format.
+ */
+void old_keyfile_warning(void)
+{
+ static const char message[] =
+ "You are loading an SSH 2 private key which has an\n"
+ "old version of the file format. This means your key\n"
+ "file is not fully tamperproof. Future versions of\n"
+ "PuTTY may stop supporting this private key format,\n"
+ "so we recommend you convert your key to the new\n"
+ "format.\n"
+ "\n"
+ "Once the key is loaded into PuTTYgen, you can perform\n"
+ "this conversion simply by saving it again.\n";
+
+ fputs(message, stderr);
+}
+
+/*
* Print an error message and perform a fatal exit.
*/
void fatalbox(char *fmt, ...)
vsprintf(str + strlen(str), fmt, ap);
va_end(ap);
strcat(str, "\n");
- fprintf(stderr, str);
+ fputs(stderr, str);
exit(1);
}
vsprintf(str + strlen(str), fmt, ap);
va_end(ap);
strcat(str, "\n");
- fprintf(stderr, str);
+ fputs(stderr, str);
exit(1);
}
{
}
-void ldisc_send(char *buf, int len)
+void ldisc_send(char *buf, int len, int interactive)
{
/*
* This is only here because of the calls to ldisc_send(NULL,
}
/*
- * Main program. Parse arguments etc.
+ * Connect to a host.
*/
-int main(int argc, char *argv[])
+static int psftp_connect(char *userhost, char *user, int portnumber)
{
- int i;
- int portnumber = 0;
- char *user, *host, *userhost, *realhost;
+ char *host, *realhost;
char *err;
- int mode = 0;
- int modeflags = 0;
- char *batchfile = NULL;
-
- flags = FLAG_STDERR | FLAG_INTERACTIVE;
- ssh_get_line = &get_line;
- init_winsock();
- sk_init();
-
- userhost = user = NULL;
-
- for (i = 1; i < argc; i++) {
- if (argv[i][0] != '-') {
- if (userhost)
- usage();
- else
- userhost = dupstr(argv[i]);
- } else if (strcmp(argv[i], "-v") == 0) {
- verbose = 1, flags |= FLAG_VERBOSE;
- } else if (strcmp(argv[i], "-h") == 0 ||
- strcmp(argv[i], "-?") == 0) {
- usage();
- } else if (strcmp(argv[i], "-l") == 0 && i + 1 < argc) {
- user = argv[++i];
- } else if (strcmp(argv[i], "-P") == 0 && i + 1 < argc) {
- portnumber = atoi(argv[++i]);
- } else if (strcmp(argv[i], "-pw") == 0 && i + 1 < argc) {
- password = argv[++i];
- } else if (strcmp(argv[i], "-b") == 0 && i + 1 < argc) {
- mode = 1;
- batchfile = argv[++i];
- } else if (strcmp(argv[i], "-bc") == 0 && i + 1 < argc) {
- modeflags = modeflags | 1;
- } else if (strcmp(argv[i], "-be") == 0 && i + 1 < argc) {
- modeflags = modeflags | 2;
- } else if (strcmp(argv[i], "--") == 0) {
- i++;
- break;
- } else {
- usage();
- }
- }
- argc -= i;
- argv += i;
- back = NULL;
-
- if (argc > 0 || !userhost)
- usage();
/* Separate host and username */
host = userhost;
cfg.port = 22;
}
+ /*
+ * Trim leading whitespace off the hostname if it's there.
+ */
+ {
+ int space = strspn(cfg.host, " \t");
+ memmove(cfg.host, cfg.host+space, 1+strlen(cfg.host)-space);
+ }
+
+ /* See if host is of the form user@host */
+ if (cfg.host[0] != '\0') {
+ char *atsign = strchr(cfg.host, '@');
+ /* Make sure we're not overflowing the user field */
+ if (atsign) {
+ if (atsign - cfg.host < sizeof cfg.username) {
+ strncpy(cfg.username, cfg.host, atsign - cfg.host);
+ cfg.username[atsign - cfg.host] = '\0';
+ }
+ memmove(cfg.host, atsign + 1, 1 + strlen(atsign + 1));
+ }
+ }
+
+ /*
+ * Trim a colon suffix off the hostname if it's there.
+ */
+ cfg.host[strcspn(cfg.host, ":")] = '\0';
+
/* Set username */
if (user != NULL && user[0] != '\0') {
strncpy(cfg.username, user, sizeof(cfg.username) - 1);
back = &ssh_backend;
- err = back->init(cfg.host, cfg.port, &realhost);
+ err = back->init(cfg.host, cfg.port, &realhost, 0);
if (err != NULL) {
- fprintf(stderr, "ssh_init: %s", err);
+ fprintf(stderr, "ssh_init: %s\n", err);
return 1;
}
ssh_sftp_init();
if (verbose && realhost != NULL)
printf("Connected to %s\n", realhost);
+ return 0;
+}
+
+/*
+ * Main program. Parse arguments etc.
+ */
+int main(int argc, char *argv[])
+{
+ int i;
+ int portnumber = 0;
+ char *userhost, *user;
+ int mode = 0;
+ int modeflags = 0;
+ char *batchfile = NULL;
+
+ flags = FLAG_STDERR | FLAG_INTERACTIVE;
+ ssh_get_line = &get_line;
+ init_winsock();
+ sk_init();
+
+ userhost = user = NULL;
+
+ for (i = 1; i < argc; i++) {
+ if (argv[i][0] != '-') {
+ if (userhost)
+ usage();
+ else
+ userhost = dupstr(argv[i]);
+ } else if (strcmp(argv[i], "-v") == 0) {
+ verbose = 1, flags |= FLAG_VERBOSE;
+ } else if (strcmp(argv[i], "-h") == 0 ||
+ strcmp(argv[i], "-?") == 0) {
+ usage();
+ } else if (strcmp(argv[i], "-l") == 0 && i + 1 < argc) {
+ user = argv[++i];
+ } else if (strcmp(argv[i], "-P") == 0 && i + 1 < argc) {
+ portnumber = atoi(argv[++i]);
+ } else if (strcmp(argv[i], "-pw") == 0 && i + 1 < argc) {
+ password = argv[++i];
+ } else if (strcmp(argv[i], "-b") == 0 && i + 1 < argc) {
+ mode = 1;
+ batchfile = argv[++i];
+ } else if (strcmp(argv[i], "-bc") == 0 && i + 1 < argc) {
+ modeflags = modeflags | 1;
+ } else if (strcmp(argv[i], "-be") == 0 && i + 1 < argc) {
+ modeflags = modeflags | 2;
+ } else if (strcmp(argv[i], "--") == 0) {
+ i++;
+ break;
+ } else {
+ usage();
+ }
+ }
+ argc -= i;
+ argv += i;
+ back = NULL;
+
+ /*
+ * If a user@host string has already been provided, connect to
+ * it now.
+ */
+ if (userhost) {
+ if (psftp_connect(userhost, user, portnumber))
+ return 1;
+ do_sftp_init();
+ } else {
+ printf("psftp: no hostname specified; use \"open host.name\""
+ " to connect\n");
+ }
do_sftp(mode, modeflags, batchfile);