* keyserver.c (keyserver_search_prompt): When --with-colons is enabled,

don't try and fit the search output to the screen size - just dump the
whole list.

2 files changed, 16 insertions, 8 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 953fc815f..6d65b98f4 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-05  David Shaw  <[email protected]>
+
+	* keyserver.c (keyserver_search_prompt): When --with-colons is
+	enabled, don't try and fit the search output to the screen size -
+	just dump the whole list.
+
 2002-11-04  David Shaw  <[email protected]>
 
 	* keyserver.c (keyserver_search_prompt): When --with-colons is
diff --git a/g10/keyserver.c b/g10/keyserver.c
index c8218250a..e09ede6e3 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -624,17 +624,19 @@ keyserver_search_prompt(IOBUF buffer,const char *searchstr)
 	{
 	  desc[i]=keyrec->desc;
 
-	  if(numlines+keyrec->lines>maxlines)
+	  if(!opt.with_colons)
 	    {
-	      if(show_prompt(desc,i,validcount?count:0,searchstr))
-		break;
-	      else
-		numlines=0;
-	    }
+	      if(numlines+keyrec->lines>maxlines)
+		{
+		  if(show_prompt(desc,i,validcount?count:0,searchstr))
+		    break;
+		  else
+		    numlines=0;
+		}
 
+	      print_keyrec(i+1,keyrec);
+	    }
 
-	  if(!opt.with_colons)
-	    print_keyrec(i+1,keyrec);
 	  numlines+=keyrec->lines;
 	  iobuf_close(keyrec->uidbuf);
 	  m_free(keyrec);