bk commit into 4.1 tree (jimw:1.2325) BUG#10840

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jwinstead. When jwinstead does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2325 05/06/09 19:44:59 jimw@stripped +1 -0
  Fix use of _cgets() to handle an input line that exceeds our buffer space
  before a newline is found. (Bug #10840)

  client/mysql.cc
    1.207 05/06/09 19:44:09 jimw@stripped +20 -1
    Call _cgets() as many times as necessary to get the full line of input

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	production.mysql.com
# Root:	/usersnfs/jwinstead/my/mysql-4.1-10840

--- 1.206/client/mysql.cc	2005-06-08 00:43:26 +02:00
+++ 1.207/client/mysql.cc	2005-06-09 19:44:09 +02:00
@@ -931,6 +931,7 @@
 {
 #if defined( __WIN__) || defined(OS2) || defined(__NETWARE__)
   char linebuffer[254];
+  String buffer;
 #endif
   char	*line;
   char	in_string=0;
@@ -972,9 +973,24 @@
           *p = '\0';
       }
 #else
+      buffer.length(0);
       /* _cgets() expects the buffer size - 3 as the first byte */
       linebuffer[0]= (char) sizeof(linebuffer) - 3;
-      line= _cgets(linebuffer);
+      do
+      {
+        line= _cgets(linebuffer);
+        buffer.append(line, (unsigned char)linebuffer[1]);
+      /*
+        If _cgets() gets an input line that is linebuffer[0] bytes
+        long, the next call to _cgets() will return immediately with
+        linebuffer[1] == 0, and it does the same thing for input that
+        is linebuffer[0]-1 bytes long. So it appears that even though
+        _cgets() replaces the newline (which is two bytes on Window) with
+        a nil, it still needs the space in the linebuffer for it. This is,
+        naturally, undocumented.
+       */
+      } while (linebuffer[0] <= linebuffer[1] + 1);
+      line= buffer.c_ptr();
 #endif /* __NETWARE__ */
 #else
       if (opt_outfile)
@@ -1031,6 +1047,9 @@
 	status.exit_status=0;
     }
   }
+#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__)
+  buffer.free();
+#endif
   return status.exit_status;
 }