X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/61e9624802b421b3087730b8dbb768af2021dc6d..01dafcb504c448f0d4d5834c21b99e025f492550:/sftp-int.c

diff --git a/sftp-int.c b/sftp-int.c
index f050c098..5b1d3848 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001 Damien Miller.  All rights reserved.
+ * Copyright (c) 2001,2002 Damien Miller.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -22,12 +22,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* XXX: finish implementation of all commands */
-/* XXX: do fnmatch() instead of using raw pathname */
+/* XXX: globbed ls */
 /* XXX: recursive operations */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-int.c,v 1.1 2001/02/04 11:11:54 djm Exp $");
+RCSID("$OpenBSD: sftp-int.c,v 1.46 2002/03/30 18:51:15 markus Exp $");
 
 #include "buffer.h"
 #include "xmalloc.h"
@@ -36,9 +35,19 @@ RCSID("$OpenBSD: sftp-int.c,v 1.1 2001/02/04 11:11:54 djm Exp $");
 
 #include "sftp.h"
 #include "sftp-common.h"
+#include "sftp-glob.h"
 #include "sftp-client.h"
 #include "sftp-int.h"
 
+/* File to read commands from */
+extern FILE *infile;
+
+/* Size of buffer used when copying files */
+extern size_t copy_buffer_len;
+
+/* Number of concurrent outstanding requests */
+extern int num_requests;
+
 /* Seperators for interactive commands */
 #define WHITESPACE " \t\r\n"
 
@@ -63,77 +72,91 @@ RCSID("$OpenBSD: sftp-int.c,v 1.1 2001/02/04 11:11:54 djm Exp $");
 #define I_RM		18
 #define I_RMDIR		19
 #define I_SHELL		20
+#define I_SYMLINK	21
+#define I_VERSION	22
 
 struct CMD {
-	const int n;
 	const char *c;
+	const int n;
 };
 
 const struct CMD cmds[] = {
-	{ I_CHDIR,	"CD" },
-	{ I_CHDIR,	"CHDIR" },
-	{ I_CHDIR,	"LCD" },
-	{ I_CHGRP,	"CHGRP" },
-	{ I_CHMOD,	"CHMOD" },
-	{ I_CHOWN,	"CHOWN" },
-	{ I_HELP,	"HELP" },
-	{ I_GET,	"GET" },
-	{ I_LCHDIR,	"LCHDIR" },
-	{ I_LLS,	"LLS" },
-	{ I_LMKDIR,	"LMKDIR" },
-	{ I_LPWD,	"LPWD" },
-	{ I_LS,		"LS" },
-	{ I_LUMASK,	"LUMASK" },
-	{ I_MKDIR,	"MKDIR" },
-	{ I_PUT,	"PUT" },
-	{ I_PWD,	"PWD" },
-	{ I_QUIT,	"EXIT" },
-	{ I_QUIT,	"QUIT" },
-	{ I_RENAME,	"RENAME" },
-	{ I_RMDIR,	"RMDIR" },
-	{ I_RM,		"RM" },
-	{ I_SHELL,	"!" },
-	{ -1,		NULL}
+	{ "bye",	I_QUIT },
+	{ "cd",		I_CHDIR },
+	{ "chdir",	I_CHDIR },
+	{ "chgrp",	I_CHGRP },
+	{ "chmod",	I_CHMOD },
+	{ "chown",	I_CHOWN },
+	{ "dir",	I_LS },
+	{ "exit",	I_QUIT },
+	{ "get",	I_GET },
+	{ "mget",	I_GET },
+	{ "help",	I_HELP },
+	{ "lcd",	I_LCHDIR },
+	{ "lchdir",	I_LCHDIR },
+	{ "lls",	I_LLS },
+	{ "lmkdir",	I_LMKDIR },
+	{ "ln",		I_SYMLINK },
+	{ "lpwd",	I_LPWD },
+	{ "ls",		I_LS },
+	{ "lumask",	I_LUMASK },
+	{ "mkdir",	I_MKDIR },
+	{ "put",	I_PUT },
+	{ "mput",	I_PUT },
+	{ "pwd",	I_PWD },
+	{ "quit",	I_QUIT },
+	{ "rename",	I_RENAME },
+	{ "rm",		I_RM },
+	{ "rmdir",	I_RMDIR },
+	{ "symlink",	I_SYMLINK },
+	{ "version",	I_VERSION },
+	{ "!",		I_SHELL },
+	{ "?",		I_HELP },
+	{ NULL,			-1}
 };
 
