* util/resolve.c (read_dep_list): Use grub_isspace instead of isspace.

	* grub-core/kern/emu/hostdisk.c (read_device_map): Likewise.

diff --git a/ChangeLog b/ChangeLog
index b3eb95430b01b03938dbdc1553b2108cd4facac7..a01007d81cb9c398c5766f4ab5375c7bc84b2dfa 100644 (file)
--- 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 f099f57f050bf639589be0a775f3c4d023871c8c..1b5655c109bb1f7ce79567b9860306dcc7913570 100644 (file)
--- 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 a07c454b96af386312b4790b41ffe6a6e48eba7a..1af24e6f59fb20abc4473f8c0f1057b395de1be3 100644 (file)
--- 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';