* 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.22 2001/02/14 09:46:03 djm Exp $");
+RCSID("$OpenBSD: sftp-int.c,v 1.27 2001/03/13 22:42:54 djm Exp $");
+
+#include <glob.h>
#include "buffer.h"
#include "xmalloc.h"
#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;
+
+/* Version of server we are speaking to */
+int version;
+
/* Seperators for interactive commands */
#define WHITESPACE " \t\r\n"
#define I_RM 18
#define I_RMDIR 19
#define I_SHELL 20
+#define I_SYMLINK 21
struct CMD {
const char *c;
{ "lchdir", I_LCHDIR },
{ "lls", I_LLS },
{ "lmkdir", I_LMKDIR },
+ { "ln", I_SYMLINK },
{ "lpwd", I_LPWD },
{ "ls", I_LS },
{ "lumask", I_LUMASK },
{ "rename", I_RENAME },
{ "rm", I_RM },
{ "rmdir", I_RMDIR },
+ { "symlink", I_SYMLINK },
{ "!", I_SHELL },
{ "?", I_HELP },
{ NULL, -1}
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("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("!command Execute 'command' in local shell\n");
printf("! Escape to local shell\n");
printf("? Synonym for help\n");
{
char *cp;
- debug("XXX: P = \"%s\"", p);
-
cp = strrchr(p, '/');
if (cp == NULL) {
*ifp = xstrdup(p);
/* 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))
parse_dispatch_command(int in, int out, const char *cmd, char **pwd)
{
char *path1, *path2, *tmp;
- int pflag, cmdnum;
+ 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);
case -1:
break;
case I_GET:
- path1 = make_absolute(path1, *pwd);
- do_download(in, out, path1, path2, pflag);
+ memset(&g, 0, sizeof(g));
+ if (!remote_glob(in, out, path1, 0, NULL, &g)) {
+ if (path2) {
+ /* XXX: target should be directory */
+ error("You cannot specify a target when "
+ "downloading multiple files");
+ err = -1;
+ break;
+ }
+ for(i = 0; g.gl_pathv[i]; i++) {
+ if (!infer_path(g.gl_pathv[i], &path2)) {
+ printf("Fetching %s\n", g.gl_pathv[i]);
+ if (do_download(in, out, g.gl_pathv[i],
+ path2, pflag) == -1)
+ err = -1;
+ free(path2);
+ path2 = NULL;
+ } else
+ err = -1;
+ }
+ } else {
+ if (!path2 && infer_path(path1, &path2)) {
+ err = -1;
+ break;
+ }
+ err = do_download(in, out, path1, path2, pflag);
+ }
break;
case I_PUT:
- path2 = make_absolute(path2, *pwd);
- do_upload(in, out, path1, path2, pflag);
- break;
- case I_RENAME:
+ if (!glob(path1, 0, NULL, &g)) {
+ if (path2) {
+ error("You cannot specify a target when "
+ "uploading multiple files");
+ err = -1;
+ break;
+ }
+ for(i = 0; g.gl_pathv[i]; i++) {
+ if (!infer_path(g.gl_pathv[i], &path2)) {
+ path2 = make_absolute(path2, *pwd);
+ printf("Uploading %s\n", g.gl_pathv[i]);
+ if (do_upload(in, out, g.gl_pathv[i],
+ path2, pflag) == -1)
+ err = -1;
+ free(path2);
+ path2 = NULL;
+ } else
+ err = -1;
+ }
+ } else {
+ if (!path2 && infer_path(path1, &path2)) {
+ err = -1;
+ break;
+ }
+ err = do_upload(in, out, path1, path2, pflag);
+ }
+ break;
+ case I_RENAME:
path1 = make_absolute(path1, *pwd);
path2 = make_absolute(path2, *pwd);
- do_rename(in, out, path1, path2);
+ err = do_rename(in, out, path1, path2);
+ break;
+ case I_SYMLINK:
+ if (version < 3) {
+ error("The server (version %d) does not support "
+ "this operation", version);
+ err = -1;
+ } else {
+ path2 = make_absolute(path2, *pwd);
+ err = do_symlink(in, out, path1, path2);
+ }
break;
case I_RM:
path1 = make_absolute(path1, *pwd);
- do_rm(in, out, path1);
+ remote_glob(in, out, path1, GLOB_NOCHECK, NULL, &g);
+ for(i = 0; g.gl_pathv[i]; i++) {
+ printf("Removing %s\n", g.gl_pathv[i]);
+ if (do_rm(in, out, 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(in, out, path1, &a);
break;
case I_RMDIR:
path1 = make_absolute(path1, *pwd);
- do_rmdir(in, out, path1);
+ err = do_rmdir(in, out, path1);
break;
case I_CHDIR:
path1 = make_absolute(path1, *pwd);
- if ((tmp = do_realpath(in, out, path1)) == NULL)
+ if ((tmp = do_realpath(in, out, path1)) == NULL) {
+ err = 1;
break;
+ }
if ((aa = do_stat(in, out, tmp)) == 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);
do_ls(in, out, 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)
+ 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);
attrib_clear(&a);
a.flags |= SSH2_FILEXFER_ATTR_PERMISSIONS;
a.perm = n_arg;
- do_setstat(in, out, path1, &a);
+ remote_glob(in, out, 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(in, out, g.gl_pathv[i], &a);
+ }
break;
case I_CHOWN:
path1 = make_absolute(path1, *pwd);
- if (!(aa = do_stat(in, out, path1)))
- break;
- if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
- error("Can't get current ownership of "
- "remote file \"%s\"", path1);
- break;
+ remote_glob(in, out, path1, GLOB_NOCHECK, NULL, &g);
+ for(i = 0; g.gl_pathv[i]; i++) {
+ if (!(aa = do_stat(in, out, g.gl_pathv[i])))
+ 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(in, out, g.gl_pathv[i], aa);
}
- aa->flags &= SSH2_FILEXFER_ATTR_UIDGID;
- aa->uid = n_arg;
- do_setstat(in, out, path1, aa);
break;
case I_CHGRP:
path1 = make_absolute(path1, *pwd);
- if (!(aa = do_stat(in, out, path1)))
- break;
- if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) {
- error("Can't get current ownership of "
- "remote file \"%s\"", path1);
- break;
+ remote_glob(in, out, path1, GLOB_NOCHECK, NULL, &g);
+ for(i = 0; g.gl_pathv[i]; i++) {
+ if (!(aa = do_stat(in, out, g.gl_pathv[i])))
+ 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(in, out, g.gl_pathv[i], aa);
}
- aa->flags &= SSH2_FILEXFER_ATTR_UIDGID;
- 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",
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);
}
char *pwd;
char cmd[2048];
+ version = do_init(fd_in, fd_out);
+ if (version == -1)
+ fatal("Couldn't initialise connection to server");
+
pwd = do_realpath(fd_in, fd_out, ".");
if (pwd == NULL)
fatal("Need cwd");
setvbuf(stdout, NULL, _IOLBF, 0);
- setvbuf(stdin, NULL, _IOLBF, 0);
+ setvbuf(infile, NULL, _IOLBF, 0);
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))
break;
}
andersk / openssh.git / blobdiff