in-building find island works

[ypp-sc-tools.main.git] / pctb / common.h

diff --git a/pctb/common.h b/pctb/common.h
index 47f898f06fecd31519d3bc0f717e0e024c1e41cf..48483e238b58d82e9ede0eaedf89600301804f46 100644 (file)
--- a/pctb/common.h
+++ b/pctb/common.h
@@ -30,6 +30,7 @@
 
 #define _GNU_SOURCE
 
+#include <locale.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <errno.h>
@@ -72,6 +73,8 @@ typedef struct { /* both inclusive */
    DF(pixmap)                                  \
    DF(struct)                                  \
    DF(ocr)                                     \
+   DF(rsync)                                   \
+   DF(structcolon)                             \
    DF(callout)
 
 enum {
@@ -93,6 +96,7 @@ void debug_flush(void);
 #define debug stderr
 
 const char *get_vardir(void);
+const char *get_libdir(void);
 
 #define FMT(f,a) __attribute__((format(printf,f,a)))
 #define SCANFMT(f,a) __attribute__((format(scanf,f,a)))
@@ -144,4 +148,14 @@ int dbfile_scanf(const char *fmt, ...) SCANFMT(1,2);
 int dbfile_vscanf(const char *fmt, va_list al) SCANFMT(1,0);
 
 
+char *masprintf(const char *fmt, ...) FMT(1,2);
+
+#define EXECLP_HELPER(helper, ...) do{                         \
+    char *helper_path= masprintf("%s/%s",get_libdir(),helper); \
+    execlp(helper_path,helper, __VA_ARGS__);                   \
+    sysassert(errno==ENOENT);                                  \
+    fatal("Failed to find helper program %s.\n"                        \
+         "(Are you in the correct directory?)", helper);       \
+  }while(0)
+
 #endif /*COMMON_H*/