Import of OpenSSH 4.0p1

[gssapi-openssh.git] / openssh / sftp.c

diff --git a/openssh/sftp.c b/openssh/sftp.c
index f01c9194c3642df3bdc8c74667cc9e8e942cf9cd..f8553ed82104fd03454d6fab921452a298ed72b7 100644 (file)
--- a/openssh/sftp.c
+++ b/openssh/sftp.c
@@ -16,7 +16,13 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.56 2004/07/11 17:48:47 deraadt Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.62 2005/02/20 22:59:06 djm Exp $");
+
+#ifdef USE_LIBEDIT
+#include <histedit.h>
+#else
+typedef void EditLine;
+#endif
 
 #include "buffer.h"
 #include "xmalloc.h"
@@ -144,8 +150,10 @@ int interactive_loop(int fd_in, int fd_out, char *file1, char *file2);
 static void
 killchild(int signo)
 {
-       if (sshpid > 1)
+       if (sshpid > 1) {
                kill(sshpid, SIGTERM);
+               waitpid(sshpid, NULL, 0);
+       }
 
        _exit(1);
 }
@@ -154,9 +162,11 @@ static void
 cmd_interrupt(int signo)
 {
        const char msg[] = "\rInterrupt  \n";
+       int olderrno = errno;
 
        write(STDERR_FILENO, msg, sizeof(msg) - 1);
        interrupted = 1;
+       errno = olderrno;
 }
 
 static void
@@ -256,7 +266,7 @@ path_strip(char *path, char *strip)
                return (xstrdup(path));
 
        len = strlen(strip);
