summaryrefslogtreecommitdiff
path: root/sftp.c
diff options
context:
space:
mode:
authordtucker <dtucker>2007-12-28 15:40:43 +0000
committerdtucker <dtucker>2007-12-28 15:40:43 +0000
commit40d2e5ad4a0514d5fa63c1472e9a667e7f497c94 (patch)
treeb2fc824ab7723f6b928b2c7ab6fd65c24d565dc5 /sftp.c
parentb6842fb92e3c1b106ab504d5dd4d09d5d4b322f1 (diff)
downloadopenssh-40d2e5ad4a0514d5fa63c1472e9a667e7f497c94.tar.gz
- djm@cvs.openbsd.org 2007/12/12 05:04:03
[sftp.c] unbreak lls command and add a regress test that would have caught the breakage; spotted by mouring@
Diffstat (limited to 'sftp.c')
-rw-r--r--sftp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sftp.c b/sftp.c
index e8113875..db0a8d9a 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.97 2007/10/24 03:30:02 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.98 2007/12/12 05:04:03 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -1080,6 +1080,8 @@ parse_args(const char **cpp, int *pflag, int *lflag, int *iflag,
*path1 = xstrdup(argv[optidx]);
break;
case I_LLS:
+ /* Skip ls command and following whitespace */
+ cp = cp + strlen(cmd) + strspn(cp, WHITESPACE);
case I_SHELL:
/* Uses the rest of the line */
break;