mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-26 00:59:55 +00:00
2002-11-30 Yoshinori K. Okuji <okuji@enbug.org>
* docs/Makefile.am (man_MANS): Added grub-terminfo.8. ($(srcdir)/grub_terminfo.8): New target. * utils/grub-terminfo.in: New file. * util/Makefile.am (sbin_SCRIPTS): Added grub-terminfo. * configure.in (AC_OUTPUT): Added util/grub-terminfo. * docs/grub.texi (terminfo): New subsection. (Invoking grub-terminfo): New chapter. From Tilmann Bubeck <t.bubeck@reinform.de>: * stage2/Makefile.am (noinst_HEADERS): Added terminfo.h and tparm.h. (libgrub_a_SOURCES): Added terminfo.c and tparm.c. (pre_stage2_exe_SOURCES): Likewise. * stage2/terminfo.c: New file. * stage2/terminfo.h: Likewise. * stage2/tparm.c: Likewise. * stage2/tparm.h: Likewise. * stage2/stage2.c (get_line_from_config): Fix handling of backslashes. * stage2/char_io.c (grub_putstr): New function. (grub_printf): Use grub_putstr. (substring): Add const into both arguments. * stage2/builtins.c [SUPPORT_SERIAL]: Include terminfo.h. [SUPPORT_SERIAL] (terminfo_func): New function. [SUPPORT_SERIAL] (builtin_terminfo): New variable. (builtin_table) [SUPPORT_SERIAL]: Added a pointer to BUILTIN_TERMINFO. * stage2/serial.c (serial_gotoxy): Use ti_cursor_address. (serial_cls): Use ti_clear_screen. (serial_highlight): use ti_enter_standout_mode and ti_exit_standout_mode.
This commit is contained in:
1 parent
f5bc93e4de
commit
bf88d91883
26 files changed
+1551
-53
No files matched your search
+11
-11
@@ -142,11 +142,18 @@ convert_to_ascii (char *buf, int c,...)
|
||||
return ptr;
|
||||
}
|
||||
|
||||
void
|
||||
grub_putstr (const char *str)
|
||||
{
|
||||
while (*str)
|
||||
grub_putchar (*str++);
|
||||
}
|
||||
|
||||
void
|
||||
grub_printf (const char *format,...)
|
||||
{
|
||||
int *dataptr = (int *) &format;
|
||||
char c, *ptr, str[16];
|
||||
char c, str[16];
|
||||
unsigned long mask = 0xFFFFFFFF;
|
||||
|
||||
dataptr++;
|
||||
@@ -169,11 +176,7 @@ grub_printf (const char *format,...)
|
||||
case 'u':
|
||||
*convert_to_ascii (str, c, *((unsigned long *) dataptr++) & mask)
|
||||
= 0;
|
||||
|
||||
ptr = str;
|
||||
|
||||
while (*ptr)
|
||||
grub_putchar (*(ptr++));
|
||||
grub_putstr (str);
|
||||
break;
|
||||
|
||||
#ifndef STAGE1_5
|
||||
@@ -182,10 +185,7 @@ grub_printf (const char *format,...)
|
||||
break;
|
||||
|
||||
case 's':
|
||||
ptr = (char *) (*(dataptr++));
|
||||
|
||||
while ((c = *(ptr++)) != 0)
|
||||
grub_putchar (c);
|
||||
grub_putstr ((char *) *(dataptr++));
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
@@ -1087,7 +1087,7 @@ nocursor (void)
|
||||
#endif /* ! STAGE1_5 */
|
||||
|
||||
int
|
||||
substring (char *s1, char *s2)
|
||||
substring (const char *s1, const char *s2)
|
||||
{
|
||||
while (*s1 == *s2)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user