-void
+static void
 help(void)
 {
 	printf("Available commands:\n");
-	printf("CD path                       Change remote directory to 'path'\n");
-	printf("LCD path                      Change local directory to 'path'\n");
-	printf("CHGRP grp path                Change group of file 'path' to 'grp'\n");
-	printf("CHMOD mode path               Change permissions of file 'path' to 'mode'\n");
-	printf("CHOWN own path                Change owner of file 'path' to 'own'\n");
-	printf("HELP                          Display this help text\n");
-	printf("GET remote-path [local-path]  Download file\n");
-	printf("LLS [ls options] [path]       Display local directory listing\n");
-	printf("LMKDIR path                   Create local directory\n");
-	printf("LPWD                          Print local working directory\n");
-	printf("LS [path]                     Display remote directory listing\n");
-	printf("LUMASK umask                  Set local umask to 'umask'\n");
-	printf("MKDIR path                    Create remote directory\n");
-	printf("PUT local-path [remote-path]  Upload file\n");
-	printf("PWD                           Display remote working directory\n");
-	printf("EXIT                          Quit sftp\n");
-	printf("QUIT                          Quit sftp\n");
-	printf("RENAME oldpath newpath        Rename remote file\n");
-	printf("RMDIR path                    Remove remote directory\n");
-	printf("RM path                       Delete remote file\n");
+	printf("cd path                       Change remote directory to 'path'\n");
+	printf("lcd path                      Change local directory to 'path'\n");
+	printf("chgrp grp path                Change group of file 'path' to 'grp'\n");
+	printf("chmod mode path               Change permissions of file 'path' to 'mode'\n");
+	printf("chown own path                Change owner of file 'path' to 'own'\n");
+	printf("help                          Display this help text\n");
+	printf("get remote-path [local-path]  Download file\n");
+	printf("lls [ls-options [path]]       Display local directory listing\n");
+	printf("ln oldpath newpath            Symlink remote file\n");
+	printf("lmkdir path                   Create local directory\n");
+	printf("lpwd                          Print local working directory\n");
+	printf("ls [path]                     Display remote directory listing\n");
+	printf("lumask umask                  Set local umask to 'umask'\n");
+	printf("mkdir path                    Create remote directory\n");
+	printf("put local-path [remote-path]  Upload file\n");
+	printf("pwd                           Display remote working directory\n");
+	printf("exit                          Quit sftp\n");
+	printf("quit                          Quit sftp\n");
+	printf("rename oldpath newpath        Rename remote file\n");
+	printf("rmdir path                    Remove remote directory\n");
+	printf("rm path                       Delete remote file\n");
+	printf("symlink oldpath newpath       Symlink remote file\n");
+	printf("version                       Show SFTP version\n");
 	printf("!command                      Execute 'command' in local shell\n");
 	printf("!                             Escape to local shell\n");
+	printf("?                             Synonym for help\n");
 }
 
-void
+static void
 local_do_shell(const char *args)
 {
-	int ret, status;
+	int status;
 	char *shell;
 	pid_t pid;
-	
+
 	if (!*args)
 		args = NULL;
-	
+
 	if ((shell = getenv("SHELL")) == NULL)
 		shell = _PATH_BSHELL;
 
@@ -144,65 +167,103 @@ local_do_shell(const char *args)
 		/* XXX: child has pipe fds to ssh subproc open - issue? */
 		if (args) {
 			debug3("Executing %s -c \"%s\"", shell, args);
-			ret = execl(shell, shell, "-c", args, NULL);
+			execl(shell, shell, "-c", args, (char *)NULL);
 		} else {
 			debug3("Executing %s", shell);
-			ret = execl(shell, shell, NULL);
+			execl(shell, shell, (char *)NULL);
 		}
-		fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell, 
+		fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell,
 		    strerror(errno));
 		_exit(1);
 	}
