From 26887f221a602b78c4cf1b7a6fadcd57aded22ad Mon Sep 17 00:00:00 2001
From: proski <proski@localhost>
Date: Wed, 2 Apr 2008 07:29:59 +0000
Subject: [PATCH] 2008-04-02  Pavel Roskin  <proski@gnu.org>

	* genkernsyms.sh.in: Use more robust assignments for CC and
	srcdir.  Quote srcdir.
	* gensymlist.sh.in: Likewise.  Assert at the compile time that
	the symbol table is not empty.
---
 ChangeLog         | 5 +++++
 genkernsyms.sh.in | 6 +++---
 gensymlist.sh.in  | 9 ++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e48cc14bf..68e5327f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-04-02  Pavel Roskin  <proski@gnu.org>
 
+	* genkernsyms.sh.in: Use more robust assignments for CC and
+	srcdir.  Quote srcdir.
+	* gensymlist.sh.in: Likewise.  Assert at the compile time that
+	the symbol table is not empty.
+
 	* disk/raid.c (grub_raid_memberlist): Fix a signedness warning.
 	* fs/cpio.c (grub_cpio_read): Likewise.
 
diff --git a/genkernsyms.sh.in b/genkernsyms.sh.in
index 1a4e34441..a5e1271a5 100644
--- a/genkernsyms.sh.in
+++ b/genkernsyms.sh.in
@@ -13,10 +13,10 @@
 
 ### The configure script will replace these variables.
 
-srcdir=@srcdir@
-CC="@CC@"
+: ${srcdir=@srcdir@}
+: ${CC=@CC@}
 
-$CC -DGRUB_SYMBOL_GENERATOR=1 -E -I. -Iinclude -I$srcdir/include $* \
+$CC -DGRUB_SYMBOL_GENERATOR=1 -E -I. -Iinclude -I"$srcdir/include" $* \
   | grep -v '^#' \
   | sed -n \
         -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/\1 kernel/;p;}' \
diff --git a/gensymlist.sh.in b/gensymlist.sh.in
index c704d266a..d8b987157 100644
--- a/gensymlist.sh.in
+++ b/gensymlist.sh.in
@@ -13,8 +13,8 @@
 
 ### The configure script will replace these variables.
 
-srcdir=@srcdir@
-CC=@CC@
+: ${srcdir=@srcdir@}
+: ${CC=@CC@}
 
 
 cat <<EOF
@@ -45,6 +45,8 @@ done
 
 cat <<EOF
 
+#define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; }
+
 void
 grub_register_exported_symbols (void)
 {
@@ -57,7 +59,7 @@ cat <<EOF
     {
 EOF
 
-$CC -DGRUB_SYMBOL_GENERATOR=1 -E -I. -Iinclude -I$srcdir/include $* \
+$CC -DGRUB_SYMBOL_GENERATOR=1 -E -I. -Iinclude -I"$srcdir/include" $* \
   | grep -v '^#' \
   | sed -n \
         -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/      {"\1", \1},/;p;}' \
@@ -68,6 +70,7 @@ cat <<EOF
       {0, 0}
     };
 
+  COMPILE_TIME_ASSERT (sizeof (tab) > sizeof (tab[0]));
   for (p = tab; p->name; p++)
     grub_dl_register_symbol (p->name, p->addr, 0);
 }