2005-11-18 Yoshinori K. Okuji <okuji@enbug.org>

        * conf/powerpc-ieee1275.rmk (grub_script.tab.h): Unified to ...
        (grub_script.tab.c): ... here.

        * conf/sparc64-ieee1275.rmk (grub_script.tab.h): Unified to ...
        (grub_script.tab.c): ... here.

        * conf/i386-pc.rmk (grub_script.tab.h): Unified to ...
        (grub_script.tab.c): ... here.

        * normal/command.c (grub_command_find): Fixed a memory leak of
        MODULE_NAME. Reported by Mike Small <smallm@panix.com>.

diff --git a/ChangeLog b/ChangeLog
index 42731f1180ccb36246144744c60feec3e70f9993..ce928673434cb51039b44ff18813de0b17db9e52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-11-18  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * conf/powerpc-ieee1275.rmk (grub_script.tab.h): Unified to ...
+       (grub_script.tab.c): ... here.
+
+       * conf/sparc64-ieee1275.rmk (grub_script.tab.h): Unified to ...
+       (grub_script.tab.c): ... here.
+
+       * conf/i386-pc.rmk (grub_script.tab.h): Unified to ...
+       (grub_script.tab.c): ... here.
+
+       * normal/command.c (grub_command_find): Fixed a memory leak of
+       MODULE_NAME. Reported by Mike Small <smallm@panix.com>.
+
 2005-11-13  Timothy Baldwin  <T.E.Baldwin99@members.leeds.ac.uk>
 
        * include/grub/symbol.h: (FUNCTION): Use double quotes instead of

diff --git a/conf/i386-pc.mk b/conf/i386-pc.mk
index 29a7579484a666e822e62b41d00508e644e080d1..16ce4c91b905e1323c7f3e8deeacfc4c3281c8a0 100644 (file)
--- a/conf/i386-pc.mk
+++ b/conf/i386-pc.mk
@@ -275,9 +275,7 @@ symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) gensymlist.sh
        sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
 
 # For the parser.
-grub_script.tab.c: normal/parser.y
-       $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-grub_script.tab.h: normal/parser.y
+grub_script.tab.c grub_script.tab.h: normal/parser.y
        $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
 
 

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 90ce49529604dbf5fe70281711c035da44f994b5..edf9a963ef98ca384d9c90c948e56beaa24d766f 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -47,9 +47,7 @@ symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) gensymlist.sh
        sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
 
 # For the parser.
-grub_script.tab.c: normal/parser.y
-       $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-grub_script.tab.h: normal/parser.y
+grub_script.tab.c grub_script.tab.h: normal/parser.y
        $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
 
 

diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index b322f987abfcff4a38d0822432cae58bbe244ef5..9c581540be76facb651cee7662a08be380cc8bc5 100644 (file)
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -22,9 +22,7 @@ kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) genkernsyms.sh
        sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
 
 # For the parser.
-grub_script.tab.c: normal/parser.y
-       $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-grub_script.tab.h: normal/parser.y
+grub_script.tab.c grub_script.tab.h: normal/parser.y
        $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
 
 # Programs

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 56f7678eb4c3a84f9d7cf9e89d926a0f6fdfccc2..a71aea3e6cbf25875a382475c1d813a2c4967f74 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -22,9 +22,7 @@ kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) genkernsyms.sh
        sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
 
 # For the parser.
-grub_script.tab.c: normal/parser.y
-       $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-grub_script.tab.h: normal/parser.y
+grub_script.tab.c grub_script.tab.h: normal/parser.y
        $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
 
 # Programs

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index a93641a1d2dea3315b0562df2bd3aacebf847d55..38884c8282276a2de9d39815f3bbde0a01c29377 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -20,9 +20,7 @@ grubof_symlist.c: $(addprefix include/grub/,$(grubof_HEADERS)) gensymlist.sh
        sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
 
 # For the parser.
-grub_script.tab.c: normal/parser.y
-       $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-grub_script.tab.h: normal/parser.y
+grub_script.tab.c grub_script.tab.h: normal/parser.y
        $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
 
 kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) genkernsyms.sh

diff --git a/normal/command.c b/normal/command.c
index 5df26e7c0126234ab37e39e85b59d89765e1976d..19179b41b41001b06219c38ca98358a88007084f 100644 (file)
--- a/normal/command.c
+++ b/normal/command.c
@@ -152,6 +152,7 @@ grub_command_find (char *cmdline)
                {
                  grub_dl_ref (mod);
                  count++;
+                 grub_free (module_name);
                  goto again;
                }