--- embedaddon/lighttpd/src/lemon.c	2013/10/14 10:32:47	1.1.1.1
+++ embedaddon/lighttpd/src/lemon.c	2016/11/02 10:35:00	1.1.1.3
@@ -1,3 +1,5 @@
+#include "first.h"
+
 /*
 ** This file contains all sources (including headers) to the LEMON
 ** LALR(1) parser generator.  The sources have been combined into a
@@ -12,10 +14,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
@@ -1613,12 +1611,14 @@ int n;
 int k;
 FILE *err;
 {
-  int spcnt, i;
-  if( argv[0] ) fprintf(err,"%s",argv[0]);
-  spcnt = strlen(argv[0]) + 1;
+  int spcnt = 0, i;
+  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]);