Skip to contentSkip to conversation

fixed menu so you can use it...

PATCH In review Vesa Jääskeläinen 2 participants 2 messages Apr 1, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fixed menu so you can use it...

Hi,

I made some fixes to menu. Now you can even select a menu entry :).

There were also some odd code in elsewhere so I fixed some issues related to those too.

Thanks,
Vesa Jääskeläinen

Index: ChangeLog
===================================================================
RCS file: /sources/grub/grub2/ChangeLog,v
retrieving revision 1.228

ChangeLog +6 -0
diff -u -r1.228 ChangeLog
@@ -1,3 +1,9 @@
+2006-04-01  Vesa Jaaskelainen  <[email protected]>
+
+	* normal/main.c (grub_normal_menu_addentry): Fixed menu size
+	calculation.
+	(read_config_file): Made it to close file before returning.
+
 2006-03-31  Vesa Jaaskelainen  <[email protected]>
 
 	* DISTLIST: Added include/grub/i386/pc/vbeblit.h,

Index: normal/main.c
===================================================================
RCS file: /sources/grub/grub2/normal/main.c,v
retrieving revision 1.14

main.c +3 -3
diff -u -r1.14 main.c
@@ -153,6 +153,8 @@
   (*last)->next = 0;
   (*last)->sourcecode = sourcecode;
 
+  current_menu->size++;
+
   return GRUB_ERR_NONE;
 }
 
@@ -223,10 +225,8 @@
       grub_script_free (parsed_script);
     }
 
-  return newmenu;
-
   grub_file_close (file);
-  return 0;
+  return newmenu;
 }
 
 /* This starts the normal mode.  */
#1 lore raw

Vesa Jääskeläinen <[email protected]> writes:

Hi Vesa,

Quoted 4 lines

I made some fixes to menu. Now you can even select a menu entry :).

There were also some odd code in elsewhere so I fixed some issues related to those too.

This looks fine to me. Please apply it.

Thanks,
Marco