Merge 4.2p1 to the trunk.

1 files changed, 34 insertions, 19 deletions

diff --git a/sftp.c b/sftp.c
index 16a6cf0c6..f98ed7d27 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.63 2005/03/10 22:01:05 deraadt Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.66 2005/08/08 13:22:48 jaredy Exp $");
 
 #ifdef USE_LIBEDIT
 #include <histedit.h>
@@ -404,7 +404,7 @@ get_pathname(const char **cpp, char **path)
 {
         const char *cp = *cpp, *end;
         char quot;
-        int i, j;
+        u_int i, j;
 
         cp += strspn(cp, WHITESPACE);
         if (!*cp) {
@@ -664,14 +664,15 @@ sdirent_comp(const void *aa, const void *bb)
 static int
 do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag)
 {
-        int n, c = 1, colspace = 0, columns = 1;
+        int n;
+        u_int c = 1, colspace = 0, columns = 1;
         SFTP_DIRENT **d;
 
         if ((n = do_readdir(conn, path, &d)) != 0)
                 return (n);
 
         if (!(lflag & LS_SHORT_VIEW)) {
-                int m = 0, width = 80;
+                u_int m = 0, width = 80;
                 struct winsize ws;
                 char *tmp;
 
@@ -747,7 +748,7 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
     int lflag)
 {
         glob_t g;
-        int i, c = 1, colspace = 0, columns = 1;
+        u_int i, c = 1, colspace = 0, columns = 1;
         Attrib *a = NULL;
 
         memset(&g, 0, sizeof(g));
@@ -783,7 +784,7 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
         }
 
         if (!(lflag & LS_SHORT_VIEW)) {
-                int m = 0, width = 80;
+                u_int m = 0, width = 80;
                 struct winsize ws;
 
                 /* Count entries for sort and find longest filename */
@@ -1236,7 +1237,7 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
         char *dir = NULL;
         char cmd[2048];
         struct sftp_conn *conn;
-        int err;
+        int err, interactive;
         EditLine *el = NULL;
 #ifdef USE_LIBEDIT
         History *hl = NULL;
@@ -1294,14 +1295,15 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
                 xfree(dir);
         }
 
-#if HAVE_SETVBUF
+#if defined(HAVE_SETVBUF) && !defined(BROKEN_SETVBUF)
         setvbuf(stdout, NULL, _IOLBF, 0);
         setvbuf(infile, NULL, _IOLBF, 0);
 #else
-       setlinebuf(stdout);
-       setlinebuf(infile);
+        setlinebuf(stdout);
+        setlinebuf(infile);
 #endif
 
+        interactive = !batchmode && isatty(STDIN_FILENO);
         err = 0;
         for (;;) {
                 char *cp;
@@ -1309,20 +1311,28 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
                 signal(SIGINT, SIG_IGN);
 
                 if (el == NULL) {
-                        printf("sftp> ");
+                        if (interactive)
+                                printf("sftp> ");
                         if (fgets(cmd, sizeof(cmd), infile) == NULL) {
-                                printf("\n");
+                                if (interactive)
+                                        printf("\n");
                                 break;
                         }
-                        if (batchmode) /* Echo command */
-                                printf("%s", cmd);
+                        if (!interactive) { /* Echo command */
+                                printf("sftp> %s", cmd);
+                                if (strlen(cmd) > 0 &&
+                                    cmd[strlen(cmd) - 1] != '\n')
+                                        printf("\n");
+                        }
                 } else {
 #ifdef USE_LIBEDIT
                         const char *line;
                         int count = 0;
 
-                        if ((line = el_gets(el, &count)) == NULL || count <= 0)
-                                break;
+                        if ((line = el_gets(el, &count)) == NULL || count <= 0) {
+                                printf("\n");
+                                break;
+                        }
                         history(hl, &hev, H_ENTER, line);
                         if (strlcpy(cmd, line, sizeof(cmd)) >= sizeof(cmd)) {
                                 fprintf(stderr, "Error: input line too long\n");
@@ -1345,6 +1355,11 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
         }
         xfree(pwd);
 
+#ifdef USE_LIBEDIT
+        if (el != NULL)
+                el_end(el);
+#endif /* USE_LIBEDIT */
+
         /* err == 1 signifies normal "quit" exit */
         return (err >= 0 ? 0 : -1);
 }
@@ -1475,7 +1490,7 @@ main(int argc, char **argv)
 
                         /* Allow "-" as stdin */
                         if (strcmp(optarg, "-") != 0 &&
-                           (infile = fopen(optarg, "r")) == NULL)
+                            (infile = fopen(optarg, "r")) == NULL)
                                 fatal("%s (%s).", strerror(errno), optarg);
                         showprogress = 0;
                         batchmode = 1;
@@ -1561,8 +1576,8 @@ main(int argc, char **argv)
         err = interactive_loop(in, out, file1, file2);
 
 #if !defined(USE_PIPES)
-       shutdown(in, SHUT_RDWR);
-       shutdown(out, SHUT_RDWR);
+        shutdown(in, SHUT_RDWR);
+        shutdown(out, SHUT_RDWR);
 #endif
 
         close(in);