X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdaemon.h;h=ac6847927116bb3c89f5f28411b4fe1810b5dd68;hb=bdfb1bddffa48cfb486331166b8aed91637cb0d6;hp=f08269046d7c6ba6c093042abe8268a7e41364d6;hpb=d714547ab361962ca6f76ec07736f1515595b2df;p=libguestfs.git

diff --git a/daemon/daemon.h b/daemon/daemon.h
index f082690..ac68479 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -55,13 +55,13 @@ extern void free_stringslen (char **argv, int len);
 #define COMMAND_FLAG_FOLD_STDOUT_ON_STDERR 1
 
 extern int commandf (char **stdoutput, char **stderror, int flags,
-		     const char *name, ...);
+                     const char *name, ...);
 extern int commandrf (char **stdoutput, char **stderror, int flags,
-		      const char *name, ...);
+                      const char *name, ...);
 extern int commandvf (char **stdoutput, char **stderror, int flags,
-		      char *const *argv);
+                      char const *const *argv);
 extern int commandrvf (char **stdoutput, char **stderror, int flags,
-		       char const* const *argv);
+                       char const* const *argv);
 
 extern char **split_lines (char *str);
 
@@ -164,7 +164,7 @@ extern void reply (xdrproc_t xdrp, char *ret);
  */
 #define RESOLVE_DEVICE(path,fail_stmt)					\
   do {									\
-    if (strncmp ((path), "/dev/", 5) != 0) {				\
+    if (STRNEQLEN ((path), "/dev/", 5)) {				\
       reply_with_error ("%s: %s: expecting a device name", __func__, (path)); \
       fail_stmt;							\
     }									\
@@ -184,7 +184,7 @@ extern void reply (xdrproc_t xdrp, char *ret);
  */
 #define REQUIRE_ROOT_OR_RESOLVE_DEVICE(path,fail_stmt)			\
   do {									\
-    if (strncmp ((path), "/dev/", 5) == 0)				\
+    if (STREQLEN ((path), "/dev/", 5))				\
       RESOLVE_DEVICE ((path), fail_stmt);				\
     else {								\
       NEED_ROOT (fail_stmt);						\
@@ -234,4 +234,14 @@ extern void reply (xdrproc_t xdrp, char *ret);
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #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)
+
 #endif /* GUESTFSD_DAEMON_H */