From 88d51eff35b0a6c124b2d7d65386b55e42cfbc8d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Mar 2012 11:18:11 +0100
Subject: [PATCH] 	* util/resolve.c (read_dep_list): Use grub_isspace
 instead of isspace. 	* grub-core/kern/emu/hostdisk.c (read_device_map):
 Likewise.

---
 ChangeLog                     | 5 +++++
 grub-core/kern/emu/hostdisk.c | 6 +++---
 util/resolve.c                | 5 +++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3eb95430..a01007d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/resolve.c (read_dep_list): Use grub_isspace instead of isspace.
+	* grub-core/kern/emu/hostdisk.c (read_device_map): Likewise.
+
 2012-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/i386/pc/startup.S: Define __start.
diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index f099f57f0..1b5655c10 100644
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -1179,7 +1179,7 @@ read_device_map (const char *dev_map)
       lineno++;
 
       /* Skip leading spaces.  */
-      while (*p && isspace (*p))
+      while (*p && grub_isspace (*p))
 	p++;
 
       /* If the first character is `#' or NUL, skip this line.  */
@@ -1215,7 +1215,7 @@ read_device_map (const char *dev_map)
 
       p++;
       /* Skip leading spaces.  */
-      while (*p && isspace (*p))
+      while (*p && grub_isspace (*p))
 	p++;
 
       if (*p == '\0')
@@ -1223,7 +1223,7 @@ read_device_map (const char *dev_map)
 
       /* NUL-terminate the filename.  */
       e = p;
-      while (*e && ! isspace (*e))
+      while (*e && ! grub_isspace (*e))
 	e++;
       *e = '\0';
 
diff --git a/util/resolve.c b/util/resolve.c
index a07c454b9..1af24e6f5 100644
--- a/util/resolve.c
+++ b/util/resolve.c
@@ -25,6 +25,7 @@
 #include <errno.h>
 
 #include <grub/emu/misc.h>
+#include <grub/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/resolve.h>
 #include <grub/i18n.h>
@@ -107,7 +108,7 @@ read_dep_list (FILE *fp)
 	  char *name;
 
 	  /* Skip whitespace.  */
-	  while (*p && isspace (*p))
+	  while (*p && grub_isspace (*p))
 	    p++;
 
 	  if (! *p)
@@ -116,7 +117,7 @@ read_dep_list (FILE *fp)
 	  name = p;
 
 	  /* Skip non-whitespace.  */
-	  while (*p && ! isspace (*p))
+	  while (*p && ! grub_isspace (*p))
 	    p++;
 
 	  *p++ = '\0';