[2434] 2009-07-19 Yves BLUSSEAU <address@hidden>

[Pavel Roskin]

Revision: 2434
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2434
Author:   proski
Date:     2009-07-20 20:03:18 +0000 (Mon, 20 Jul 2009)
Log Message:
-----------
2009-07-19  Yves BLUSSEAU  <address@hidden>

        * util/getroot.c (find_root_device): Add support for MacOSX.
        * util/hostdisk.c: Likewise.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/getroot.c
    trunk/grub2/util/hostdisk.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-07-20 18:46:46 UTC (rev 2433)
+++ trunk/grub2/ChangeLog       2009-07-20 20:03:18 UTC (rev 2434)
@@ -1,3 +1,8 @@
+2009-07-19  Yves BLUSSEAU  <address@hidden>
+
+       * util/getroot.c (find_root_device): Add support for MacOSX.
+       * util/hostdisk.c: Likewise.
+
 2009-07-20  Vladimir Serbinenko  <address@hidden>
 
        * font/font.c (find_glyph): Check whether a font is present to avoid

Modified: trunk/grub2/util/getroot.c
===================================================================
--- trunk/grub2/util/getroot.c  2009-07-20 18:46:46 UTC (rev 2433)
+++ trunk/grub2/util/getroot.c  2009-07-20 20:03:18 UTC (rev 2434)
@@ -238,7 +238,7 @@
            }
        }
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
       if (S_ISCHR (st.st_mode) && st.st_rdev == dev)
 #else
       if (S_ISBLK (st.st_mode) && st.st_rdev == dev)

Modified: trunk/grub2/util/hostdisk.c
===================================================================
--- trunk/grub2/util/hostdisk.c 2009-07-20 18:46:46 UTC (rev 2433)
+++ trunk/grub2/util/hostdisk.c 2009-07-20 20:03:18 UTC (rev 2434)
@@ -92,6 +92,10 @@
 # include <sys/sysctl.h>
 #endif
 
+#if defined(__APPLE__)
+# include <sys/disk.h>
+#endif
+
 struct
 {
   char *drive;
@@ -185,7 +189,8 @@
 
     return GRUB_ERR_NONE;
   }
-#elif defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__) || 
defined(__FreeBSD_kernel__)
+#elif defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
+      defined(__FreeBSD_kernel__) || defined(__APPLE__)
   {
     unsigned long long nr;
     int fd;
@@ -194,7 +199,7 @@
     if (fd == -1)
       return grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while 
attempting to get disk size", map[drive].device);
 
-# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
     if (fstat (fd, &st) < 0 || ! S_ISCHR (st.st_mode))
 # else
     if (fstat (fd, &st) < 0 || ! S_ISBLK (st.st_mode))
@@ -206,6 +211,8 @@
 
 # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     if (ioctl (fd, DIOCGMEDIASIZE, &nr))
+# elif defined(__APPLE__)
+    if (ioctl (fd, DKIOCGETBLOCKCOUNT, &nr))
 # else
     if (ioctl (fd, BLKGETSIZE64, &nr))
 # endif
@@ -215,10 +222,15 @@
       }
 
     close (fd);
+
+#if defined (__APPLE__)
+    disk->total_sectors = nr;
+#else
     disk->total_sectors = nr / 512;
 
     if (nr % 512)
       grub_util_error ("unaligned device size");
+#endif
 
     grub_util_info ("the size of %s is %llu", name, disk->total_sectors);
 
@@ -371,7 +383,13 @@
     }
 #endif
 
+#if defined(__APPLE__)
+  /* If we can't have exclusive access, try shared access */
   if (fd < 0)
+    fd = open(map[disk->id].device, flags | O_SHLOCK);
+#endif
+
+  if (fd < 0)
     {
       grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' in open_device()", 
map[disk->id].device);
       return -1;
@@ -811,7 +829,7 @@
     path[8] = 0;
   return path;
 
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
   char *path = xstrdup (os_dev);
   if (strncmp ("/dev/", path, 5) == 0)
     {
@@ -890,7 +908,7 @@
       == 0)
     return make_device_name (drive, -1, -1);
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
   if (! S_ISCHR (st.st_mode))
 #else
   if (! S_ISBLK (st.st_mode))
@@ -1039,7 +1057,7 @@
     return make_device_name (drive, dos_part, bsd_part);
   }
 
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
   /* FreeBSD uses "/dev/[a-z]+[0-9]+(s[0-9]+[a-z]?)?".  */
   {
     int dos_part = -1;