X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fcommon.h;h=9d06fabf9a55c79b8a1878a649b8db03f6aaa083;hb=2189c69cead5cb3717ef9f06beebd9bca519ad79;hp=47f898f06fecd31519d3bc0f717e0e024c1e41cf;hpb=4c375a59891a4161e30bd67709a1ad5d1950a850;p=ypp-sc-tools.web-live.git diff --git a/pctb/common.h b/pctb/common.h index 47f898f..9d06fab 100644 --- a/pctb/common.h +++ b/pctb/common.h @@ -30,7 +30,9 @@ #define _GNU_SOURCE +#include #include +#include #include #include #include @@ -38,8 +40,14 @@ #include #include #include +#include #include +#include +#include + +#include +#include #include #include @@ -72,6 +80,8 @@ typedef struct { /* both inclusive */ DF(pixmap) \ DF(struct) \ DF(ocr) \ + DF(rsync) \ + DF(structcolon) \ DF(callout) enum { @@ -93,6 +103,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))) @@ -125,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); @@ -137,11 +148,34 @@ 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); int dbfile_vscanf(const char *fmt, va_list al) SCANFMT(1,0); +int gzopen(const char *zpath, int oflags, FILE **f_r, pid_t *pid_r, + const char *gziplevel /* 0 for read; may be 0, or "-1" etc. */); + /* returns errno value from open */ +void gzclose(FILE **f, pid_t *p, const char *what); + /* also OK with f==0, or p==-1 */ + +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*/