-       if (strip != NULL && strncmp(path, strip, len) == 0) {
+       if (strncmp(path, strip, len) == 0) {
                if (strip[len - 1] != '/' && path[len] == '/')
                        len++;
                return (xstrdup(path + len));
@@ -738,12 +748,14 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
 {
        glob_t g;
        int i, c = 1, colspace = 0, columns = 1;
-       Attrib *a;
+       Attrib *a = NULL;
 
        memset(&g, 0, sizeof(g));
 
        if (remote_glob(conn, path, GLOB_MARK|GLOB_NOCHECK|GLOB_BRACE,
-           NULL, &g)) {
+           NULL, &g) || (g.gl_pathc && !g.gl_matchc)) {
+               if (g.gl_pathc)
+                       globfree(&g);
                error("Can't ls: \"%s\" not found", path);
                return (-1);
        }
@@ -752,19 +764,21 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
                goto out;
 
        /*
-        * If the glob returns a single match, which is the same as the
-        * input glob, and it is a directory, then just list its contents
+        * If the glob returns a single match and it is a directory,
+        * then just list its contents.
         */
-       if (g.gl_pathc == 1 &&
-           strncmp(path, g.gl_pathv[0], strlen(g.gl_pathv[0]) - 1) == 0) {
-               if ((a = do_lstat(conn, path, 1)) == NULL) {
+       if (g.gl_matchc == 1) {
+               if ((a = do_lstat(conn, g.gl_pathv[0], 1)) == NULL) {
                        globfree(&g);
                        return (-1);
                }
                if ((a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) &&
                    S_ISDIR(a->perm)) {
+                       int err;
+
+                       err = do_ls_dir(conn, g.gl_pathv[0], strip_path, lflag);
                        globfree(&g);
-                       return (do_ls_dir(conn, path, strip_path, lflag));
+                       return (err);
                }
        }
 
@@ -784,7 +798,7 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
                colspace = width / columns;
        }
 
-       for (i = 0; g.gl_pathv[i] && !interrupted; i++) {
+       for (i = 0; g.gl_pathv[i] && !interrupted; i++, a = NULL) {
                char *fname;
 
                fname = path_strip(g.gl_pathv[i], strip_path);
@@ -801,7 +815,8 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
                         * that the server returns as well as the filenames.
                         */
                        memset(&sb, 0, sizeof(sb));
-                       a = do_lstat(conn, g.gl_pathv[i], 1);
+                       if (a == NULL)
+                               a = do_lstat(conn, g.gl_pathv[i], 1);
                        if (a != NULL)
                                attrib_to_stat(a, &sb);
                        lname = ls_file(fname, &sb, 1);
@@ -1206,6 +1221,14 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
        return (0);
 }
 
+#ifdef USE_LIBEDIT
+static char *
+prompt(EditLine *el)
+{
+       return ("sftp> ");
+}
+#endif
+
 int
 interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
 {
@@ -1214,6 +1237,27 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
        char cmd[2048];
        struct sftp_conn *conn;
        int err;
+       EditLine *el = NULL;
+#ifdef USE_LIBEDIT
+       History *hl = NULL;
+       HistEvent hev;
+       extern char *__progname;
+
+       if (!batchmode && isatty(STDIN_FILENO)) {
+               if ((el = el_init(__progname, stdin, stdout, stderr)) == NULL)
+                       fatal("Couldn't initialise editline");
+               if ((hl = history_init()) == NULL)
+                       fatal("Couldn't initialise editline history");
+               history(hl, &hev, H_SETSIZE, 100);
+               el_set(el, EL_HIST, history, hl);
+
+               el_set(el, EL_PROMPT, prompt);
+               el_set(el, EL_EDITOR, "emacs");
+               el_set(el, EL_TERMINAL, NULL);
+               el_set(el, EL_SIGNAL, 1);
+               el_source(el, NULL);
+       }
+#endif /* USE_LIBEDIT */
 
        conn = do_init(fd_in, fd_out, copy_buffer_len, num_requests);
        if (conn == NULL)
@@ -1230,8 +1274,11 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
                if (remote_is_dir(conn, dir) && file2 == NULL) {
                        printf("Changing to: %s\n", dir);
                        snprintf(cmd, sizeof cmd, "cd \"%s\"", dir);
-                       if (parse_dispatch_command(conn, cmd, &pwd, 1) != 0)
+                       if (parse_dispatch_command(conn, cmd, &pwd, 1) != 0) {
+                               xfree(dir);
+                               xfree(pwd);
                                return (-1);
+                       }
                } else {
                        if (file2 == NULL)
                                snprintf(cmd, sizeof cmd, "get %s", dir);
@@ -1261,17 +1308,29 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
 
                signal(SIGINT, SIG_IGN);
 
-               printf("sftp> ");
+               if (el == NULL) {
+                       printf("sftp> ");
+                       if (fgets(cmd, sizeof(cmd), infile) == NULL) {
+                               printf("\n");
+                               break;
+                       }
+                       if (batchmode) /* Echo command */
+                               printf("%s", cmd);
+               } else {
+#ifdef USE_LIBEDIT
+                       const char *line;
+                       int count = 0;
 
-               /* XXX: use libedit */
-               if (fgets(cmd, sizeof(cmd), infile) == NULL) {
-                       printf("\n");
-                       break;
+                       if ((line = el_gets(el, &count)) == NULL || count <= 0)
+                               break;
+                       history(hl, &hev, H_ENTER, line);
+                       if (strlcpy(cmd, line, sizeof(cmd)) >= sizeof(cmd)) {
+                               fprintf(stderr, "Error: input line too long\n");
+                               continue;
+                       }
+#endif /* USE_LIBEDIT */
                }
 
-               if (batchmode) /* Echo command */
-                       printf("%s", cmd);
-
                cp = strrchr(cmd, '\n');
                if (cp)
                        *cp = '\0';
@@ -1420,6 +1479,7 @@ main(int argc, char **argv)
                                fatal("%s (%s).", strerror(errno), optarg);
                        showprogress = 0;
                        batchmode = 1;
+                       addargs(&args, "-obatchmode yes");
                        break;
                case 'P':
                        sftp_direct = optarg;