-	if (waitpid(pid, &status, 0) == -1)
-		fatal("Couldn't wait for child: %s", strerror(errno));
+	while (waitpid(pid, &status, 0) == -1)
+		if (errno != EINTR)
+			fatal("Couldn't wait for child: %s", strerror(errno));
 	if (!WIFEXITED(status))
 		error("Shell exited abormally");
 	else if (WEXITSTATUS(status))
 		error("Shell exited with status %d", WEXITSTATUS(status));
 }
 
-void 
+static void
 local_do_ls(const char *args)
 {
 	if (!args || !*args)
-		local_do_shell("ls");
+		local_do_shell(_PATH_LS);
 	else {
-		char *buf = xmalloc(8 + strlen(args) + 1);
+		int len = strlen(_PATH_LS " ") + strlen(args) + 1;
+		char *buf = xmalloc(len);
 
 		/* XXX: quoting - rip quoting code from ftp? */
-		sprintf(buf, "/bin/ls %s", args);
+		snprintf(buf, len, _PATH_LS " %s", args);
 		local_do_shell(buf);
+		xfree(buf);
 	}
 }
 
-char *
+static char *
+path_append(char *p1, char *p2)
+{
+	char *ret;
+	int len = strlen(p1) + strlen(p2) + 2;
+
+	ret = xmalloc(len);
+	strlcpy(ret, p1, len);
+	if (strcmp(p1, "/") != 0)
+		strlcat(ret, "/", len);
+	strlcat(ret, p2, len);
+
+	return(ret);
+}
+
+static char *
 make_absolute(char *p, char *pwd)
 {
-	char buf[2048];
+	char *abs;
 
 	/* Derelativise */
 	if (p && p[0] != '/') {
-		snprintf(buf, sizeof(buf), "%s/%s", pwd, p);
+		abs = path_append(pwd, p);
 		xfree(p);
-		p = xstrdup(buf);
+		return(abs);
+	} else
+		return(p);
+}
+
+static int
+infer_path(const char *p, char **ifp)
+{
+	char *cp;
+
+	cp = strrchr(p, '/');
+	if (cp == NULL) {
+		*ifp = xstrdup(p);
+		return(0);
 	}
 
-	return(p);
+	if (!cp[1]) {
+		error("Invalid path");
+		return(-1);
+	}
+
+	*ifp = xstrdup(cp + 1);
+	return(0);
 }
 
