Various cleanups

diff --git a/commands/xnu_uuid.c b/commands/xnu_uuid.c
index ecf8ba00a8670f74016bd19ca6aa4bee3454c729..b6f2b260493ad5d7cb5671468c135a8c7fa016bf 100644 (file)
--- a/commands/xnu_uuid.c
+++ b/commands/xnu_uuid.c
@@ -33,7 +33,6 @@
 #include <grub/command.h>
 #include <grub/i18n.h>
 #include <grub/crypto.h>
-#include <grub/i18n.h>
 
 /* This prefix is used by xnu and boot-132 to hash
    together with volume serial. */

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 0f6312ef75cad6da9e8c069f9547356ba0e61a95..bd1798946f1431d4d0e951755dc9212ad181d663 100644 (file)
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -28,7 +28,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c   \
        lib/arg.c normal/cmdline.c normal/datetime.c normal/misc.c      \
        normal/handler.c normal/auth.c lib/crypto.c normal/autofs.c     \
        normal/completion.c normal/main.c normal/color.c                \
-       normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
+       normal/menu.c normal/menu_entry.c               \
        normal/menu_text.c normal/crypto.c normal/term.c                \
        commands/terminal.c lib/charset.c \
        script/main.c script/execute.c script/function.c                \

diff --git a/conf/common.rmk b/conf/common.rmk
index 6d57a75eae359472a6c1ca10a7366b15a943a4e9..3f168937090c7b3cdb92f70bb5558f63bff4cbfd 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -549,7 +549,7 @@ keystatus_mod_LDFLAGS = $(COMMON_LDFLAGS)
 normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
        normal/auth.c normal/autofs.c normal/handler.c \
        normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
-       normal/menu_entry.c normal/menu_text.c normal/menu_viewer.c \
+       normal/menu_entry.c normal/menu_text.c \
        normal/misc.c normal/crypto.c normal/term.c
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 8b69f7796425ee4e546bd8872c98aba95095fb59..c71997d97c84dc586d2b35332c0b6637cb84cdd2 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -21,7 +21,7 @@ kernel_img_SOURCES = kern/i386/coreboot/startup.S \
        kern/i386/halt.c \
        kern/main.c kern/device.c \
        kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-       kern/misc.c kern/mm.c kern/reader.c kern/term.c \
+       kern/misc.c kern/mm.c kern/term.c \
        kern/rescue_parser.c kern/rescue_reader.c \
        kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
        kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
@@ -65,7 +65,7 @@ kernel_img_SOURCES = kern/i386/qemu/startup.S \
        kern/i386/halt.c \
        kern/main.c kern/device.c \
        kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-       kern/misc.c kern/mm.c kern/reader.c kern/term.c \
+       kern/misc.c kern/mm.c kern/term.c \
        kern/rescue_parser.c kern/rescue_reader.c \
        kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
        kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 3a219e71b4521f450411a743cc7f249797113b56..f3281a1bc32b203ae4402047f20048ceb3b2157e 100644 (file)
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -39,7 +39,7 @@ pkglib_MODULES = kernel.img chain.mod appleldr.mod \
 kernel_img_EXPORTS = no
 kernel_img_SOURCES = kern/i386/efi/startup.S kern/main.c kern/device.c \
        kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-       kern/misc.c kern/mm.c kern/reader.c kern/term.c \
+       kern/misc.c kern/mm.c kern/term.c \
        kern/rescue_parser.c kern/rescue_reader.c \
        kern/$(target_cpu)/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
        kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 2a90fd2be9b23f66dfc69f88f90ac7c06b49fad2..5c3a5aaf65901b7ce82178513624514f6b01f524 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -19,7 +19,7 @@ kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
        kern/ieee1275/cmain.c kern/ieee1275/openfw.c \
        kern/main.c kern/device.c \
        kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-       kern/misc.c kern/mm.c kern/reader.c kern/term.c \
+       kern/misc.c kern/mm.c kern/term.c \
        kern/rescue_parser.c kern/rescue_reader.c \
        kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
        kern/env.c \

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index afdf47e5ae89c7a4436cd1061532b8d45f754f19..44a3065810cdf21a64393bf351b0f05c301932e2 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -48,7 +48,7 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
        kern/i386/misc.S \
        kern/main.c kern/device.c \
        kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-       kern/misc.c kern/mm.c kern/reader.c kern/term.c \
+       kern/misc.c kern/mm.c kern/term.c \
        kern/rescue_parser.c kern/rescue_reader.c \
        kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
        kern/$(target_cpu)/dl.c kern/i386/pc/init.c kern/i386/pc/mmap.c \

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 1224552800158b0398105e422010f0a2a41a1b6f..4587e171eb8ecca27e175f3027a9a8bcf45163c9 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -31,7 +31,7 @@ pkglib_PROGRAMS = kernel.img
 kernel_img_SOURCES = kern/powerpc/ieee1275/startup.S kern/ieee1275/cmain.c \
        kern/ieee1275/ieee1275.c kern/main.c kern/device.c              \
        kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c          \
-       kern/misc.c kern/mm.c kern/reader.c kern/term.c         \
+       kern/misc.c kern/mm.c kern/term.c       \
        kern/rescue_parser.c kern/rescue_reader.c \
        kern/list.c kern/handler.c kern/command.c kern/corecmd.c        \
        kern/ieee1275/init.c                                            \

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 9d020a84fc130aaad5ebd0e600262ceb6762bb90..4ba0986199bc9172a1390a05981b042a659cb5ee 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -35,7 +35,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c        \
        kern/ieee1275/ieee1275.c kern/main.c kern/device.c              \
        kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c          \
-       kern/misc.c kern/mm.c kern/reader.c kern/term.c                 \
+       kern/misc.c kern/mm.c kern/term.c                       \
        kern/rescue_parser.c kern/rescue_reader.c \
        kern/list.c kern/handler.c kern/command.c kern/corecmd.c        \
        kern/sparc64/ieee1275/ieee1275.c                                \

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index a82b352224427d5ce1543b229311a0e70ee0aa3d..4f6ace0572583148cc3c5c0d176b2e489a83d236 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -39,7 +39,7 @@ kernel_img_EXPORTS = no
 kernel_img_SOURCES = kern/x86_64/efi/startup.S kern/x86_64/efi/callwrap.S \
        kern/main.c kern/device.c \
        kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-       kern/misc.c kern/mm.c kern/reader.c kern/term.c \
+       kern/misc.c kern/mm.c kern/term.c \
        kern/rescue_parser.c kern/rescue_reader.c \
        kern/$(target_cpu)/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
        kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \

diff --git a/kern/reader.c b/kern/reader.c
deleted file mode 100644 (file)
index 74698d3..0000000
--- a/kern/reader.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* reader.c - reader support */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/types.h>
-#include <grub/mm.h>
-#include <grub/reader.h>
-#include <grub/parser.h>
-

diff --git a/normal/menu_viewer.c b/normal/menu_viewer.c
deleted file mode 100644 (file)
index b52442f..0000000
--- a/normal/menu_viewer.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/mm.h>
-#include <grub/misc.h>
-#include <grub/env.h>
-#include <grub/menu_viewer.h>
-#include <grub/menu.h>
-#include <grub/auth.h>
-