Patch the command-line error message printing for lemon. Ticket #1120. (CVS 2345)

FossilOrigin-Name: 97c7aaf1870a86955f0f3a0cbe06187e3c3ccc90

diff --git a/manifest b/manifest
index db148eea0896994adf5305a221970275730cece4..1241492f67c89df0f0606e52e96a4778cef894cd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Get\svacuum\sworking\son\sdatabase\sthat\sused\sto\shave\sautoincrement\stables\sbut\r\nwhere\sall\ssuch\stables\shave\sbeen\sdropped.\s\sTicket\s#1121.\s(CVS\s2344)
-D 2005-02-16T03:27:05
+C Patch\sthe\scommand-line\serror\smessage\sprinting\sfor\slemon.\s\sTicket\s#1120.\s(CVS\s2345)
+D 2005-02-16T03:35:16
 F Makefile.in 76443a83549d1539105e12d13bd0054a05ab2214
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -212,7 +212,7 @@ F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/view.test 306cc4342eb03c28de1a92c681836189e03e5af9
 F test/where.test ffb790dfda75d977bae7a1f5830351623f76861b
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
-F tool/lemon.c 4a3b5ccc76d959b8caa5f127d23a7e14d4470b4e
+F tool/lemon.c c88936c67f6411608db8fa4254d254f509fa40f6
 F tool/lempar.c e8b0eb00a6b905ce2ebd55965ed243574482cd5f
 F tool/memleak.awk 4e7690a51bf3ed757e611273d43fe3f65b510133
 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
@@ -273,7 +273,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P dbd11a0c581b447bb2f220a1a185d9fd36933ee3
-R 3e933ca53eeeb55c0d837e7fbde35ff0
+P 8f7c639da0f862fa2dd2f55eb7e4d453cd321540
+R 61bdc6a34c127141b24a0efa6620c3ab
 U drh
-Z 495b7f43a6bd00411892cdab27def873
+Z 89a02ac9cc492af6103ac23f25fbf293

diff --git a/manifest.uuid b/manifest.uuid
index cf0e00806dfeec959f59968f16e5d4631a58f6a5..9f30e6a5bfa960a84946c609afc970f3bae9ff4e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8f7c639da0f862fa2dd2f55eb7e4d453cd321540
\ No newline at end of file
+97c7aaf1870a86955f0f3a0cbe06187e3c3ccc90
\ No newline at end of file

diff --git a/tool/lemon.c b/tool/lemon.c
index b24dd028b19768c1f8ce2859244f4faf4b7c3109..8f6e87330a53107940d7f586afb7c1b3c200f502 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -1606,12 +1606,11 @@ int k;
 FILE *err;
 {
   int spcnt, i;
-  spcnt = 0;
   if( argv[0] ) fprintf(err,"%s",argv[0]);
   spcnt = strlen(argv[0]) + 1;
   for(i=1; i<n && argv[i]; i++){
     fprintf(err," %s",argv[i]);
-    spcnt += strlen(argv[i]+1);
+    spcnt += strlen(argv[i])+1;
   }
   spcnt += k;
   for(; argv[i]; i++) fprintf(err," %s",argv[i]);