-int
+static int
 parse_getput_flags(const char **cpp, int *pflag)
 {
 	const char *cp = *cpp;
 
 	/* Check for flags */
 	if (cp[0] == '-' && cp[1] && strchr(WHITESPACE, cp[2])) {
-		switch (*cp) {
+		switch (cp[1]) {
+		case 'p':
 		case 'P':
 			*pflag = 1;
 			break;
 		default:
-			error("Invalid flag -%c", *cp);
+			error("Invalid flag -%c", cp[1]);
 			return(-1);
 		}
 		cp += 2;
@@ -212,83 +273,244 @@ parse_getput_flags(const char **cpp, int *pflag)
 	return(0);
 }
 
-int
+static int
 get_pathname(const char **cpp, char **path)
 {
-	const char *quot, *cp = *cpp;
+	const char *cp = *cpp, *end;
+	char quot;
 	int i;
 
 	cp += strspn(cp, WHITESPACE);
 	if (!*cp) {
 		*cpp = cp;
 		*path = NULL;
-		return(0);
+		return (0);
 	}
 
 	/* Check for quoted filenames */
 	if (*cp == '\"' || *cp == '\'') {
-		quot = cp++;
-		for(i = 0; cp[i] && cp[i] != *quot; i++)
-			;
-		if (!cp[i]) {
+		quot = *cp++;
+
+		end = strchr(cp, quot);
+		if (end == NULL) {
 			error("Unterminated quote");
-			*path = NULL;
-			return(-1);
+			goto fail;
 		}
-		if (i == 0) {
+		if (cp == end) {
 			error("Empty quotes");
-			*path = NULL;
-			return(-1);
+			goto fail;
 		}
-		*path = xmalloc(i + 1);
-		memcpy(*path, cp, i);
-		(*path)[i] = '\0';
-		cp += i + 1;
-		*cpp = cp + strspn(cp, WHITESPACE);
-		return(0);
+		*cpp = end + 1 + strspn(end + 1, WHITESPACE);
+	} else {
+		/* Read to end of filename */
+		end = strpbrk(cp, WHITESPACE);
+		if (end == NULL)
+			end = strchr(cp, '\0');
+		*cpp = end + strspn(end, WHITESPACE);
 	}
 
-	/* Read to end of filename */
-	for(i = 0; cp[i] && cp[i] != ' '; i++)
-		;
+	i = end - cp;
 
 	*path = xmalloc(i + 1);
 	memcpy(*path, cp, i);
 	(*path)[i] = '\0';
-	cp += i;
-	*cpp = cp + strspn(cp, WHITESPACE);
-
 	return(0);
+
+ fail:
+	*path = NULL;
+	return (-1);
 }
 
-int
-infer_path(const char *p, char **ifp)
+static int
+is_dir(char *path)
 {
-	char *cp;
+	struct stat sb;
 
-	debug("XXX: P = \"%s\"", p);
+	/* XXX: report errors? */
+	if (stat(path, &sb) == -1)
+		return(0);
 
-	cp = strrchr(p, '/');
+	return(sb.st_mode & S_IFDIR);
+}
 
-	if (cp == NULL) {
-		*ifp = xstrdup(p);
+static int
+remote_is_dir(struct sftp_conn *conn, char *path)
+{
+	Attrib *a;
+
+	/* XXX: report errors? */
+	if ((a = do_stat(conn, path, 1)) == NULL)
 		return(0);
+	if (!(a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS))
+		return(0);
+	return(a->perm & S_IFDIR);
+}
+
+static int
+process_get(struct sftp_conn *conn, char *src, char *dst, char *pwd, int pflag)
+{
+	char *abs_src = NULL;
+	char *abs_dst = NULL;
+	char *tmp;
+	glob_t g;
+	int err = 0;
+	int i;
+
+	abs_src = xstrdup(src);
+	abs_src = make_absolute(abs_src, pwd);
+
+	memset(&g, 0, sizeof(g));
+	debug3("Looking up %s", abs_src);
+	if (remote_glob(conn, abs_src, 0, NULL, &g)) {
+		error("File \"%s\" not found.", abs_src);
+		err = -1;
+		goto out;
 	}
 
-	if (!cp[1]) {
-		error("Invalid path");
-		return(-1);
+	/* Only one match, dst may be file, directory or unspecified */
+	if (g.gl_pathv[0] && g.gl_matchc == 1) {
+		if (dst) {
+			/* If directory specified, append filename */
+			if (is_dir(dst)) {
+				if (infer_path(g.gl_pathv[0], &tmp)) {
+					err = 1;
+					goto out;
+				}
+				abs_dst = path_append(dst, tmp);
+				xfree(tmp);
+			} else
+				abs_dst = xstrdup(dst);
+		} else if (infer_path(g.gl_pathv[0], &abs_dst)) {
+			err = -1;
+			goto out;
+		}
+		printf("Fetching %s to %s\n", g.gl_pathv[0], abs_dst);
+		err = do_download(conn, g.gl_pathv[0], abs_dst, pflag);
+		goto out;
 	}
 
-	*ifp = xstrdup(cp + 1);
-	return(0);
+	/* Multiple matches, dst may be directory or unspecified */
+	if (dst && !is_dir(dst)) {
+		error("Multiple files match, but \"%s\" is not a directory",
+		    dst);
+		err = -1;
+		goto out;
+	}
+
+	for (i = 0; g.gl_pathv[i]; i++) {
+		if (infer_path(g.gl_pathv[i], &tmp)) {
+			err = -1;
+			goto out;
+		}
+		if (dst) {
+			abs_dst = path_append(dst, tmp);
+			xfree(tmp);
+		} else
+			abs_dst = tmp;
+
+		printf("Fetching %s to %s\n", g.gl_pathv[i], abs_dst);
+		if (do_download(conn, g.gl_pathv[i], abs_dst, pflag) == -1)
+			err = -1;
+		xfree(abs_dst);
+		abs_dst = NULL;
+	}
+
+out:
+	xfree(abs_src);
+	if (abs_dst)
+		xfree(abs_dst);
+	globfree(&g);
+	return(err);
 }
 
-int
+static int
+process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd, int pflag)
+{
+	char *tmp_dst = NULL;
+	char *abs_dst = NULL;
+	char *tmp;
+	glob_t g;
+	int err = 0;
+	int i;
+
+	if (dst) {
+		tmp_dst = xstrdup(dst);
+		tmp_dst = make_absolute(tmp_dst, pwd);
+	}
+
+	memset(&g, 0, sizeof(g));
+	debug3("Looking up %s", src);
+	if (glob(src, 0, NULL, &g)) {
+		error("File \"%s\" not found.", src);
+		err = -1;
+		goto out;
+	}
+
+	/* Only one match, dst may be file, directory or unspecified */
+	if (g.gl_pathv[0] && g.gl_matchc == 1) {
+		if (tmp_dst) {
+			/* If directory specified, append filename */
+			if (remote_is_dir(conn, tmp_dst)) {
+				if (infer_path(g.gl_pathv[0], &tmp)) {
+					err = 1;
+					goto out;
+				}
+				abs_dst = path_append(tmp_dst, tmp);
+				xfree(tmp);
+			} else
+				abs_dst = xstrdup(tmp_dst);
+		} else {
+			if (infer_path(g.gl_pathv[0], &abs_dst)) {
+				err = -1;
+				goto out;
+			}
+			abs_dst = make_absolute(abs_dst, pwd);
+		}
+		printf("Uploading %s to %s\n", g.gl_pathv[0], abs_dst);
+		err = do_upload(conn, g.gl_pathv[0], abs_dst, pflag);
+		goto out;
+	}
+
+	/* Multiple matches, dst may be directory or unspecified */
+	if (tmp_dst && !remote_is_dir(conn, tmp_dst)) {
+		error("Multiple files match, but \"%s\" is not a directory",
+		    tmp_dst);
+		err = -1;
+		goto out;
+	}
+
+	for (i = 0; g.gl_pathv[i]; i++) {
+		if (infer_path(g.gl_pathv[i], &tmp)) {
+			err = -1;
+			goto out;
+		}
+		if (tmp_dst) {
+			abs_dst = path_append(tmp_dst, tmp);
+			xfree(tmp);
+		} else
+			abs_dst = make_absolute(tmp, pwd);
+
+		printf("Uploading %s to %s\n", g.gl_pathv[i], abs_dst);
+		if (do_upload(conn, g.gl_pathv[i], abs_dst, pflag) == -1)
+			err = -1;
+	}
+
+out:
+	if (abs_dst)
+		xfree(abs_dst);
+	if (tmp_dst)
+		xfree(tmp_dst);
+	return(err);
+}
+
+static int
 parse_args(const char **cpp, int *pflag, unsigned long *n_arg,
     char **path1, char **path2)
 {
 	const char *cmd, *cp = *cpp;
+	char *cp2;
+	int base = 0;
+	long l;
 	int i, cmdnum;
 
 	/* Skip leading whitespace */
@@ -299,7 +521,7 @@ parse_args(const char **cpp, int *pflag, unsigned long *n_arg,
 		return(-1);
 
 	/* Figure out which command we have */
-	for(i = 0; cmds[i].c; i++) {
+	for (i = 0; cmds[i].c; i++) {
 		int cmdlen = strlen(cmds[i].c);
 
 		/* Check for command followed by whitespace */
@@ -341,12 +563,9 @@ parse_args(const char **cpp, int *pflag, unsigned long *n_arg,
 		/* Try to get second pathname (optional) */
 		if (get_pathname(&cp, path2))
 			return(-1);
-		/* Otherwise try to guess it from first path */
-		if (*path2 == NULL && infer_path(*path1, path2))
-			return(-1);
 		break;
 	case I_RENAME:
-		/* Get first pathname (mandatory) */
+	case I_SYMLINK:
 		if (get_pathname(&cp, path1))
 			return(-1);
 		if (get_pathname(&cp, path2))
@@ -367,7 +586,7 @@ parse_args(const char **cpp, int *pflag, unsigned long *n_arg,
 		if (get_pathname(&cp, path1))
 			return(-1);
 		if (*path1 == NULL) {
-			error("You must specify a path after a %s command.", 
+			error("You must specify a path after a %s command.",
 			    cmd);
 			return(-1);
 		}
@@ -382,17 +601,24 @@ parse_args(const char **cpp, int *pflag, unsigned long *n_arg,
 		/* Uses the rest of the line */
 		break;
 	case I_LUMASK:
+		base = 8;
 	case I_CHMOD:
+		base = 8;
 	case I_CHOWN:
 	case I_CHGRP:
 		/* Get numeric arg (mandatory) */
-		if (*cp < '0' && *cp > '9') {
+		l = strtol(cp, &cp2, base);
+		if (cp2 == cp || ((l == LONG_MIN || l == LONG_MAX) &&
+		    errno == ERANGE) || l < 0) {
 			error("You must supply a numeric argument "
 			    "to the %s command.", cmd);
 			return(-1);
 		}
-		*n_arg = strtoul(cp, (char**)&cp, 0);
-		if (!*cp || !strchr(WHITESPACE, *cp)) {
+		cp = cp2;
+		*n_arg = l;
+		if (cmdnum == I_LUMASK && strchr(WHITESPACE, *cp))
+			break;
+		if (cmdnum == I_LUMASK || !strchr(WHITESPACE, *cp)) {
 			error("You must supply a numeric argument "
 			    "to the %s command.", cmd);
 			return(-1);
@@ -403,7 +629,7 @@ parse_args(const char **cpp, int *pflag, unsigned long *n_arg,
 		if (get_pathname(&cp, path1))
 			return(-1);
 		if (*path1 == NULL) {
-			error("You must specify a path after a %s command.", 
+			error("You must specify a path after a %s command.",
 			    cmd);
 			return(-1);
 		}
@@ -412,78 +638,130 @@ parse_args(const char **cpp, int *pflag, unsigned long *n_arg,
 	case I_PWD:
 	case I_LPWD:
 	case I_HELP:
+	case I_VERSION:
 		break;
 	default:
 		fatal("Command not implemented");
 	}
 
 	*cpp = cp;
-
 	return(cmdnum);
 }
 
-int
-parse_dispatch_command(int in, int out, const char *cmd, char **pwd)
+static int
+parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd)
 {
-	char *path1, *path2;
-	int pflag, cmdnum;
+	char *path1, *path2, *tmp;
+	int pflag, cmdnum, i;
 	unsigned long n_arg;
 	Attrib a, *aa;
-	char path_buf[PATH_MAX];
+	char path_buf[MAXPATHLEN];
+	int err = 0;
+	glob_t g;
 
 	path1 = path2 = NULL;
 	cmdnum = parse_args(&cmd, &pflag, &n_arg, &path1, &path2);
 
+	memset(&g, 0, sizeof(g));
+
 	/* Perform command */
 	switch (cmdnum) {
 	case -1:
 		break;
 	case I_GET:
-		path1 = make_absolute(path1, *pwd);
-		do_download(in, out, path1, path2, pflag);
+		err = process_get(conn, path1, path2, *pwd, pflag);
 		break;
 	case I_PUT:
-		path2 = make_absolute(path2, *pwd);
-		do_upload(in, out, path1, path2, pflag);
+		err = process_put(conn, path1, path2, *pwd, pflag);
 		break;
 	case I_RENAME:
 		path1 = make_absolute(path1, *pwd);
 		path2 = make_absolute(path2, *pwd);
-		do_rename(in, out, path1, path2);
+		err = do_rename(conn, path1, path2);
+		break;
+	case I_SYMLINK:
+		path2 = make_absolute(path2, *pwd);
+		err = do_symlink(conn, path1, path2);
 		break;
 	case I_RM:
 		path1 = make_absolute(path1, *pwd);
-		do_rm(in, out, path1);
+		remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
+		for (i = 0; g.gl_pathv[i]; i++) {
+			printf("Removing %s\n", g.gl_pathv[i]);
+			if (do_rm(conn, g.gl_pathv[i]) == -1)
+				err = -1;
+		}
 		break;
 	case I_MKDIR:
 		path1 = make_absolute(path1, *pwd);
 		attrib_clear(&a);
 		a.flags |= SSH2_FILEXFER_ATTR_PERMISSIONS;
 		a.perm = 0777;
-		do_mkdir(in, out, path1, &a);
+		err = do_mkdir(conn, path1, &a);
 		break;
 	case I_RMDIR:
 		path1 = make_absolute(path1, *pwd);
-		do_rmdir(in, out, path1);
+		err = do_rmdir(conn, path1);
 		break;
 	case I_CHDIR:
 		path1 = make_absolute(path1, *pwd);
+		if ((tmp = do_realpath(conn, path1)) == NULL) {
+			err = 1;
+			break;
+		}
+		if ((aa = do_stat(conn, tmp, 0)) == NULL) {
+			xfree(tmp);
+			err = 1;
+			break;
+		}
+		if (!(aa->flags & SSH2_FILEXFER_ATTR_PERMISSIONS)) {
+			error("Can't change directory: Can't check target");
+			xfree(tmp);
+			err = 1;
+			break;
+		}
+		if (!S_ISDIR(aa->perm)) {
+			error("Can't change directory: \"%s\" is not "
+			    "a directory", tmp);
+			xfree(tmp);
+			err = 1;
+			break;
+		}
 		xfree(*pwd);
-		*pwd = do_realpath(in, out, path1);
+		*pwd = tmp;
 		break;
 	case I_LS:
+		if (!path1) {
+			do_ls(conn, *pwd);
+			break;
+		}
 		path1 = make_absolute(path1, *pwd);
-		do_ls(in, out, path1?path1:*pwd);
+		if ((tmp = do_realpath(conn, path1)) == NULL)
+			break;
+		xfree(path1);
+		path1 = tmp;
+		if ((aa = do_stat(conn, path1, 0)) == NULL)
+			break;
+		if ((aa->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) &&
+		    !S_ISDIR(aa->perm)) {
+			error("Can't ls: \"%s\" is not a directory", path1);
+			break;
+		}
+		do_ls(conn, path1);
 		break;
 	case I_LCHDIR:
-		if (chdir(path1) == -1)
+		if (chdir(path1) == -1) {
 			error("Couldn't change local directory to "
 			    "\"%s\": %s", path1, strerror(errno));
+			err = 1;
+		}
 		break;
 	case I_LMKDIR:
-		if (mkdir(path1, 0777) == -1)
-			error("Couldn't create local directory to "
+		if (mkdir(path1, 0777) == -1) {
+			error("Couldn't create local directory "
 			    "\"%s\": %s", path1, strerror(errno));
+			err = 1;
+		}
 		break;
 	case I_LLS:
 		local_do_ls(cmd);
@@ -493,41 +771,59 @@ parse_dispatch_command(int in, int out, const char *cmd, char **pwd)
 		break;
 	case I_LUMASK:
 		umask(n_arg);
+		printf("Local umask: %03lo\n", n_arg);
 		break;
 	case I_CHMOD:
 		path1 = make_absolute(path1, *pwd);
 		attrib_clear(&a);
 		a.flags |= SSH2_FILEXFER_ATTR_PERMISSIONS;
 		a.perm = n_arg;
-		do_setstat(in, out, path1, &a);
+		remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
+		for (i = 0; g.gl_pathv[i]; i++) {
+			printf("Changing mode on %s\n", g.gl_pathv[i]);
+			do_setstat(conn, g.gl_pathv[i], &a);
+		}
+		break;
 	case I_CHOWN:
 		path1 = make_absolute(path1, *pwd);
-		aa = do_stat(in, out, path1);
-		if (!aa->flags & SSH2_FILEXFER_ATTR_UIDGID) {
-			error("Can't get current ownership of "
-			    "remote file \"%s\"", path1);
-			break;
+		remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
+		for (i = 0; g.gl_pathv[i]; i++) {
+			if (!(aa = do_stat(conn, g.gl_pathv[i], 0)))
+				continue;
+			if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
+				error("Can't get current ownership of "
+				    "remote file \"%s\"", g.gl_pathv[i]);
+				continue;
+			}
+			printf("Changing owner on %s\n", g.gl_pathv[i]);
+			aa->flags &= SSH2_FILEXFER_ATTR_UIDGID;
+			aa->uid = n_arg;
+			do_setstat(conn, g.gl_pathv[i], aa);
 		}
-		aa->uid = n_arg;
-		do_setstat(in, out, path1, aa);
 		break;
 	case I_CHGRP:
 		path1 = make_absolute(path1, *pwd);
-		aa = do_stat(in, out, path1);
-		if (!aa->flags & SSH2_FILEXFER_ATTR_UIDGID) {
-			error("Can't get current ownership of "
-			    "remote file \"%s\"", path1);
-			break;
+		remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
+		for (i = 0; g.gl_pathv[i]; i++) {
+			if (!(aa = do_stat(conn, g.gl_pathv[i], 0)))
+				continue;
+			if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
+				error("Can't get current ownership of "
+				    "remote file \"%s\"", g.gl_pathv[i]);
+				continue;
+			}
+			printf("Changing group on %s\n", g.gl_pathv[i]);
+			aa->flags &= SSH2_FILEXFER_ATTR_UIDGID;
+			aa->gid = n_arg;
+			do_setstat(conn, g.gl_pathv[i], aa);
 		}
-		aa->gid = n_arg;
-		do_setstat(in, out, path1, aa);
 		break;
 	case I_PWD:
 		printf("Remote working directory: %s\n", *pwd);
 		break;
 	case I_LPWD:
 		if (!getcwd(path_buf, sizeof(path_buf)))
-			error("Couldn't get local cwd: %s\n",
+			error("Couldn't get local cwd: %s",
 			    strerror(errno));
 		else
 			printf("Local working directory: %s\n",
@@ -538,45 +834,89 @@ parse_dispatch_command(int in, int out, const char *cmd, char **pwd)
 	case I_HELP:
 		help();
 		break;
+	case I_VERSION:
+		printf("SFTP protocol version %d\n", sftp_proto_version(conn));
+		break;
 	default:
 		fatal("%d is not implemented", cmdnum);
 	}
 
+	if (g.gl_pathc)
+		globfree(&g);
 	if (path1)
 		xfree(path1);
 	if (path2)
 		xfree(path2);
 
+	/* If an error occurs in batch mode we should abort. */
+	if (infile != stdin && err > 0)
+		return -1;
+
 	return(0);
 }
 
 void
-interactive_loop(int fd_in, int fd_out)
+interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
 {
 	char *pwd;
+	char *dir = NULL;
 	char cmd[2048];
+	struct sftp_conn *conn;
+
+	conn = do_init(fd_in, fd_out, copy_buffer_len, num_requests);
+	if (conn == NULL)
+		fatal("Couldn't initialise connection to server");
 
-	pwd = do_realpath(fd_in, fd_out, ".");
+	pwd = do_realpath(conn, ".");
 	if (pwd == NULL)
 		fatal("Need cwd");
 
+	if (file1 != NULL) {
+		dir = xstrdup(file1);
+		dir = make_absolute(dir, pwd);
+
+		if (remote_is_dir(conn, dir) && file2 == NULL) {
+			printf("Changing to: %s\n", dir);
+			snprintf(cmd, sizeof cmd, "cd \"%s\"", dir);
+			parse_dispatch_command(conn, cmd, &pwd);
+		} else {
+			if (file2 == NULL)
+				snprintf(cmd, sizeof cmd, "get %s", dir);
+			else
+				snprintf(cmd, sizeof cmd, "get %s %s", dir,
+				    file2);
+
+			parse_dispatch_command(conn, cmd, &pwd);
+			xfree(dir);
+			return;
+		}
+		xfree(dir);
+	}
+#if HAVE_SETVBUF
+	setvbuf(stdout, NULL, _IOLBF, 0);
+	setvbuf(infile, NULL, _IOLBF, 0);
+#else
 	setlinebuf(stdout);
-	setlinebuf(stdin);
+	setlinebuf(infile);
+#endif
 
-	for(;;) {
+	for (;;) {
 		char *cp;
 
 		printf("sftp> ");
 
 		/* XXX: use libedit */
-		if (fgets(cmd, sizeof(cmd), stdin) == NULL) {
+		if (fgets(cmd, sizeof(cmd), infile) == NULL) {
 			printf("\n");
 			break;
-		}
+		} else if (infile != stdin) /* Bluff typing */
+			printf("%s", cmd);
+
 		cp = strrchr(cmd, '\n');
 		if (cp)
 			*cp = '\0';
-		if (parse_dispatch_command(fd_in, fd_out, cmd, &pwd))
+
+		if (parse_dispatch_command(conn, cmd, &pwd))
 			break;
 	}
 	xfree(pwd);