* send buffer.
*/
+static int psftp_connect(char *userhost, char *user, int portnumber);
+static void do_sftp_init(void);
+
/* ----------------------------------------------------------------------
* sftp client state.
*/
int sftp_cmd_null(struct sftp_command *cmd)
{
- return 0;
+ return 1; /* success */
}
int sftp_cmd_unknown(struct sftp_command *cmd)
{
printf("psftp: unknown command \"%s\"\n", cmd->words[0]);
- return 0;
+ return 0; /* failure */
}
int sftp_cmd_quit(struct sftp_command *cmd)
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
sfree(cdir);
- return 0;
+ return 1;
}
/*
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
pwd = dir;
printf("Remote directory is now %s\n", pwd);
- return 0;
+ return 1;
}
/*
*/
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;
+ return 1;
}
/*
char *fname, *outfname;
uint64 offset;
FILE *fp;
+ int ret;
+
+ 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");
* FIXME: we can use FXP_FSTAT here to get the file size, and
* thus put up a progress bar.
*/
+ ret = 1;
while (1) {
char buffer[4096];
int len;
break;
if (len == -1) {
printf("error while reading: %s\n", fxp_error());
+ ret = 0;
break;
}
wlen = fwrite(buffer, 1, len - wpos, fp);
if (wlen <= 0) {
printf("error while writing local file\n");
+ ret = 0;
break;
}
wpos += wlen;
}
- if (wpos < len) /* we had an error */
+ if (wpos < len) { /* we had an error */
+ ret = 0;
break;
+ }
offset = uint64_add32(offset, len);
}
fxp_close(fh);
sfree(fname);
- return 0;
+ return ret;
}
int sftp_cmd_get(struct sftp_command *cmd)
{
char *fname, *origoutfname, *outfname;
uint64 offset;
FILE *fp;
+ int ret;
+
+ 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");
* FIXME: we can use FXP_FSTAT here to get the file size, and
* thus put up a progress bar.
*/
+ ret = 1;
while (1) {
char buffer[4096];
int len;
len = fread(buffer, 1, sizeof(buffer), fp);
if (len == -1) {
printf("error while reading local file\n");
+ ret = 0;
break;
} else if (len == 0) {
break;
}
if (!fxp_write(fh, buffer, offset, len)) {
printf("error while writing: %s\n", fxp_error());
+ ret = 0;
break;
}
offset = uint64_add32(offset, len);
fclose(fp);
sfree(outfname);
- return 0;
+ return ret;
}
int sftp_cmd_put(struct sftp_command *cmd)
{
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");
}
sfree(dir);
- return 0;
+ return 1;
}
int sftp_cmd_rmdir(struct sftp_command *cmd)
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");
}
sfree(dir);
- return 0;
+ return 1;
}
int sftp_cmd_rm(struct sftp_command *cmd)
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;
}
sfree(fname);
- return 0;
-
+ return 1;
}
int sftp_cmd_mv(struct sftp_command *cmd)
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;
sfree(srcfname);
sfree(dstfname);
- return 0;
+ return 1;
}
int sftp_cmd_chmod(struct sftp_command *cmd)
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;
printf("%s: %04o -> %04o\n", fname, oldperms, newperms);
sfree(fname);
- return 0;
+ return 1;
+}
+
+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();
+ return 1;
+}
+
+static int sftp_cmd_lcd(struct sftp_command *cmd)
+{
+ char *currdir;
+ int len;
+
+ if (cmd->nwords < 2) {
+ printf("lcd: expects a local directory name\n");
+ return 0;
+ }
+
+ if (!SetCurrentDirectory(cmd->words[1])) {
+ LPVOID message;
+ int i;
+ FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, GetLastError(),
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR)&message, 0, NULL);
+ i = strcspn((char *)message, "\n");
+ printf("lcd: unable to change directory: %.*s\n", i, (LPCTSTR)message);
+ LocalFree(message);
+ return 0;
+ }
+
+ currdir = smalloc(256);
+ len = GetCurrentDirectory(256, currdir);
+ if (len > 256)
+ currdir = srealloc(currdir, len);
+ GetCurrentDirectory(len, currdir);
+ printf("New local directory is %s\n", currdir);
+ sfree(currdir);
+
+ return 1;
+}
+
+static int sftp_cmd_lpwd(struct sftp_command *cmd)
+{
+ char *currdir;
+ int len;
+
+ currdir = smalloc(256);
+ len = GetCurrentDirectory(256, currdir);
+ if (len > 256)
+ currdir = srealloc(currdir, len);
+ GetCurrentDirectory(len, currdir);
+ printf("Current local directory is %s\n", currdir);
+ sfree(currdir);
+
+ return 1;
+}
+
+static int sftp_cmd_pling(struct sftp_command *cmd)
+{
+ int exitcode;
+
+ exitcode = system(cmd->words[1]);
+ return (exitcode == 0);
}
static int sftp_cmd_help(struct sftp_command *cmd);
* `shorthelp' is the name of a primary command, which
* contains the help that should double up for this command.
*/
+ int listed; /* do we list this in primary help? */
char *shorthelp;
char *longhelp;
int (*obey) (struct sftp_command *);
* in ASCII order.
*/
{
- "bye", "finish your SFTP session",
+ "!", TRUE, "run a local Windows command",
+ "<command>\n"
+ " Runs a local Windows command. For example, \"!del myfile\".\n",
+ sftp_cmd_pling
+ },
+ {
+ "bye", TRUE, "finish your SFTP session",
"\n"
" Terminates your SFTP session and quits the PSFTP program.\n",
sftp_cmd_quit
},
{
- "cd", "change your remote working directory",
+ "cd", TRUE, "change your remote working directory",
" [ <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"
sftp_cmd_cd
},
{
- "chmod", "change file permissions and modes",
+ "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"
sftp_cmd_chmod
},
{
- "del", "delete a file",
+ "del", TRUE, "delete a file",
" <filename>\n"
" Delete a file.\n",
sftp_cmd_rm
},
{
- "delete", "delete a file",
- "\n"
- " Delete a file.\n",
- sftp_cmd_rm
+ "delete", FALSE, "del", NULL, sftp_cmd_rm
},
{
- "dir", "list contents of a remote directory",
+ "dir", TRUE, "list contents of a remote directory",
" [ <directory-name> ]\n"
" List the contents of a specified directory on the server.\n"
" If <directory-name> is not given, the current working directory\n"
sftp_cmd_ls
},
{
- "exit", "bye", NULL, sftp_cmd_quit
+ "exit", TRUE, "bye", NULL, sftp_cmd_quit
},
{
- "get", "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"
" 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"
sftp_cmd_get
},
{
- "help", "give help",
+ "help", TRUE, "give help",
" [ <command> [ <command> ... ] ]\n"
" Give general help if no commands are specified.\n"
" If one or more commands are specified, give specific help on\n"
sftp_cmd_help
},
{
- "ls", "dir", NULL,
+ "lcd", TRUE, "change local working directory",
+ " <local-directory-name>\n"
+ " Change the local working directory of the PSFTP program (the\n"
+ " default location where the \"get\" command will save files).\n",
+ sftp_cmd_lcd
+ },
+ {
+ "lpwd", TRUE, "print local working directory",
+ "\n"
+ " Print the local working directory of the PSFTP program (the\n"
+ " default location where the \"get\" command will save files).\n",
+ sftp_cmd_lpwd
+ },
+ {
+ "ls", TRUE, "dir", NULL,
sftp_cmd_ls
},
{
- "mkdir", "create a directory on the remote server",
+ "mkdir", TRUE, "create a directory on the remote server",
" <directory-name>\n"
" Creates a directory with the given name on the server.\n",
sftp_cmd_mkdir
},
{
- "mv", "move or rename a file on the remote server",
+ "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",
sftp_cmd_mv
},
{
- "put", "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"
" 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"
sftp_cmd_put
},
{
- "pwd", "print your remote working directory",
+ "open", TRUE, "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", TRUE, "print your remote working directory",
"\n"
" Print the current remote working directory for your SFTP session.\n",
sftp_cmd_pwd
},
{
- "quit", "bye", NULL,
+ "quit", TRUE, "bye", NULL,
sftp_cmd_quit
},
{
- "reget", "continue downloading a file",
+ "reget", TRUE, "continue downloading a file",
" <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"
sftp_cmd_reget
},
{
- "ren", "mv", NULL,
+ "ren", TRUE, "mv", NULL,
sftp_cmd_mv
},
{
- "rename", "mv", NULL,
+ "rename", FALSE, "mv", NULL,
sftp_cmd_mv
},
{
- "reput", "continue uploading a file",
+ "reput", TRUE, "continue uploading a file",
" <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"
sftp_cmd_reput
},
{
- "rm", "del", NULL,
+ "rm", TRUE, "del", NULL,
sftp_cmd_rm
},
{
- "rmdir", "remove a directory on the remote server",
+ "rmdir", TRUE, "remove a directory on the remote server",
" <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",
int maxlen;
maxlen = 0;
for (i = 0; i < sizeof(sftp_lookup) / sizeof(*sftp_lookup); i++) {
- int len = strlen(sftp_lookup[i].name);
+ int len;
+ if (!sftp_lookup[i].listed)
+ continue;
+ len = strlen(sftp_lookup[i].name);
if (maxlen < len)
maxlen = len;
}
for (i = 0; i < sizeof(sftp_lookup) / sizeof(*sftp_lookup); i++) {
const struct sftp_cmd_lookup *lookup;
+ if (!sftp_lookup[i].listed)
+ continue;
lookup = &sftp_lookup[i];
printf("%-*s", maxlen+2, lookup->name);
if (lookup->longhelp == NULL)
}
}
}
- return 0;
+ return 1;
}
/* ----------------------------------------------------------------------
char *p, *q, *r;
int quoting;
- if ((mode == 0) || (modeflags & 1)) {
- printf("psftp> ");
- }
+ if ((mode == 0) || (modeflags & 1)) {
+ printf("psftp> ");
+ }
fflush(stdout);
cmd = smalloc(sizeof(struct sftp_command));
linesize += 512;
line = srealloc(line, linesize);
ret = fgets(line + linelen, linesize - linelen, fp);
- if (modeflags & 1) {
- printf("%s", ret);
- }
if (!ret || (linelen == 0 && line[0] == '\0')) {
cmd->obey = sftp_cmd_quit;
- printf("quit\n");
+ if ((mode == 0) || (modeflags & 1))
+ printf("quit\n");
return cmd; /* eof */
}
len = linelen + strlen(line + linelen);
break;
}
}
+ if (modeflags & 1) {
+ printf("%s\n", line);
+ }
- /*
- * Parse the command line into words. The syntax is:
- * - double quotes are removed, but cause spaces within to be
- * treated as non-separating.
- * - a double-doublequote pair is a literal double quote, inside
- * _or_ outside quotes. Like this:
- *
- * firstword "second word" "this has ""quotes"" in" sodoes""this""
- *
- * becomes
- *
- * >firstword<
- * >second word<
- * >this has "quotes" in<
- * >sodoes"this"<
- */
p = line;
- while (*p) {
- /* skip whitespace */
- while (*p && (*p == ' ' || *p == '\t'))
- p++;
- /* mark start of word */
- q = r = p; /* q sits at start, r writes word */
- quoting = 0;
+ while (*p && (*p == ' ' || *p == '\t'))
+ p++;
+
+ if (*p == '!') {
+ /*
+ * Special case: the ! command. This is always parsed as
+ * exactly two words: one containing the !, and the second
+ * containing everything else on the line.
+ */
+ cmd->nwords = cmd->wordssize = 2;
+ cmd->words = srealloc(cmd->words, cmd->wordssize * sizeof(char *));
+ cmd->words[0] = "!";
+ cmd->words[1] = p+1;
+ } else {
+
+ /*
+ * Parse the command line into words. The syntax is:
+ * - double quotes are removed, but cause spaces within to be
+ * treated as non-separating.
+ * - a double-doublequote pair is a literal double quote, inside
+ * _or_ outside quotes. Like this:
+ *
+ * firstword "second word" "this has ""quotes"" in" and""this""
+ *
+ * becomes
+ *
+ * >firstword<
+ * >second word<
+ * >this has "quotes" in<
+ * >and"this"<
+ */
while (*p) {
- if (!quoting && (*p == ' ' || *p == '\t'))
- break; /* reached end of word */
- else if (*p == '"' && p[1] == '"')
- p += 2, *r++ = '"'; /* a literal quote */
- else if (*p == '"')
- p++, quoting = !quoting;
- else
- *r++ = *p++;
- }
- if (*p)
- p++; /* skip over the whitespace */
- *r = '\0';
- if (cmd->nwords >= cmd->wordssize) {
- cmd->wordssize = cmd->nwords + 16;
- cmd->words =
- srealloc(cmd->words, cmd->wordssize * sizeof(char *));
+ /* skip whitespace */
+ while (*p && (*p == ' ' || *p == '\t'))
+ p++;
+ /* mark start of word */
+ q = r = p; /* q sits at start, r writes word */
+ quoting = 0;
+ while (*p) {
+ if (!quoting && (*p == ' ' || *p == '\t'))
+ break; /* reached end of word */
+ else if (*p == '"' && p[1] == '"')
+ p += 2, *r++ = '"'; /* a literal quote */
+ else if (*p == '"')
+ p++, quoting = !quoting;
+ else
+ *r++ = *p++;
+ }
+ if (*p)
+ p++; /* skip over the whitespace */
+ *r = '\0';
+ if (cmd->nwords >= cmd->wordssize) {
+ cmd->wordssize = cmd->nwords + 16;
+ cmd->words =
+ srealloc(cmd->words, cmd->wordssize * sizeof(char *));
+ }
+ cmd->words[cmd->nwords++] = q;
}
- cmd->words[cmd->nwords++] = q;
}
/*
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;
+ int ret;
/*
* Batch mode?
* Now we're ready to do Real Stuff.
*/
while (1) {
- struct sftp_command *cmd;
- cmd = sftp_getcmd(stdin, 0, 0);
- if (!cmd)
- break;
- if (cmd->obey(cmd) < 0)
- break;
+ struct sftp_command *cmd;
+ cmd = sftp_getcmd(stdin, 0, 0);
+ if (!cmd)
+ break;
+ if (cmd->obey(cmd) < 0)
+ break;
}
} else {
fp = fopen(batchfile, "r");
cmd = sftp_getcmd(fp, mode, modeflags);
if (!cmd)
break;
- if (cmd->obey(cmd) < 0)
+ ret = cmd->obey(cmd);
+ if (ret < 0)
break;
- if (fxp_error() != NULL) {
+ if (ret == 0) {
if (!(modeflags & 2))
break;
}
}
/*
+ * Ask whether to wipe a session log file before writing to it.
+ * Returns 2 for wipe, 1 for append, 0 for cancel (don't log).
+ */
+int askappend(char *filename)
+{
+ HANDLE hin;
+ DWORD savemode, i;
+
+ static const char msgtemplate[] =
+ "The session log file \"%.*s\" already exists.\n"
+ "You can overwrite it with a new session log,\n"
+ "append your session log to the end of it,\n"
+ "or disable session logging for this session.\n"
+ "Enter \"y\" to wipe the file, \"n\" to append to it,\n"
+ "or just press Return to disable logging.\n"
+ "Wipe the log file? (y/n, Return cancels logging) ";
+
+ char line[32];
+
+ fprintf(stderr, msgtemplate, FILENAME_MAX, filename);
+ fflush(stderr);
+
+ hin = GetStdHandle(STD_INPUT_HANDLE);
+ GetConsoleMode(hin, &savemode);
+ SetConsoleMode(hin, (savemode | ENABLE_ECHO_INPUT |
+ ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT));
+ ReadFile(hin, line, sizeof(line) - 1, &i, NULL);
+ SetConsoleMode(hin, savemode);
+
+ if (line[0] == 'y' || line[0] == 'Y')
+ return 2;
+ else if (line[0] == 'n' || line[0] == 'N')
+ return 1;
+ else
+ return 0;
+}
+
+/*
+ * 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) {
+ modeflags = modeflags | 1;
+ } else if (strcmp(argv[i], "-be") == 0) {
+ 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);
projects / u / mdw / putty / blobdiff