In the sqlite shell, change the name of function getline() to local_getline()

to avoid a clash with a library function.  Ticket #400. (CVS 1056)

FossilOrigin-Name: 558969ee8697180c74308f3f880d3240eb575af1

diff --git a/manifest b/manifest
index 2f099757298493591508e581b3b5706ff8a870ed..aa160b9cfe970bcbc7945d6a9a711e51f8b63706 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\stest\sscripts,\sdo\snot\stry\sto\sdelete\sfiles\sthat\sare\sstill\sopen.\nWindows\sdoes\snot\slike\sit\swhen\syou\sdo.\s\sTicket\s#397.\s(CVS\s1055)
-D 2003-07-18T01:25:35
+C In\sthe\ssqlite\sshell,\schange\sthe\sname\sof\sfunction\sgetline()\sto\slocal_getline()\nto\savoid\sa\sclash\swith\sa\slibrary\sfunction.\s\sTicket\s#400.\s(CVS\s1056)
+D 2003-07-18T01:30:59
 F Makefile.in 9ad23ed4ca97f9670c4496432e3fbd4b3760ebde
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -44,7 +44,7 @@ F src/pragma.c 3b4f5a800e7a2145bc1930f323232e297d4eb782
 F src/printf.c 12e45d482ac8abcc6f786fc99e5bed7dd9a51af0
 F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
 F src/select.c 98385a4f8601aad67fc0532570fe48f9833d912e
-F src/shell.c 3ed268908fd69c8fd4b28dbe415075cbf0e3991a
+F src/shell.c c2ba26c850874964f5ec1ebf6c43406f28e44c4a
 F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h.in 54619fa5df4c83b22def66bb3d24808fd03dcbae
 F src/sqliteInt.h fed31c3e6d21b7a8a38048f8f8a07599360f8946
@@ -168,7 +168,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
-P c74107d63ace3d0e51da3b7bd7ee250c2a39205b
-R 661fe384de2ed85ee5763e7e68dc886d
+P 93a2c961b17d2459272e2d8654bd4b972f52fbe1
+R cea9e7eb8d5651e94a3de389de60c2cf
 U drh
-Z c8d38f0133bcc4acbc1424cba79baf46
+Z afb3d221554241843a330036de61dbd9

diff --git a/manifest.uuid b/manifest.uuid
index 5e5b90e1330535f19405c702257d233338204498..dc7f622a136b0f7faaf57e2e9d81f8193a51b2e5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-93a2c961b17d2459272e2d8654bd4b972f52fbe1
\ No newline at end of file
+558969ee8697180c74308f3f880d3240eb575af1
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 3dc17aa975d569a314bcdc6b8a0054ae37242f42..fdbf46faa770d6b4744f8f819ce322ea49f90864 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.81 2003/06/16 00:16:41 drh Exp $
+** $Id: shell.c,v 1.82 2003/07/18 01:30:59 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -40,7 +40,7 @@
 # include <readline/readline.h>
 # include <readline/history.h>
 #else
-# define readline(p) getline(p,stdin)
+# define readline(p) local_getline(p,stdin)
 # define add_history(X)
 # define read_history(X)
 # define write_history(X)
@@ -91,7 +91,7 @@ extern int sqliteIsNumber(const char*);
 ** The interface is like "readline" but no command-line editing
 ** is done.
 */
-static char *getline(char *zPrompt, FILE *in){
+static char *local_getline(char *zPrompt, FILE *in){
   char *zLine;
   int nLine;
   int n;
@@ -136,7 +136,7 @@ static char *getline(char *zPrompt, FILE *in){
 ** Retrieve a single line of input text.  "isatty" is true if text
 ** is coming from a terminal.  In that case, we issue a prompt and
 ** attempt to use "readline" for command-line editing.  If "isatty"
-** is false, use "getline" instead of "readline" and issue no prompt.
+** is false, use "local_getline" instead of "readline" and issue no prompt.
 **
 ** zPrior is a string of prior text retrieved.  If not the empty
 ** string, then issue a continuation prompt.
@@ -145,7 +145,7 @@ static char *one_input_line(const char *zPrior, FILE *in){
   char *zPrompt;
   char *zResult;
   if( in!=0 ){
-    return getline(0, in);
+    return local_getline(0, in);
   }
   if( zPrior && zPrior[0] ){
     zPrompt = continuePrompt;