X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=pctb%2Fcommon.h;h=e4100f9d461bcfe216c061970016b4daa759936b;hp=635a53a7ddd2a70dfa6fffafcd2ca75ada342106;hb=ef1a9d783f52a2d304e5872b6bb1f066621a5acf;hpb=74e4e249f2c3e848592984cb193aded6a77a341d

diff --git a/pctb/common.h b/pctb/common.h
index 635a53a..e4100f9 100644
--- 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>
@@ -38,6 +39,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <dirent.h>
+#include <pcre.h>
 #include <inttypes.h>
 
 #include <sys/wait.h>
@@ -72,6 +75,8 @@ typedef struct { /* both inclusive */
    DF(pixmap)					\
    DF(struct)					\
    DF(ocr)					\
+   DF(rsync)					\
+   DF(structcolon)				\
    DF(callout)
 
 enum {
@@ -93,8 +98,10 @@ 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)))
 #define NORET __attribute__((noreturn))
 
 #define DEFINE_VWRAPPERF(decls, funcf, otherattribs)			\
@@ -130,7 +137,31 @@ void waitpid_check_exitstatus(pid_t pid, const char *what);
 void *mmalloc(size_t sz);
 void *mrealloc(void *p, size_t sz);
 
-void fgetsline(FILE *f, char *lbuf, size_t lbufsz);
+
+#define dbassert(x) ((x) ? (void)0 : dbfile_assertfail(__FILE__,__LINE__,#x))
+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 */
+void dbfile_close(void); /* idempotent */
+
+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)
+
+
+#define ARRAYSIZE(a) ((sizeof((a)) / sizeof((a)[0])))
 
 
 #endif /*COMMON_H*/