summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sftp.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a76c408f1..5c00e1863 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
7 [monitor.c sshconnect2.c] 7 [monitor.c sshconnect2.c]
8 remove dead code following 'for (;;)' loops. 8 remove dead code following 'for (;;)' loops.
9 From Steve.McClellan at radisys com, ok markus@ 9 From Steve.McClellan at radisys com, ok markus@
10 - dtucker@cvs.openbsd.org 2012/06/22 14:36:33
11 [sftp.c]
12 Remove unused variable leftover from tab-completion changes.
13 From Steve.McClellan at radisys com, ok markus@
10 14
1120120628 1520120628
12 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null 16 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
diff --git a/sftp.c b/sftp.c
index 22cf31457..235c6ad04 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.135 2012/04/20 03:24:23 djm Exp $ */ 1/* $OpenBSD: sftp.c,v 1.136 2012/06/22 14:36:33 dtucker 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 *
@@ -783,7 +783,6 @@ static int
783do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path, 783do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
784 int lflag) 784 int lflag)
785{ 785{
786 Attrib *a = NULL;
787 char *fname, *lname; 786 char *fname, *lname;
788 glob_t g; 787 glob_t g;
789 int err; 788 int err;
@@ -829,7 +828,7 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
829 colspace = width / columns; 828 colspace = width / columns;
830 } 829 }
831 830
832 for (i = 0; g.gl_pathv[i] && !interrupted; i++, a = NULL) { 831 for (i = 0; g.gl_pathv[i] && !interrupted; i++) {
833 fname = path_strip(g.gl_pathv[i], strip_path); 832 fname = path_strip(g.gl_pathv[i], strip_path);
834 if (lflag & LS_LONG_VIEW) { 833 if (lflag & LS_LONG_VIEW) {
835 if (g.gl_statv[i] == NULL) { 834 if (g.gl_statv[i] == NULL) {