fix potential bugs in some LBA code

stage2/bios.c

@@ -159,10 +159,11 @@ get_diskinfo (int drive, struct geometry *geometry)
 	  if (! err)
 	    {
 	      geometry->flags = BIOSDISK_FLAG_LBA_EXTENSION;
-	      
-	      /* Check if CHS information is valid.  */
-	      if (drp.flags & 0x02)
-		total_sectors = drp.cylinders * drp.heads * drp.sectors;
+
+	      /* FIXME: when the 2TB limit becomes critical, we must
+		 change the type of TOTAL_SECTORS to unsigned long
+		 long.  */
+	      total_sectors = drp.total_sectors & ~0L;
 	    }
 	}
 

stage2/cmdline.c

@@ -675,11 +675,15 @@ returnit:
 	  else
 	    {
 	      char *msg;
-	      
+
+#ifdef GRUB_UTIL
+	      msg = device_map[current_drive];
+#else
 	      if (geom.flags & BIOSDISK_FLAG_LBA_EXTENSION)
 		msg = "LBA";
 	      else
 		msg = "CHS";
+#endif
 	      
 	      grub_printf ("drive 0x%x: C/H/S = %d/%d/%d, "
 			   "The number of sectors = %d, %s\n",

stage2/shared.h

@@ -312,6 +312,8 @@ extern int use_curses;
 extern int verbose;
 /* The flag for read-only.  */
 extern int read_only;
+/* The map between BIOS drives and UNIX device file names.  */
+extern char **device_map;
 #endif
 
 #ifndef STAGE1_5