===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/sftp-int.c,v
retrieving revision 1.49.2.2
retrieving revision 1.50
diff -u -r1.49.2.2 -r1.50
--- src/usr.bin/ssh/Attic/sftp-int.c	2003/09/16 21:20:27	1.49.2.2
+++ src/usr.bin/ssh/Attic/sftp-int.c	2002/11/21 23:03:51	1.50
@@ -25,7 +25,7 @@
 /* XXX: recursive operations */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-int.c,v 1.49.2.2 2003/09/16 21:20:27 brad Exp $");
+RCSID("$OpenBSD: sftp-int.c,v 1.50 2002/11/21 23:03:51 deraadt Exp $");
 
 #include <glob.h>
 
@@ -49,16 +49,9 @@
 /* Number of concurrent outstanding requests */
 extern int num_requests;
 
-/* This is set to 0 if the progressmeter is not desired. */
-int showprogress = 1;
-
 /* Seperators for interactive commands */
 #define WHITESPACE " \t\r\n"
 
-/* Define what type of ls view (0 - multi-column) */
-#define LONG_VIEW 1		/* Full view ala ls -l */
-#define SHORT_VIEW 2		/* Single row view ala ls -1 */
-
 /* Commands for interactive mode */
 #define I_CHDIR		1
 #define I_CHGRP		2
@@ -82,14 +75,13 @@
 #define I_SHELL		20
 #define I_SYMLINK	21
 #define I_VERSION	22
-#define I_PROGRESS	23
 
 struct CMD {
 	const char *c;
 	const int n;
 };
 
