Attachment 157519 Details for Bug 245113 – corrected patch

[patch] corrected patch

grub-0.97-fmt.asp.patch (text/plain), 1.90 KB, created by Andy Shevchenko on 2007-06-21 08:38:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Shevchenko

Created: 2007-06-21 08:38:28 UTC

Size: 1.90 KB

patch

obsolete

>--- grub-0.97/stage2/stage2.c.fmt	2007-06-20 19:37:50.000000000 +0300
>+++ grub-0.97/stage2/stage2.c	2007-06-20 19:43:50.000000000 +0300
>@@ -234,6 +234,7 @@ run_menu (char *menu_entries, char *conf
>   int c, time1, time2 = -1, first_entry = 0;
>   char *cur_entry = 0;
>   struct term_entry *prev_term = NULL;
>+  char *entry, entry2[sizeof(int) * 3 + 1];
> 
>   cls();
> 
>@@ -292,9 +293,11 @@ restart:
> 	      grub_timeout--;
> 	      
> 	      /* Print a message.  */
>-	      grub_printf ("\rBooting %s in %d seconds...",
>-			   get_entry(menu_entries, first_entry + entryno, 0),
>-			   grub_timeout);
>+	      entry = get_entry(menu_entries, first_entry + entryno, 0);
>+	      grub_sprintf(entry2, "%d", grub_timeout);
>+	      grub_printf ("\rBooting %s in %s seconds...",
>+			   grub_strcut((const char *) entry, 80 - 8 - 0 - 4 - grub_strlen(entry2) - 11),
>+			   entry2);
> 	    }
> 	}
>     }
>--- grub-0.97/stage2/shared.h.fmt	2007-06-20 19:37:51.000000000 +0300
>+++ grub-0.97/stage2/shared.h	2007-06-20 19:55:40.000000000 +0300
>@@ -889,6 +889,10 @@ int grub_strcmp (const char *s1, const c
> int grub_strlen (const char *str);
> char *grub_strcpy (char *dest, const char *src);
> 
>+#ifndef STAGE1_5
>+char *grub_strcut (const char *str, int len);
>+#endif /* ! STAGE1_5 */
>+
> #ifndef GRUB_UTIL
> typedef unsigned long grub_jmp_buf[6];
> #else
>--- grub-0.97/stage2/char_io.c.fmt	2007-06-20 19:37:51.000000000 +0300
>+++ grub-0.97/stage2/char_io.c	2007-06-20 19:54:36.000000000 +0300
>@@ -1318,3 +1318,14 @@ grub_strcpy (char *dest, const char *src
> /* GCC emits references to memcpy() for struct copies etc.  */
> void *memcpy (void *dest, const void *src, int n)  __attribute__ ((alias ("grub_memmove")));
> #endif
>+
>+#ifndef STAGE1_5
>+char *
>+grub_strcut (const char *str, int len)
>+{
>+    static char buffer[81];
>+    buffer[0] = 0;
>+    grub_strncat (buffer, str, len > sizeof(buffer) ? sizeof(buffer) : len);
>+    return buffer;
>+}
>+#endif /* ! STAGE1_5 */

Actions: View | Diff

Attachments on bug 245113: 157518 | 157519