- (tim) [config.guess config.sub] Update to '2005-05-27' version.

[openssh.git] / sftp.c

diff --git a/sftp.c b/sftp.c
index b37c36b715fa20b7473d23e49c8b73c352330c69..16a6cf0c62f345204898f0d2aac786989dee051e 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.58 2004/11/25 22:22:14 markus Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.63 2005/03/10 22:01:05 deraadt Exp $");
 
 #ifdef USE_LIBEDIT
 #include <histedit.h>
@@ -150,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);
 }
@@ -160,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
@@ -262,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));
@@ -353,7 +357,7 @@ parse_ls_flags(const char **cpp, int *lflag)
 
        /* Check for flags */
        if (cp++[0] == '-') {
-               for(; strchr(WHITESPACE, *cp) == NULL; cp++) {
+               for (; strchr(WHITESPACE, *cp) == NULL; cp++) {
                        switch (*cp) {
                        case 'l':
                                *lflag &= ~VIEW_FLAGS;
@@ -744,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);
        }
@@ -758,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);
                }
        }
 
@@ -790,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);
@@ -807,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);
@@ -1470,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;