From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 12 Jul 2010 11:59:44 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~600^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d18b05c4e3aba167cd3074f6a388419d04183694;p=thirdparty%2Fgrub.git

merge with mainline
---

d18b05c4e3aba167cd3074f6a388419d04183694
diff --cc commands/cat.c
index 3bdafc4c6,77a4cc793..a70118517
--- a/commands/cat.c
+++ b/commands/cat.c
@@@ -23,14 -23,20 +23,20 @@@
  #include <grub/term.h>
  #include <grub/misc.h>
  #include <grub/gzio.h>
- #include <grub/command.h>
+ #include <grub/extcmd.h>
  #include <grub/i18n.h>
  
- static grub_err_t
- grub_cmd_cat (grub_command_t cmd __attribute__ ((unused)),
- 	      int argc, char **args)
+ static const struct grub_arg_option options[] =
+   {
+     {"dos", -1, 0, N_("Accept DOS-style CR/NL line endings."), 0, 0},
+     {0, 0, 0, 0, 0, 0}
+   };
  
+ static grub_err_t
 -grub_cmd_cat (grub_extcmd_t cmd, int argc, char **args)
++grub_cmd_cat (grub_extcmd_context_t ctxt, int argc, char **args)
  {
 -  struct grub_arg_list *state = cmd->state;
++  struct grub_arg_list *state = ctxt->state;
+   int dos = 0;
    grub_file_t file;
    char buf[GRUB_DISK_SECTOR_SIZE];
    grub_ssize_t size;
diff --cc conf/common.rmk
index c437156b7,f92e5bc4c..4ab829470
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@@ -621,9 -634,9 +634,9 @@@ endi
  normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
  	normal/auth.c normal/autofs.c  \
  	normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
- 	normal/menu_entry.c normal/menu_text.c \
+ 	normal/menu_entry.c normal/menu_text.c normal/charset.c \
  	normal/misc.c normal/crypto.c normal/term.c normal/context.c \
- 	script/main.c script/script.c script/execute.c script/argv.c \
 -	script/main.c script/script.c script/execute.c unidata.c \
++	script/main.c script/script.c script/execute.c script/argv.c unidata.c \
  	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
  normal_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
  normal_mod_LDFLAGS = $(COMMON_LDFLAGS)