X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Ffish.h;h=8b3bdbc09cc67cd5d2b46e18aae4bd611a3c0c71;hb=6699491803962a5dee13997f1cc98f119d7101f4;hp=772d20019cd6ae06f2855a645a992c8f5b51276e;hpb=2f1a50d81671810256dce0852e6b1e0810ac44af;p=libguestfs.git

diff --git a/fish/fish.h b/fish/fish.h
index 772d200..8b3bdbc 100644
--- a/fish/fish.h
+++ b/fish/fish.h
@@ -30,6 +30,16 @@
 #define N_(str) str
 #endif
 
+#define STREQ(a,b) (strcmp((a),(b)) == 0)
+#define STRCASEEQ(a,b) (strcasecmp((a),(b)) == 0)
+#define STRNEQ(a,b) (strcmp((a),(b)) != 0)
+#define STRCASENEQ(a,b) (strcasecmp((a),(b)) != 0)
+#define STREQLEN(a,b,n) (strncmp((a),(b),(n)) == 0)
+#define STRCASEEQLEN(a,b,n) (strncasecmp((a),(b),(n)) == 0)
+#define STRNEQLEN(a,b,n) (strncmp((a),(b),(n)) != 0)
+#define STRCASENEQLEN(a,b,n) (strncasecmp((a),(b),(n)) != 0)
+#define STRPREFIX(a,b) (strncmp((a),(b),strlen((b))) == 0)
+
 /* in fish.c */
 extern guestfs_h *g;
 extern int quit;
@@ -39,13 +49,14 @@ extern void pod2text (const char *name, const char *shortdesc, const char *body)
 extern void list_builtin_commands (void);
 extern void display_builtin_command (const char *cmd);
 extern void free_strings (char **argv);
-extern int count_strings (char * const * const argv);
-extern void print_strings (char * const * const argv);
-extern void print_table (char * const * const argv);
+extern int count_strings (char *const *argv);
+extern void print_strings (char *const *argv);
+extern void print_table (char *const *argv);
 extern int launch (guestfs_h *);
 extern int is_true (const char *str);
 extern char **parse_string_list (const char *str);
 extern int xwrite (int fd, const void *buf, size_t len);
+extern char *resolve_win_path (const char *path);
 
 /* in cmds.c (auto-generated) */
 extern void list_commands (void);
@@ -61,6 +72,7 @@ extern char *complete_dest_paths_generator (const char *text, int state);
 
 /* in alloc.c */
 extern int do_alloc (const char *cmd, int argc, char *argv[]);
+extern int do_sparse (const char *cmd, int argc, char *argv[]);
 
 /* in echo.c */
 extern int do_echo (const char *cmd, int argc, char *argv[]);
@@ -78,7 +90,7 @@ extern int do_glob (const char *cmd, int argc, char *argv[]);
 extern int do_more (const char *cmd, int argc, char *argv[]);
 
 /* in rc.c (remote control) */
-extern void rc_listen (void);
+extern void rc_listen (void) __attribute__((noreturn));
 extern int rc_remote (int pid, const char *cmd, int argc, char *argv[],
                       int exit_on_error);
 
@@ -106,4 +118,10 @@ extern char *try_tilde_expansion (char *path);
   "reopen",				\
   "time"
 
+static inline char *
+bad_cast (char const *s)
+{
+  return (char *) s;
+}
+
 #endif /* FISH_H */