X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fcommon.h;h=92ba2daa13d65f27cdf97fe332c48c8ee3ef5108;hb=cfc4716fb0471f32a63072527dc4a462fe73ca99;hp=3fa8a81d985621ad15277a461b7a5fb313b10398;hpb=6a3c0962283d32bc6e5f6c47c929baf37ddc642f;p=ypp-sc-tools.web-live.git

diff --git a/pctb/common.h b/pctb/common.h
index 3fa8a81..92ba2da 100644
--- a/pctb/common.h
+++ b/pctb/common.h
@@ -32,6 +32,7 @@
 
 #include <locale.h>
 #include <stdarg.h>
+#include <math.h>
 #include <stdio.h>
 #include <errno.h>
 #include <assert.h>
@@ -39,13 +40,19 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <dirent.h>
 #include <inttypes.h>
 
+#include <pcre.h>
+
+#include <fcntl.h>
+#include <unistd.h>
 #include <sys/wait.h>
 #include <sys/types.h>
 
 typedef struct {
   int w,h;
+  const struct RgbImage *rgb;
   char d[];
 } CanonImage;
 
@@ -74,6 +81,7 @@ typedef struct { /* both inclusive */
    DF(struct)					\
    DF(ocr)					\
    DF(rsync)					\
+   DF(structcolon)				\
    DF(callout)
 
 enum {
@@ -128,7 +136,7 @@ void fatal(const char *fmt, ...)       FMT(1,2) NORET;
 void sysassert_fail(const char *file, int line, const char *what)
    __attribute__((noreturn));
 
-void waitpid_check_exitstatus(pid_t pid, const char *what);
+void waitpid_check_exitstatus(pid_t pid, const char *what, int sigpipeok);
 
 
 void *mmalloc(size_t sz);
@@ -140,7 +148,8 @@ void dbfile_assertfail(const char *file, int line, const char *m) NORET;
 
 FILE *dbfile;
 void dbfile_getsline(char *lbuf, size_t lbufsz, const char *file, int line);
-int dbfile_open(const char *tpath); /* 0: ENOENT; 1: worked */
+int dbfile_open(const char *tpath);   /* 0: ENOENT; 1: worked */
+int dbfile_gzopen(const char *tpath); /* 0: ENOENT; 1: worked */
 void dbfile_close(void); /* idempotent */
 
 int dbfile_scanf(const char *fmt, ...) SCANFMT(1,2);
@@ -157,4 +166,11 @@ char *masprintf(const char *fmt, ...) FMT(1,2);
 	  "(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*/