From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1R6UMR-0003RG-QU
	for mharc-grub-devel@gnu.org; Wed, 21 Sep 2011 17:29:43 -0400
Received: from eggs.gnu.org ([140.186.70.92]:46287)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mario_limonciello@dell.com>) id 1R6UMP-0003MB-BQ
	for grub-devel@gnu.org; Wed, 21 Sep 2011 17:29:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mario_limonciello@dell.com>) id 1R6UMO-0005W2-Aq
	for grub-devel@gnu.org; Wed, 21 Sep 2011 17:29:41 -0400
Received: from ausxippc101.us.dell.com ([143.166.85.207]:46133)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mario_limonciello@dell.com>) id 1R6UMO-0005Vi-6D
	for grub-devel@gnu.org; Wed, 21 Sep 2011 17:29:40 -0400
X-Loopcount0: from 10.9.160.253
Message-ID: <4E7A574D.5000606@dell.com>
Date: Wed, 21 Sep 2011 16:29:49 -0500
From: Mario Limonciello <mario_limonciello@dell.com>
Organization: Dell Inc.
User-Agent: Mozilla/5.0 (X11; Linux i686;
	rv:6.0.2) Gecko/20110906 Thunderbird/6.0.2
MIME-Version: 1.0
To: "grub-devel@gnu.org" <grub-devel@gnu.org>
Subject: [PATCH 2/2] Disable unsupported grub_util_get_fd_sectors in geli
	on MINGW32
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 143.166.85.207
X-BeenThere: grub-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: The development of GNU GRUB <grub-devel@gnu.org>
List-Id: The development of GNU GRUB <grub-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grub-devel>,
	<mailto:grub-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grub-devel>
List-Post: <mailto:grub-devel@gnu.org>
List-Help: <mailto:grub-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grub-devel>,
	<mailto:grub-devel-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Sep 2011 21:29:42 -0000

=== modified file 'ChangeLog'
--- ChangeLog   2011-09-21 21:00:59 +0000
+++ ChangeLog   2011-09-21 21:18:21 +0000
@@ -6,6 +6,8 @@
         Windows CreateFile calls.
         * Undefine GRUB_UTIL in grub-core/lib/crypto.c for MINGW32 as
         termios is not supported.
+       * Disable unsupported grub_util_get_fd_sectors in geli on
+       MINGW32.

  2011-09-17  Grégoire Sutre <gregoire.sutre@gmail.com>


=== modified file 'grub-core/disk/geli.c'
--- grub-core/disk/geli.c       2011-04-25 12:52:07 +0000
+++ grub-core/disk/geli.c       2011-09-21 21:18:21 +0000
@@ -189,8 +189,10 @@
    if (fd < 0)
      return NULL;

+#if !defined(__MINGW32__)
    s = grub_util_get_fd_sectors (fd, &log_secsize);
    grub_util_fd_seek (fd, dev, (s << log_secsize) - 512);
+#endif

    uuid = xmalloc (GRUB_MD_SHA256->mdlen * 2 + 1);
    if (grub_util_fd_read (fd, (void *) &hdr, 512) < 0)