X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/2184a5d91ffbcf2de2f730c83dda2d9443035f50..3af9746312c67c3d5d4c4aac7e60ab4bec80ae5d:/psftp.c diff --git a/psftp.c b/psftp.c index 250a5fcc..ba740cea 100644 --- a/psftp.c +++ b/psftp.c @@ -24,6 +24,9 @@ * send buffer. */ +static int psftp_connect(char *userhost, char *user, int portnumber); +static void do_sftp_init(void); + /* ---------------------------------------------------------------------- * sftp client state. */ @@ -165,13 +168,13 @@ struct sftp_command { 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) @@ -198,6 +201,11 @@ int sftp_cmd_ls(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 @@ -261,7 +269,7 @@ int sftp_cmd_ls(struct sftp_command *cmd) sfree(cdir); - return 0; + return 1; } /* @@ -273,6 +281,11 @@ int sftp_cmd_cd(struct sftp_command *cmd) 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 @@ -296,7 +309,7 @@ int sftp_cmd_cd(struct sftp_command *cmd) pwd = dir; printf("Remote directory is now %s\n", pwd); - return 0; + return 1; } /* @@ -304,8 +317,13 @@ 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"); + return 0; + } + printf("Remote directory is %s\n", pwd); - return 0; + return 1; } /* @@ -320,6 +338,12 @@ int sftp_general_get(struct sftp_command *cmd, int restart) 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"); @@ -370,6 +394,7 @@ int sftp_general_get(struct sftp_command *cmd, int restart) * 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; @@ -380,6 +405,7 @@ int sftp_general_get(struct sftp_command *cmd, int restart) break; if (len == -1) { printf("error while reading: %s\n", fxp_error()); + ret = 0; break; } @@ -388,12 +414,15 @@ int sftp_general_get(struct sftp_command *cmd, int restart) 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); } @@ -401,7 +430,7 @@ int sftp_general_get(struct sftp_command *cmd, int restart) fxp_close(fh); sfree(fname); - return 0; + return ret; } int sftp_cmd_get(struct sftp_command *cmd) { @@ -424,6 +453,12 @@ int sftp_general_put(struct sftp_command *cmd, int restart) 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"); @@ -491,6 +526,7 @@ int sftp_general_put(struct sftp_command *cmd, int restart) * 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; @@ -498,12 +534,14 @@ int sftp_general_put(struct sftp_command *cmd, int restart) 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); @@ -513,7 +551,7 @@ int sftp_general_put(struct sftp_command *cmd, int restart) fclose(fp); sfree(outfname); - return 0; + return ret; } int sftp_cmd_put(struct sftp_command *cmd) { @@ -529,6 +567,10 @@ int sftp_cmd_mkdir(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"); @@ -549,7 +591,7 @@ int sftp_cmd_mkdir(struct sftp_command *cmd) } sfree(dir); - return 0; + return 1; } int sftp_cmd_rmdir(struct sftp_command *cmd) @@ -557,6 +599,10 @@ 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"); @@ -577,7 +623,7 @@ int sftp_cmd_rmdir(struct sftp_command *cmd) } sfree(dir); - return 0; + return 1; } int sftp_cmd_rm(struct sftp_command *cmd) @@ -585,6 +631,11 @@ 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; @@ -604,8 +655,7 @@ int sftp_cmd_rm(struct sftp_command *cmd) } sfree(fname); - return 0; - + return 1; } int sftp_cmd_mv(struct sftp_command *cmd) @@ -613,6 +663,11 @@ 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; @@ -670,7 +725,7 @@ int sftp_cmd_mv(struct sftp_command *cmd) sfree(srcfname); sfree(dstfname); - return 0; + return 1; } int sftp_cmd_chmod(struct sftp_command *cmd) @@ -680,6 +735,11 @@ 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; @@ -821,7 +881,87 @@ int sftp_cmd_chmod(struct sftp_command *cmd) 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); @@ -840,6 +980,7 @@ static struct sftp_cmd_lookup { * `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 *); @@ -849,13 +990,19 @@ static struct sftp_cmd_lookup { * in ASCII order. */ { - "bye", "finish your SFTP session", + "!", TRUE, "run a local Windows 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", " [ ]\n" " Change the remote working directory for your SFTP session.\n" " If a new working directory is not supplied, you will be\n" @@ -863,7 +1010,7 @@ static struct sftp_cmd_lookup { sftp_cmd_cd }, { - "chmod", "change file permissions and modes", + "chmod", TRUE, "change file permissions and modes", " ( | ) \n" " Change the file permissions on a file or directory.\n" " can be any octal Unix permission specifier.\n" @@ -890,19 +1037,16 @@ static struct sftp_cmd_lookup { sftp_cmd_chmod }, { - "del", "delete a file", + "del", TRUE, "delete a file", " \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", " [ ]\n" " List the contents of a specified directory on the server.\n" " If is not given, the current working directory\n" @@ -910,10 +1054,10 @@ static struct sftp_cmd_lookup { 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", " [ ]\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" @@ -921,7 +1065,7 @@ static struct sftp_cmd_lookup { sftp_cmd_get }, { - "help", "give help", + "help", TRUE, "give help", " [ [ ... ] ]\n" " Give general help if no commands are specified.\n" " If one or more commands are specified, give specific help on\n" @@ -929,24 +1073,38 @@ static struct sftp_cmd_lookup { sftp_cmd_help }, { - "ls", "dir", NULL, + "lcd", TRUE, "change local working directory", + " \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", " \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", " \n" " Moves or renames the file on the server,\n" " so that it is accessible under the name .\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", " [ ]\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" @@ -954,17 +1112,25 @@ static struct sftp_cmd_lookup { sftp_cmd_put }, { - "pwd", "print your remote working directory", + "open", TRUE, "connect to a host", + " [@]\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", " [ ]\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" @@ -972,15 +1138,15 @@ static struct sftp_cmd_lookup { 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", " [ ]\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" @@ -988,11 +1154,11 @@ static struct sftp_cmd_lookup { 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", " \n" " Removes the directory with the given name on the server.\n" " The directory will not be removed unless it is empty.\n", @@ -1030,12 +1196,17 @@ static int sftp_cmd_help(struct sftp_command *cmd) 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) @@ -1059,7 +1230,7 @@ static int sftp_cmd_help(struct sftp_command *cmd) } } } - return 0; + return 1; } /* ---------------------------------------------------------------------- @@ -1073,9 +1244,9 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags) 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)); @@ -1092,13 +1263,11 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags) 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); @@ -1109,50 +1278,69 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags) 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; } /* @@ -1173,10 +1361,8 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags) return cmd; } -void do_sftp(int mode, int modeflags, char *batchfile) +static void do_sftp_init(void) { - FILE *fp; - /* * Do protocol initialisation. */ @@ -1199,6 +1385,12 @@ void do_sftp(int mode, int modeflags, char *batchfile) 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? @@ -1209,12 +1401,12 @@ void do_sftp(int mode, int modeflags, char *batchfile) * 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"); @@ -1227,9 +1419,10 @@ void do_sftp(int mode, int modeflags, char *batchfile) 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; } @@ -1362,6 +1555,44 @@ void askcipher(char *ciphername, int cs) } /* + * 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) @@ -1392,7 +1623,7 @@ void fatalbox(char *fmt, ...) vsprintf(str + strlen(str), fmt, ap); va_end(ap); strcat(str, "\n"); - fprintf(stderr, str); + fputs(stderr, str); exit(1); } @@ -1405,7 +1636,7 @@ void connection_fatal(char *fmt, ...) vsprintf(str + strlen(str), fmt, ap); va_end(ap); strcat(str, "\n"); - fprintf(stderr, str); + fputs(stderr, str); exit(1); } @@ -1648,62 +1879,12 @@ static void usage(void) } /* - * 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; @@ -1822,12 +2003,81 @@ int main(int argc, char *argv[]) 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);