From 2f67503ad783d5ac2fac9a1b3b434df932d90cbe Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Fri, 14 Dec 2001 10:06:09 +0000 Subject: [PATCH] Fix trivial problems with PSFTP batch mode [originally from svn r1483] --- psftp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/psftp.c b/psftp.c index d181af96..feefbbc0 100644 --- a/psftp.c +++ b/psftp.c @@ -1183,7 +1183,8 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags) 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); @@ -1913,9 +1914,9 @@ int main(int argc, char *argv[]) } 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) { + } else if (strcmp(argv[i], "-bc") == 0) { modeflags = modeflags | 1; - } else if (strcmp(argv[i], "-be") == 0 && i + 1 < argc) { + } else if (strcmp(argv[i], "-be") == 0) { modeflags = modeflags | 2; } else if (strcmp(argv[i], "--") == 0) { i++;