2003-03-10 Yoshinori K. Okuji <okuji@enbug.org>

	From Tilmann Bubeck:
	* stage2/builtins.c [SUPPORT_SERIAL] (terminfo_func): Unescape
	arguments before copying them, and escape sequences before
	printing them.
	* stage2/terminfo.h (TERMINFO_LEN): Changed to 40.

diff --git a/ChangeLog b/ChangeLog
index 3e4253b49159c417520dc51c6fa7b8f2c48a6e27..f013d19c68dc59fd5105d8fd0a6d720c1f8f7b01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-10  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       From Tilmann Bubeck:
+       * stage2/builtins.c [SUPPORT_SERIAL] (terminfo_func): Unescape
+       arguments before copying them, and escape sequences before
+       printing them.
+       * stage2/terminfo.h (TERMINFO_LEN): Changed to 40.
+
 2003-02-20  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * util/grub-install.in (find_device): Fix the sed script.

diff --git a/docs/grub.8 b/docs/grub.8
index 52665e53cdc13cd02a498f4b32e87998fbae352a..65c65906e4e319a492ae7844f9048de56eddc82d 100644 (file)
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB "8" "February 2003" "grub (GNU GRUB 0.93)" FSF
+.TH GRUB "8" "March 2003" "grub (GNU GRUB 0.93)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS

diff --git a/stage2/builtins.c b/stage2/builtins.c
index 68fbca8e8c8e8ebe089deb84c37008e12047185e..1b5d1f21ec2cc565abfccecc8cabd5df24fd1d31 100644 (file)
--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -1,7 +1,7 @@
 /* builtins.c - the GRUB builtin commands */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002  Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2000,2001,2002,2003  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -4188,7 +4188,7 @@ terminfo_func (char *arg, int flags)
              
              if (! grub_memcmp (arg, name, len))
                {
-                 grub_strcpy (options[i].var, arg + len);
+                 grub_strcpy (options[i].var, ti_unescape_string (arg + len));
                  break;
                }
            }
@@ -4215,11 +4215,16 @@ terminfo_func (char *arg, int flags)
       /* No option specifies printing out current settings.  */
       term = ti_get_term ();
 
-      grub_printf ("name=%s\n", term.name);
-      grub_printf ("cursor_address=%s\n", term.cursor_address);
-      grub_printf ("clear_screen=%s\n", term.clear_screen);
-      grub_printf ("enter_standout_mode=%s\n", term.enter_standout_mode);
-      grub_printf ("exit_standout_mode=%s\n", term.exit_standout_mode);
+      grub_printf ("name=%s\n",
+                  ti_escape_string (term.name));
+      grub_printf ("cursor_address=%s\n",
+                  ti_escape_string (term.cursor_address));
+      grub_printf ("clear_screen=%s\n",
+                  ti_escape_string (term.clear_screen));
+      grub_printf ("enter_standout_mode=%s\n",
+                  ti_escape_string (term.enter_standout_mode));
+      grub_printf ("exit_standout_mode=%s\n",
+                  ti_escape_string (term.exit_standout_mode));
     }
 
   return 0;

diff --git a/stage2/terminfo.h b/stage2/terminfo.h
index 28c832e3c0785e97dfc687ddcd7844294e1331db..aad054a54212915341979801ca14a423a24e74f7 100644 (file)
--- a/stage2/terminfo.h
+++ b/stage2/terminfo.h
@@ -1,7 +1,7 @@
 /* terminfo.h - read a terminfo entry from the command line */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002  Free Software Foundation, Inc.
+ *  Copyright (C) 2002,2003  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 #ifndef GRUB_TERMCAP_HEADER
 #define GRUB_TERMCAP_HEADER    1
 
-#define TERMINFO_LEN 32
+#define TERMINFO_LEN 40
 
 typedef struct terminfo
 {