-static const struct CMD cmds[] = {
+const struct CMD cmds[] = {
 	{ "bye",	I_QUIT },
 	{ "cd",		I_CHDIR },
 	{ "chdir",	I_CHDIR },
@@ -110,7 +102,6 @@
 	{ "ls",		I_LS },
 	{ "lumask",	I_LUMASK },
 	{ "mkdir",	I_MKDIR },
-	{ "progress",	I_PROGRESS },
 	{ "put",	I_PUT },
 	{ "mput",	I_PUT },
 	{ "pwd",	I_PWD },
@@ -143,7 +134,6 @@
 	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("progress                      Toggle display of progress meter\n");
 	printf("put local-path [remote-path]  Upload file\n");
 	printf("pwd                           Display remote working directory\n");
 	printf("exit                          Quit sftp\n");
@@ -313,11 +303,8 @@
 		for(; strchr(WHITESPACE, *cp) == NULL; cp++) {
 			switch (*cp) {
 			case 'l':
-				*lflag = LONG_VIEW;
+				*lflag = 1;
 				break;
-			case '1':
-				*lflag = SHORT_VIEW;
-				break;
 			default:
 				error("Invalid flag -%c", *cp);
 				return(-1);
@@ -334,7 +321,7 @@
 {
 	const char *cp = *cpp, *end;
 	char quot;
-	int i, j;
+	int i;
 
 	cp += strspn(cp, WHITESPACE);
 	if (!*cp) {
@@ -343,54 +330,37 @@
 		return (0);
 	}
 
-	*path = xmalloc(strlen(cp) + 1);
-
 	/* Check for quoted filenames */
 	if (*cp == '\"' || *cp == '\'') {
 		quot = *cp++;
 
-		/* Search for terminating quote, unescape some chars */
-		for (i = j = 0; i <= strlen(cp); i++) {
-			if (cp[i] == quot) {	/* Found quote */
-				(*path)[j] = '\0';
-				break;
-			}
-			if (cp[i] == '\0') {	/* End of string */
-				error("Unterminated quote");
-				goto fail;
-			}
-			if (cp[i] == '\\') {	/* Escaped characters */
-				i++;
-				if (cp[i] != '\'' && cp[i] != '\"' && 
-				    cp[i] != '\\') {
-					error("Bad escaped character '\%c'",
-					    cp[i]);
-					goto fail;
-				}
-			}
-			(*path)[j++] = cp[i];
+		end = strchr(cp, quot);
+		if (end == NULL) {
+			error("Unterminated quote");
+			goto fail;
 		}
-
-		if (j == 0) {
+		if (cp == end) {
 			error("Empty quotes");
 			goto fail;
 		}
-		*cpp = cp + i + strspn(cp + i, WHITESPACE);
+		*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);
-
-		memcpy(*path, cp, end - cp);
-		(*path)[end - cp] = '\0';
 	}
-	return (0);
 
+	i = end - cp;
+
+	*path = xmalloc(i + 1);
+	memcpy(*path, cp, i);
+	(*path)[i] = '\0';
+	return(0);
+
  fail:
- 	xfree(*path);
-	*path = NULL;	
+	*path = NULL;
 	return (-1);
 }
 
@@ -407,17 +377,6 @@
 }
 
 static int
-is_reg(char *path)
-{
-	struct stat sb;
-
-	if (stat(path, &sb) == -1)
-		fatal("stat %s: %s", path, strerror(errno));
-
-	return(S_ISREG(sb.st_mode));
-}
-
-static int
 remote_is_dir(struct sftp_conn *conn, char *path)
 {
 	Attrib *a;
@@ -451,8 +410,30 @@
 		goto out;
 	}
 
-	/* If multiple matches, dst must be a directory or unspecified */
-	if (g.gl_matchc > 1 && dst && !is_dir(dst)) {
+	/* 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;
+	}
+
+	/* 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;
@@ -464,19 +445,7 @@
 			err = -1;
 			goto out;
 		}
-
-		if (g.gl_matchc == 1 && 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 (dst) {
+		if (dst) {
 			abs_dst = path_append(dst, tmp);
 			xfree(tmp);
 		} else
@@ -520,26 +489,9 @@
 		goto out;
 	}
 
-	/* If multiple matches, dst may be directory or unspecified */
-	if (g.gl_matchc > 1 && 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 (!is_reg(g.gl_pathv[i])) {
-			error("skipping non-regular file %s", 
-			    g.gl_pathv[i]);
-			continue;
-		}
-		if (infer_path(g.gl_pathv[i], &tmp)) {
-			err = -1;
-			goto out;
-		}
-
-		if (g.gl_matchc == 1 && tmp_dst) {
+	/* 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)) {
@@ -550,8 +502,32 @@
 				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;
+	}
 
-		} else if (tmp_dst) {
+	/* 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
@@ -567,7 +543,6 @@
 		xfree(abs_dst);
 	if (tmp_dst)
 		xfree(tmp_dst);
-	globfree(&g);
 	return(err);
 }
 
@@ -584,28 +559,16 @@
 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;
 	SFTP_DIRENT **d;
 
 	if ((n = do_readdir(conn, path, &d)) != 0)
 		return (n);
 
-	if (!(lflag & SHORT_VIEW)) {
-		int m = 0, width = 80;
-		struct winsize ws;
+	/* Count entries for sort */
+	for (n = 0; d[n] != NULL; n++)
+		;
 
-		/* Count entries for sort and find longest filename */
-		for (n = 0; d[n] != NULL; n++)
-			m = MAX(m, strlen(d[n]->filename));
-
-		if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) != -1) 
-			width = ws.ws_col;
-
-		columns = width / (m + 2);
-		columns = MAX(columns, 1);
-		colspace = width / columns;
-	}
-
 	qsort(d, n, sizeof(*d), sdirent_comp);
 
 	for (n = 0; d[n] != NULL; n++) {
@@ -615,7 +578,7 @@
 		fname = path_strip(tmp, strip_path);
 		xfree(tmp);
 
-		if (lflag & LONG_VIEW) {
+		if (lflag) {
 			char *lname;
 			struct stat sb;
 
@@ -625,20 +588,13 @@
 			printf("%s\n", lname);
 			xfree(lname);
 		} else {
-			printf("%-*s", colspace, fname);
-			if (c >= columns) {
-				printf("\n");
-				c = 1;
-			} else
-				c++;
+			/* XXX - multicolumn display would be nice here */
+			printf("%s\n", fname);
 		}
 
 		xfree(fname);
 	}
 
-	if (!(lflag & LONG_VIEW) && (c != 1))
-		printf("\n");
-
 	free_sftp_dirents(d);
 	return (0);
 }
@@ -649,8 +605,9 @@
     int lflag)
 {
 	glob_t g;
-	int i, c = 1, colspace = 0, columns = 1;
+	int i;
 	Attrib *a;
+	struct stat sb;
 
 	memset(&g, 0, sizeof(g));
 
@@ -677,31 +634,12 @@
 		}
 	}
 
-	if (!(lflag & SHORT_VIEW)) {
-		int m = 0, width = 80;
-		struct winsize ws;	
-
-		/* Count entries for sort and find longest filename */
- 		for (i = 0; g.gl_pathv[i]; i++)
-			m = MAX(m, strlen(g.gl_pathv[i]));
-
-		if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) != -1)
-			width = ws.ws_col;
-
-		columns = width / (m + 2);
-		columns = MAX(columns, 1);
-		colspace = width / columns;
-	}
-
 	for (i = 0; g.gl_pathv[i]; i++) {
-		char *fname;
+		char *fname, *lname;
 
 		fname = path_strip(g.gl_pathv[i], strip_path);
 
-		if (lflag & LONG_VIEW) {
-			char *lname;
-			struct stat sb;
-
+		if (lflag) {
 			/*
 			 * XXX: this is slow - 1 roundtrip per path
 			 * A solution to this is to fork glob() and
@@ -717,19 +655,12 @@
 			printf("%s\n", lname);
 			xfree(lname);
 		} else {
-			printf("%-*s", colspace, fname);
-			if (c >= columns) {
-				printf("\n");
-				c = 1;
-			} else
-				c++;
+			/* XXX - multicolumn display would be nice here */
+			printf("%s\n", fname);
 		}
 		xfree(fname);
 	}
 
-	if (!(lflag & LONG_VIEW) && (c != 1))
-		printf("\n");
-
 	if (g.gl_pathc)
 		globfree(&g);
 
@@ -737,7 +668,7 @@
 }
 
 static int
