X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Ffish.c;h=3300536d05d30953364dfad3f99ea4113b63ae1e;hp=9316edaae494dadc34b31528b6f22ad18743ea1d;hb=ee21bc1f8071bb35409e9f15fb8309348c9a5912;hpb=22cee80bc2f631703bf417a54ef4e0f0837e921a

diff --git a/fish/fish.c b/fish/fish.c
index 9316eda..3300536 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -26,7 +26,6 @@
 #include <getopt.h>
 #include <signal.h>
 #include <assert.h>
-#include <ctype.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -38,6 +37,7 @@
 #include <guestfs.h>
 
 #include "fish.h"
+#include "c-ctype.h"
 #include "closeout.h"
 #include "progname.h"
 
@@ -81,8 +81,6 @@ launch (guestfs_h *_g)
   if (guestfs_is_config (g)) {
     if (guestfs_launch (g) == -1)
       return -1;
-    if (guestfs_wait_ready (g) == -1)
-      return -1;
   }
   return 0;
 }
@@ -581,7 +579,7 @@ script (int prompt)
 
     /* Skip any initial whitespace before the command. */
   again:
-    while (*buf && isspace (*buf))
+    while (*buf && c_isspace (*buf))
       buf++;
 
     if (!*buf) continue;
@@ -1086,7 +1084,9 @@ is_true (const char *str)
 static void
 free_n_strings (char **str, size_t len)
 {
-  for (size_t i = 0; i < len; i++) {
+  size_t i;
+
+  for (i = 0; i < len; i++) {
     free (str[i]);
   }
   free (str);
@@ -1127,7 +1127,7 @@ parse_string_list (const char *str)
      * as separate fragments because we can't just copy it: we have to remove
      * the \.
      */
-    while (*p && (!isblank (*p) || in_quote)) {
+    while (*p && (!c_isblank (*p) || in_quote)) {
       const char *end = p;
 
       /* Check if the fragment starts with a quote */