Merge branch 'origin'

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

diff --git a/pctb/common.h b/pctb/common.h
index 5044bb35ee8015a3e109b71a1c2b167fbcfac2c6..9d06fabf9a55c79b8a1878a649b8db03f6aaa083 100644 (file)
--- a/pctb/common.h
+++ b/pctb/common.h
@@ -41,15 +41,18 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
-#include <pcre.h>
 #include <inttypes.h>
+#include <fnmatch.h>
+
+#include <pcre.h>
 
+#include <fcntl.h>
+#include <unistd.h>
 #include <sys/wait.h>
 #include <sys/types.h>
 
 typedef struct {
   int w,h;
-  struct RgbImage *rgb;
   char d[];
 } CanonImage;
 
@@ -133,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);
@@ -145,12 +148,18 @@ 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);
 
@@ -166,6 +175,7 @@ char *masprintf(const char *fmt, ...) FMT(1,2);
 #define ARRAYSIZE(a) ((sizeof((a)) / sizeof((a)[0])))
 #define FILLZERO(obj) (memset(&(obj),0,sizeof((obj))))
 
-#define STRING(x) #x
+#define STRING2(x) #x
+#define STRING(x) STRING2(x)
 
 #endif /*COMMON_H*/