From 099fc1634e1cc0f96b77a811e554bf9d796def8f Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 10 May 2010 11:56:50 +1000 Subject: - dtucker@cvs.openbsd.org 2010/05/05 04:22:09 [sftp.c] restore mput and mget which got lost in the tab-completion changes. found by Kenneth Whitaker, ok djm@ --- sftp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sftp.c') diff --git a/sftp.c b/sftp.c index d65d4ec62..5366c075f 100644 --- a/sftp.c +++ b/sftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.123 2010/01/27 19:21:39 djm Exp $ */ +/* $OpenBSD: sftp.c,v 1.124 2010/05/05 04:22:09 dtucker Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller * @@ -181,6 +181,8 @@ static const struct CMD cmds[] = { { "ls", I_LS, REMOTE }, { "lumask", I_LUMASK, NOARGS }, { "mkdir", I_MKDIR, REMOTE }, + { "mget", I_GET, REMOTE }, + { "mput", I_PUT, LOCAL }, { "progress", I_PROGRESS, NOARGS }, { "put", I_PUT, LOCAL }, { "pwd", I_PWD, REMOTE }, -- cgit v1.2.3 From 99ac4e9546b2eafc43e104d676a3b10866be98e9 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 26 Jun 2010 09:36:58 +1000 Subject: - djm@cvs.openbsd.org 2010/06/18 00:58:39 [sftp.c] unbreak ls in working directories that contains globbing characters in their pathnames. bz#1655 reported by vgiffin AT apple.com --- ChangeLog | 4 ++++ sftp.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'sftp.c') diff --git a/ChangeLog b/ChangeLog index b052a202c..57ddea6ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,10 @@ sizeof(state) with sizeof(*state). This worked by accident since the struct contained a single int at present, but could have broken in the future. patch from hyc AT symas.com + - djm@cvs.openbsd.org 2010/06/18 00:58:39 + [sftp.c] + unbreak ls in working directories that contains globbing characters in + their pathnames. bz#1655 reported by vgiffin AT apple.com 20100622 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512 diff --git a/sftp.c b/sftp.c index 5366c075f..229f12987 100644 --- a/sftp.c +++ b/sftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.124 2010/05/05 04:22:09 dtucker Exp $ */ +/* $OpenBSD: sftp.c,v 1.125 2010/06/18 00:58:39 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller * @@ -1368,7 +1368,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd, break; case I_LS: if (!path1) { - do_globbed_ls(conn, *pwd, *pwd, lflag); + do_ls_dir(conn, *pwd, *pwd, lflag); break; } -- cgit v1.2.3