1 files changed, 54 insertions, 18 deletions

diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 6d81e5e..1471630 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -1,3 +1,3 @@
-%option backup nostdinit noyywrap full ecs
+%option backup nostdinit noyywrap never-interactive full ecs
 %option 8bit backup nodefault perf-report perf-report
 %x COMMAND HELP STRING PARAM
@@ -8,4 +8,5 @@
  */
 
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -15,5 +16,4 @@
 #define LKC_DIRECT_LINK
 #include "lkc.h"
-#include "zconf.tab.h"
 
         #define START_STRSIZE16
@@ -84,6 +84,4 @@ n	[A-Za-z0-9_]
         .{
         unput(yytext[0]);
-        //printf("new config: ");
-        //symbol_end(NULL);
         BEGIN(COMMAND);
 }
@@ -144,30 +142,44 @@ n	[A-Za-z0-9_]
                 return T_WORD;
         }
+                \\\ncurrent_file->lineno++;
         .
+        <<EOF>> {
+                BEGIN(INITIAL);
+        }
 }
 
 <STRING>{
-                [^'"\n\\]+{
+                [^'"\\\n]+/\n{
+                append_string(yytext, yyleng);
+                zconflval.string = text;
+                return T_STRING;
+        }
+                [^'"\\\n]+{
                 append_string(yytext, yyleng);
         }
+                \\.?/\n{
+                append_string(yytext + 1, yyleng - 1);
+                zconflval.string = text;
+                return T_STRING;
+        }
+                \\.?{
+                append_string(yytext + 1, yyleng - 1);
+        }
                 \'|\"{
                 if (str == yytext[0]) {
                         BEGIN(PARAM);
                         zconflval.string = text;
-                        //printf("s:%s\n", text);
                         return T_STRING;
                 } else
                         append_string(yytext, 1);
         }
-                \\[ \t]*\nappend_string(yytext+yyleng-1, 1); current_file->lineno++;
-                \\[ \t]*append_string(yytext+1, yyleng-1);
-                \\.     append_string(yytext+1, 1);
                 \n{
-                //printf(":%d: open string!\n", current_file->lineno+1);
-                exit(0);
+                printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());
+                current_file->lineno++;
+                BEGIN(INITIAL);
+                return T_EOL;
         }
                 <<EOF>>{
-                //printf(":%d: open string!\n", current_file->lineno+1);
-                exit(0);
+                BEGIN(INITIAL);
         }
 }
@@ -222,4 +234,5 @@ n	[A-Za-z0-9_]
                 return T_EOF;
         }
+        fclose(yyin);
         yyterminate();
 }
@@ -239,12 +252,36 @@ static void zconf_endhelp(void)
 }
 
+
+/* 
+ * Try to open specified file with following names:
+ * ./name
+ * $(srctree)/name
+ * The latter is used when srctree is separate from objtree
+ * when compiling the kernel.
+ * Return NULL if file is not found.
+ */
+FILE *zconf_fopen(const char *name)
+{
+        char *env, fullname[PATH_MAX+1];
+        FILE *f;
+
+        f = fopen(name, "r");
+        if (!f && name[0] != '/') {
+                env = getenv(SRCTREE);
+                if (env) {
+                        sprintf(fullname, "%s/%s", env, name);
+                        f = fopen(fullname, "r");
+                }
+        }
+        return f;
+}
+
 void zconf_initscan(const char *name)
 {
-        yyin = fopen(name, "r");
+        yyin = zconf_fopen(name);
         if (!yyin) {
                 printf("can't find file %s\n", name);
                 exit(1);
         }
-        //fprintf(stderr, "zconf_initscan: %s\n", name);
 
         current_buf = malloc(sizeof(*current_buf));
@@ -263,5 +300,5 @@ void zconf_nextfile(const char *name)
 
         current_buf->state = YY_CURRENT_BUFFER;
-        yyin = fopen(name, "r");
+        yyin = zconf_fopen(name);
         if (!yyin) {
                 printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name);
@@ -272,6 +309,4 @@ void zconf_nextfile(const char *name)
         current_buf = buf;
 
-        //fprintf(stderr, "zconf_nextfile: %s\n", name);
-
         if (file->flags & FILE_BUSY) {
                 printf("recursive scan (%s)?\n", name);
@@ -298,4 +333,5 @@ static struct buffer *zconf_endfile(void)
         parent = current_buf->parent;
         if (parent) {
+                fclose(yyin);
                 yy_delete_buffer(YY_CURRENT_BUFFER);
                 yy_switch_to_buffer(parent->state);