fix STRING macro

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

diff --git a/pctb/common.h b/pctb/common.h
index 47f898f06fecd31519d3bc0f717e0e024c1e41cf..52f57d699c4cefd959d300bc44349038d7e4e5a8 100644 (file)
--- a/pctb/common.h
+++ b/pctb/common.h
@@ -30,7 +30,9 @@
 
 #define _GNU_SOURCE
 
 
 #define _GNU_SOURCE
 

+#include <locale.h>

 #include <stdarg.h>
 #include <stdarg.h>

+#include <math.h>

 #include <stdio.h>
 #include <errno.h>
 #include <assert.h>
 #include <stdio.h>
 #include <errno.h>
 #include <assert.h>


@@ -38,6 +40,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>

+#include <dirent.h>
+#include <pcre.h>

 #include <inttypes.h>
 
 #include <sys/wait.h>
 #include <inttypes.h>
 
 #include <sys/wait.h>


@@ -45,6 +49,7 @@
 
 typedef struct {
   int w,h;
 
 typedef struct {
   int w,h;

+  struct RgbImage *rgb;

   char d[];
 } CanonImage;
 
   char d[];
 } CanonImage;
 


@@ -72,6 +77,8 @@ typedef struct { /* both inclusive */
    DF(pixmap)                                  \
    DF(struct)                                  \
    DF(ocr)                                     \
    DF(pixmap)                                  \
    DF(struct)                                  \
    DF(ocr)                                     \

+   DF(rsync)                                   \
+   DF(structcolon)                             \

    DF(callout)
 
 enum {
    DF(callout)
 
 enum {


@@ -93,6 +100,7 @@ void debug_flush(void);
 #define debug stderr
 
 const char *get_vardir(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)))
 
 #define FMT(f,a) __attribute__((format(printf,f,a)))
 #define SCANFMT(f,a) __attribute__((format(scanf,f,a)))


@@ -144,4 +152,21 @@ int dbfile_scanf(const char *fmt, ...) SCANFMT(1,2);
 int dbfile_vscanf(const char *fmt, va_list al) SCANFMT(1,0);
 
 
 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)
+
+
+#define ARRAYSIZE(a) ((sizeof((a)) / sizeof((a)[0])))
+#define FILLZERO(obj) (memset(&(obj),0,sizeof((obj))))
+
+#define STRING2(x) #x
+#define STRING(x) STRING2(x)
+

 #endif /*COMMON_H*/
 #endif /*COMMON_H*/