merge 6.1p1

1 files changed, 2 insertions, 8 deletions

diff --git a/sftp.c b/sftp.c
index da7fbab38..235c6ad04 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.134 2011/11/16 12:24:28 oga Exp $ */
+/* $OpenBSD: sftp.c,v 1.136 2012/06/22 14:36:33 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -783,7 +783,6 @@ static int
 do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
     int lflag)
 {
-        Attrib *a = NULL;
         char *fname, *lname;
         glob_t g;
         int err;
@@ -829,7 +828,7 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
                 colspace = width / columns;
         }
 
-        for (i = 0; g.gl_pathv[i] && !interrupted; i++, a = NULL) {
+        for (i = 0; g.gl_pathv[i] && !interrupted; i++) {
                 fname = path_strip(g.gl_pathv[i], strip_path);
                 if (lflag & LS_LONG_VIEW) {
                         if (g.gl_statv[i] == NULL) {
@@ -1934,13 +1933,8 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
                 xfree(dir);
         }
 
-#if defined(HAVE_SETVBUF) && !defined(BROKEN_SETVBUF)
-        setvbuf(stdout, NULL, _IOLBF, 0);
-        setvbuf(infile, NULL, _IOLBF, 0);
-#else
         setlinebuf(stdout);
         setlinebuf(infile);
-#endif
 
         interactive = !batchmode && isatty(STDIN_FILENO);
         err = 0;