X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flib.h;h=dea7c10c8929fa7fe923d24f69bbb78d12204e0a;hb=0eea3757c0ee4462a641562ba03c893548971d8f;hp=48b71737be6269ae24909ea543fa198b2c879f15;hpb=8ea532bfd73db1b23d444dac3ebb2581a013a90a;p=libucw.git

diff --git a/lib/lib.h b/lib/lib.h
index 48b71737..dea7c10c 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -19,29 +19,19 @@
 
 #define _GNU_SOURCE
 
-#ifndef NULL
-#define NULL ((void *)0)
-#endif
-
 /* Ugly structure handling macros */
 
 #define OFFSETOF(s, i) ((unsigned int)&((s *)0)->i)
 #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))
 #define ALIGN(s, a) (((s)+a-1)&~(a-1))
 
-/* Temporary Files */
-
-#define TMP_DIR "tmp"
-#define TMP_DIR_LEN 3
-
-struct tempfile {
-  int fh;
-  byte name[32];
-};
+/* Some other macros */
 
-void open_temp(struct tempfile *, byte *);
-void delete_temp(struct tempfile *);
-u32 temprand(uns);
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#define CLAMP(x,min,max) ({ int _t=x; (_t < min) ? min : (_t > max) ? max : _t; })
+#define ABS(x) ((x) < 0 ? -(x) : (x))
+#define ARRAY_SIZE(a) (sizeof(a)/sizeof(*(a)))
 
 /* Logging */
 
@@ -54,10 +44,11 @@ u32 temprand(uns);
 #define L_ERROR_R	'e'
 #define L_FATAL		'!'		/* die() */
 
-void log(unsigned int cat, byte *msg, ...);
+void log(unsigned int cat, const char *msg, ...) __attribute__((format(printf,2,3)));
 void die(byte *, ...) NONRET;
 void log_init(byte *);
 void log_file(byte *);
+void log_fork(void);
 
 #ifdef DEBUG
 #define ASSERT(x) do { if (!(x)) die("Assertion `%s' failed at %s:%d", #x, __FILE__, __LINE__); } while(0)
@@ -92,12 +83,41 @@ void log_file(byte *);
  */
 #define xmalloc sh_xmalloc
 void *xmalloc(unsigned);
+void *xmalloc_zero(unsigned);
 void *xrealloc(void *, unsigned);
 #define xfree(x) free(x)
 #endif
 
 byte *stralloc(byte *);
 
+/* Objects */
+
+struct fastbuf;
+
+struct odes {				/* Object description */
+  struct oattr *attrs;
+  struct mempool *pool, *local_pool;
+};
+
+struct oattr {				/* Object attribute */
+  struct oattr *next, *same, *last_same;
+  byte attr;
+  byte val[1];
+};
+
+void obj_dump(struct odes *);
+struct odes *obj_new(struct mempool *);
+void obj_free(struct odes *);
+int obj_read(struct fastbuf *, struct odes *);
+void obj_write(struct fastbuf *, struct odes *);
+struct oattr *obj_find_attr(struct odes *, uns);
+struct oattr *obj_find_attr_last(struct odes *, uns);
+uns obj_del_attr(struct odes *, struct oattr *);
+byte *obj_find_aval(struct odes *, uns);
+struct oattr *obj_set_attr(struct odes *, uns, byte *);
+struct oattr *obj_set_attr_num(struct odes *, uns, uns);
+struct oattr *obj_add_attr(struct odes *, struct oattr *, uns, byte *);
+
 /* Content-Type pattern matching and filters */
 
 int match_ct_patt(byte *, byte *);
@@ -137,7 +157,7 @@ uns get_timer(void);
 
 typedef struct regex regex;
 
-regex *rx_compile(byte *r);
+regex *rx_compile(byte *r, int icase);
 void rx_free(regex *r);
 int rx_match(regex *r, byte *s);
 int rx_subst(regex *r, byte *by, byte *src, byte *dest, uns destlen);
@@ -148,6 +168,16 @@ uns random_max(uns);
 
 /* mmap.c */
 
-void *mmap_file(byte *name, unsigned *len);
+void *mmap_file(byte *name, unsigned *len, int writeable);
+void munmap_file(void *start, unsigned len);
+
+/* proctitle.c */
+
+void setproctitle_init(int argc, char **argv);
+void setproctitle(char *msg, ...) __attribute__((format(printf,1,2)));
+
+/* randomkey.c */
+
+void randomkey(byte *buf, uns size);
 
 #endif