-parse_args(const char **cpp, int *pflag, int *lflag, int *iflag,
+parse_args(const char **cpp, int *pflag, int *lflag,
     unsigned long *n_arg, char **path1, char **path2)
 {
 	const char *cmd, *cp = *cpp;
@@ -749,17 +680,10 @@
 	/* Skip leading whitespace */
 	cp = cp + strspn(cp, WHITESPACE);
 
-	/* Ignore blank lines and lines which begin with comment '#' char */
-	if (*cp == '\0' || *cp == '#')
-		return (0);
+	/* Ignore blank lines */
+	if (!*cp)
+		return(-1);
 
-	/* Check for leading '-' (disable error processing) */
-	*iflag = 0;
-	if (*cp == '-') {
-		*iflag = 1;
-		cp++;
-	}
-		
 	/* Figure out which command we have */
 	for (i = 0; cmds[i].c; i++) {
 		int cmdlen = strlen(cmds[i].c);
@@ -781,7 +705,7 @@
 		cmdnum = I_SHELL;
 	} else if (cmdnum == -1) {
 		error("Invalid command.");
-		return (-1);
+		return(-1);
 	}
 
 	/* Get arguments and parse flags */
@@ -881,7 +805,6 @@
 	case I_LPWD:
 	case I_HELP:
 	case I_VERSION:
-	case I_PROGRESS:
 		break;
 	default:
 		fatal("Command not implemented");
@@ -892,11 +815,10 @@
 }
 
 static int
-parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
-    int err_abort)
+parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd)
 {
 	char *path1, *path2, *tmp;
-	int pflag, lflag, iflag, cmdnum, i;
+	int pflag, lflag, cmdnum, i;
 	unsigned long n_arg;
 	Attrib a, *aa;
 	char path_buf[MAXPATHLEN];
@@ -904,22 +826,14 @@
 	glob_t g;
 
 	path1 = path2 = NULL;
-	cmdnum = parse_args(&cmd, &pflag, &lflag, &iflag, &n_arg,
+	cmdnum = parse_args(&cmd, &pflag, &lflag, &n_arg,
 	    &path1, &path2);
 
-	if (iflag != 0)
-		err_abort = 0;
-
 	memset(&g, 0, sizeof(g));
 
 	/* Perform command */
 	switch (cmdnum) {
-	case 0:
-		/* Blank line */
-		break;
 	case -1:
-		/* Unrecognized command */
-		err = -1;
 		break;
 	case I_GET:
 		err = process_get(conn, path1, path2, *pwd, pflag);
@@ -941,9 +855,8 @@
 		remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g);
 		for (i = 0; g.gl_pathv[i]; i++) {
 			printf("Removing %s\n", g.gl_pathv[i]);
-			err = do_rm(conn, g.gl_pathv[i]);
-			if (err != 0 && err_abort)
-				break;
+			if (do_rm(conn, g.gl_pathv[i]) == -1)
+				err = -1;
 		}
 		break;
 	case I_MKDIR:
@@ -996,7 +909,8 @@
 			tmp = *pwd;
 
 		path1 = make_absolute(path1, *pwd);
-		err = do_globbed_ls(conn, path1, tmp, lflag);
+
+		do_globbed_ls(conn, path1, tmp, lflag);
 		break;
 	case I_LCHDIR:
 		if (chdir(path1) == -1) {
@@ -1030,70 +944,62 @@
 		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]);
-			err = do_setstat(conn, g.gl_pathv[i], &a);
-			if (err != 0 && err_abort)
-				break;
+			do_setstat(conn, g.gl_pathv[i], &a);
 		}
 		break;
 	case I_CHOWN:
