diff options
author | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
commit | 31e30b835fd9695d3b6647cab4867001b092e28f (patch) | |
tree | 138e715c25661825457c7280cd66e3f4853d474c /sftp.c | |
parent | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (diff) | |
parent | 43094ebf14c9b16f1ea398bc5b65a7335e947288 (diff) |
merge 5.6p1
Diffstat (limited to 'sftp.c')
-rw-r--r-- | sftp.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.123 2010/01/27 19:21:39 djm Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.125 2010/06/18 00:58:39 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -181,6 +181,8 @@ static const struct CMD cmds[] = { | |||
181 | { "ls", I_LS, REMOTE }, | 181 | { "ls", I_LS, REMOTE }, |
182 | { "lumask", I_LUMASK, NOARGS }, | 182 | { "lumask", I_LUMASK, NOARGS }, |
183 | { "mkdir", I_MKDIR, REMOTE }, | 183 | { "mkdir", I_MKDIR, REMOTE }, |
184 | { "mget", I_GET, REMOTE }, | ||
185 | { "mput", I_PUT, LOCAL }, | ||
184 | { "progress", I_PROGRESS, NOARGS }, | 186 | { "progress", I_PROGRESS, NOARGS }, |
185 | { "put", I_PUT, LOCAL }, | 187 | { "put", I_PUT, LOCAL }, |
186 | { "pwd", I_PWD, REMOTE }, | 188 | { "pwd", I_PWD, REMOTE }, |
@@ -1366,7 +1368,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd, | |||
1366 | break; | 1368 | break; |
1367 | case I_LS: | 1369 | case I_LS: |
1368 | if (!path1) { | 1370 | if (!path1) { |
1369 | do_globbed_ls(conn, *pwd, *pwd, lflag); | 1371 | do_ls_dir(conn, *pwd, *pwd, lflag); |
1370 | break; | 1372 | break; |
1371 | } | 1373 | } |
1372 | 1374 | ||