Undo bison changes, they don't work with flex.

Use flex by default.
Fix bug in new sstring code.

diff --git a/build.mk.in b/build.mk.in
index 827e105b0656d36aef6d4047d09ae13afb319c83..f9b3cefe632c11d17c1fb77986787207bef3fe60 100644 (file)
--- a/build.mk.in
+++ b/build.mk.in
@@ -4,6 +4,7 @@ INCPATH=../
 
 CFLAGS=
 CC=gcc
+LEX=flex
 
 @sinclude@ @includel@$(INCPATH)settings.mk@includel@
 

diff --git a/newsearch/newsearch.l b/newsearch/newsearch.l
index 360a5fd8dc9ea9b58bad4655f73666f759cf2d50..a233c14dcafdcc770449a2d2c148835a020f2969 100644 (file)
--- a/newsearch/newsearch.l
+++ b/newsearch/newsearch.l
@@ -13,16 +13,6 @@ extern YYSTYPE yylval;
 
 #define MAX_STR_CONST 512
 
-/* shuts gcc up */
-static void yyunput (int c,char *buf_ptr);
-void newsearch_parser_dummy(void) {
-  yyunput(0, NULL);
-}
-
-int fileno(void *arg) {
-  return 0;
-}
-
 %}
 
 digit          [0-9]

diff --git a/newsearch/newsearch.y b/newsearch/newsearch.y
index 0dc2a04bcae11a634459470a365d1839c24443d9..b8a5341984a818b28169f9f2d1bc4a39e60ba45c 100644 (file)
--- a/newsearch/newsearch.y
+++ b/newsearch/newsearch.y
@@ -59,7 +59,7 @@ invocation: LPAREN function argumentlist RPAREN
     stackpos--;
     count = stackcount[stackpos];
     
-    pfn = functionfinder(str, fnfarg);
+    pfn = functionfinder(str->content, fnfarg);
     if(!pfn) {
       parse_free(&sresult);
       YYERROR;