From 16f820c8c58f39a8c54f39ad45b24316b83ff130 Mon Sep 17 00:00:00 2001 From: okuji Date: Fri, 18 Nov 2005 10:51:00 +0000 Subject: [PATCH] 2005-11-18 Yoshinori K. Okuji * 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 . --- ChangeLog | 14 ++++++++++++++ conf/i386-pc.mk | 4 +--- conf/i386-pc.rmk | 4 +--- conf/powerpc-ieee1275.mk | 4 +--- conf/powerpc-ieee1275.rmk | 4 +--- conf/sparc64-ieee1275.rmk | 4 +--- normal/command.c | 1 + 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42731f118..ce9286734 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-11-18 Yoshinori K. Okuji + + * 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 . + 2005-11-13 Timothy Baldwin * include/grub/symbol.h: (FUNCTION): Use double quotes instead of diff --git a/conf/i386-pc.mk b/conf/i386-pc.mk index 29a757948..16ce4c91b 100644 --- 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 90ce49529..edf9a963e 100644 --- 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 b322f987a..9c581540b 100644 --- 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 56f7678eb..a71aea3e6 100644 --- 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 a93641a1d..38884c828 100644 --- 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 5df26e7c0..19179b41b 100644 --- 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; } -- 2.47.3