From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1R6TjN-0004c6-3k for mharc-grub-devel@gnu.org; Wed, 21 Sep 2011 16:49:21 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6TjL-0004bv-4Z for grub-devel@gnu.org; Wed, 21 Sep 2011 16:49:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6TjK-0006I1-9U for grub-devel@gnu.org; Wed, 21 Sep 2011 16:49:19 -0400 Received: from ausxippc101.us.dell.com ([143.166.85.207]:1731) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6TjK-0006HH-5y for grub-devel@gnu.org; Wed, 21 Sep 2011 16:49:18 -0400 X-Loopcount0: from 10.9.160.253 Message-ID: <4E7A4DD5.3070300@dell.com> Date: Wed, 21 Sep 2011 15:49:25 -0500 From: Mario Limonciello 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" Subject: [PATCH 2/3] Use _fullpath instead of realpath on mingw32 Content-Type: multipart/mixed; boundary="------------040608010202060003000606" 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 List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Sep 2011 20:49:20 -0000 This is a multi-part message in MIME format. --------------040608010202060003000606 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit === modified file 'ChangeLog' --- ChangeLog 2011-09-21 20:36:50 +0000 +++ ChangeLog 2011-09-21 20:38:06 +0000 @@ -1,6 +1,7 @@ 2011-09-21 Mario Limonciello * Remove extra declaration of sleep for mingw32. + * No realpath on mingw32. Instead use _fullpath. 2011-09-17 Grégoire Sutre === modified file 'grub-core/kern/emu/misc.c' --- grub-core/kern/emu/misc.c 2011-07-08 11:33:12 +0000 +++ grub-core/kern/emu/misc.c 2011-09-21 20:38:06 +0000 @@ -224,6 +224,11 @@ canonicalize_file_name (const char *path) { char *ret; +#ifdef __MINGW32__ + ret = xmalloc(PATH_MAX); + if (!_fullpath(ret, path, PATH_MAX)) + return NULL; +#else #ifdef PATH_MAX ret = xmalloc (PATH_MAX); if (!realpath (path, ret)) @@ -231,6 +236,7 @@ #else ret = realpath (path, NULL); #endif +#endif /* __MINGW32__ */ return ret; } --------------040608010202060003000606 Content-Type: text/x-diff; name="ml_3426.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="ml_3426.patch" === modified file 'ChangeLog' --- ChangeLog 2011-09-21 20:36:50 +0000 +++ ChangeLog 2011-09-21 20:38:06 +0000 @@ -1,6 +1,7 @@ 2011-09-21 Mario Limonciello * Remove extra declaration of sleep for mingw32. + * No realpath on mingw32. Instead use _fullpath. 2011-09-17 Grégoire Sutre === modified file 'grub-core/kern/emu/misc.c' --- grub-core/kern/emu/misc.c 2011-07-08 11:33:12 +0000 +++ grub-core/kern/emu/misc.c 2011-09-21 20:38:06 +0000 @@ -224,6 +224,11 @@ canonicalize_file_name (const char *path) { char *ret; +#ifdef __MINGW32__ + ret = xmalloc(PATH_MAX); + if (!_fullpath(ret, path, PATH_MAX)) + return NULL; +#else #ifdef PATH_MAX ret = xmalloc (PATH_MAX); if (!realpath (path, ret)) @@ -231,6 +236,7 @@ #else ret = realpath (path, NULL); #endif +#endif /* __MINGW32__ */ return ret; } --------------040608010202060003000606--