-	case I_CHGRP:
 		path1 = make_absolute(path1, *pwd);
 		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))) {
-				if (err != 0 && err_abort)
-					break;
-				else
-					continue;
-			}
+			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]);
-				if (err != 0 && err_abort)
-					break;
-				else
-					continue;
+				continue;
 			}
+			printf("Changing owner on %s\n", g.gl_pathv[i]);
 			aa->flags &= SSH2_FILEXFER_ATTR_UIDGID;
-			if (cmdnum == I_CHOWN) {
-				printf("Changing owner on %s\n", g.gl_pathv[i]);
-				aa->uid = n_arg;
-			} else {
-				printf("Changing group on %s\n", g.gl_pathv[i]);
-				aa->gid = n_arg;
+			aa->uid = n_arg;
+			do_setstat(conn, g.gl_pathv[i], aa);
+		}
+		break;
+	case I_CHGRP:
+		path1 = make_absolute(path1, *pwd);
+		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;
 			}
-			err = do_setstat(conn, g.gl_pathv[i], aa);
-			if (err != 0 && err_abort)
-				break;
+			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);
 		}
 		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", strerror(errno));
-			err = -1;
-			break;
-		}
-		printf("Local working directory: %s\n", path_buf);
+		if (!getcwd(path_buf, sizeof(path_buf)))
+			error("Couldn't get local cwd: %s",
+			    strerror(errno));
+		else
+			printf("Local working directory: %s\n",
+			    path_buf);
 		break;
 	case I_QUIT:
-		/* Processed below */
-		break;
+		return(-1);
 	case I_HELP:
 		help();
 		break;
 	case I_VERSION:
 		printf("SFTP protocol version %u\n", sftp_proto_version(conn));
 		break;
-	case I_PROGRESS:
-		showprogress = !showprogress;
-		if (showprogress)
-			printf("Progress meter enabled\n");
-		else
-			printf("Progress meter disabled\n");
-		break;
 	default:
 		fatal("%d is not implemented", cmdnum);
 	}
@@ -1105,23 +1011,20 @@
 	if (path2)
 		xfree(path2);
 
-	/* If an unignored error occurs in batch mode we should abort. */
-	if (err_abort && err != 0)
-		return (-1);
-	else if (cmdnum == I_QUIT)
-		return (1);
+	/* If an error occurs in batch mode we should abort. */
+	if (infile != stdin && err > 0)
+		return -1;
 
-	return (0);
+	return(0);
 }
 
-int
+void
 interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
 {
 	char *pwd;
 	char *dir = NULL;
 	char cmd[2048];
 	struct sftp_conn *conn;
-	int err;
 
 	conn = do_init(fd_in, fd_out, copy_buffer_len, num_requests);
 	if (conn == NULL)
@@ -1138,8 +1041,7 @@
 		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)
-				return (-1);
+			parse_dispatch_command(conn, cmd, &pwd);
 		} else {
 			if (file2 == NULL)
 				snprintf(cmd, sizeof cmd, "get %s", dir);
@@ -1147,18 +1049,15 @@
 				snprintf(cmd, sizeof cmd, "get %s %s", dir,
 				    file2);
 
-			err = parse_dispatch_command(conn, cmd, &pwd, 1);
+			parse_dispatch_command(conn, cmd, &pwd);
 			xfree(dir);
-			xfree(pwd);
-			return (err);
+			return;
 		}
 		xfree(dir);
 	}
-
 	setvbuf(stdout, NULL, _IOLBF, 0);
 	setvbuf(infile, NULL, _IOLBF, 0);
 
-	err = 0;
 	for (;;) {
 		char *cp;
 
@@ -1175,13 +1074,8 @@
 		if (cp)
 			*cp = '\0';
 
-		err = parse_dispatch_command(conn, cmd, &pwd, infile != stdin);
-		if (err != 0)
+		if (parse_dispatch_command(conn, cmd, &pwd))
 			break;
 	}
 	xfree(pwd);
-
-	/* err == 1 signifies normal "quit" exit */
-	return (err >= 0 ? 0 : -1);
 }
-