Fix escaping of "+" characters in outgoing parameters. (BTW: when Galeon

[libucw.git] / lib / lib.h

diff --git a/lib/lib.h b/lib/lib.h
index 2fb56d95e552a8a6a2beba1e9e3c5507a8174da1..c1709ea21a32b05c8d453b89a6946d6dc2906450 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -1,7 +1,10 @@
 /*
  *     Sherlock Library -- Miscellaneous Functions
  *
 /*
  *     Sherlock Library -- Miscellaneous Functions
  *

- *     (c) 1997--2000 Martin Mares <mj@ucw.cz>
+ *     (c) 1997--2001 Martin Mares <mj@ucw.cz>
+ *
+ *     This software may be freely distributed and used according to the terms
+ *     of the GNU Lesser General Public License.

  */
 
 /*
  */
 
 /*


@@ -19,70 +22,115 @@
 
 #define _GNU_SOURCE
 
 
 #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))
 /* 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))

+#define UNALIGNED_PART(ptr, type) (((long) (ptr)) % sizeof(type))

 
 

-/* Temporary Files */
-
-#define TMP_DIR "tmp"
-#define TMP_DIR_LEN 3
+/* Some other macros */

 
 

-struct tempfile {
-  int fh;
-  byte name[32];
-};
-
-void open_temp(struct tempfile *, byte *);
-void delete_temp(struct tempfile *);
-u32 temprand(uns);
-
-/* FIXME: Remove? */
-#define TF_GENERIC "t"
-#define TF_QUEUE_CONTROL "c"
-#define TF_QUEUE_DATA "d"
-#define TF_DECODE "x"
-#define TF_TRANSFORM "s"
-#define TF_OBJECT "o"
+#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 */
 
 
 /* Logging */
 

-/* FIXME: Define new logging mechanism? */
-
-#define L_DEBUG "<0>"
-#define L_INFO "<2>"
-#define L_WARN "<4>"
-#define L_ERROR "<6>"
-#define L_FATAL "<9>"
+#define L_DEBUG                'D'             /* Debugging messages */
+#define L_INFO         'I'             /* Informational msgs, warnings and errors */
+#define L_WARN         'W'
+#define L_ERROR                'E'
+#define L_INFO_R       'i'             /* Errors caused by external events */
+#define L_WARN_R       'w'
+#define L_ERROR_R      'e'
+#define L_FATAL                '!'             /* die() */

 
 

-void log(byte *, ...);
+void log(unsigned int cat, const char *msg, ...) __attribute__((format(printf,2,3)));

 void die(byte *, ...) NONRET;
 void die(byte *, ...) NONRET;

-void initlog(byte *);
-void open_log_file(byte *);
+void log_init(byte *);
+void log_file(byte *);
+void log_fork(void);

 
 #ifdef DEBUG
 
 #ifdef DEBUG

-#define ASSERT(x) do { if (!(x)) die("Assertion `%s' failed at %s:%d", #x, __FILE__, __LINE__); } while(0)
+void assert_failed(char *assertion, char *file, int line) NONRET;
+#define ASSERT(x) do { if (!(x)) assert_failed(#x, __FILE__, __LINE__); } while(0)

 #else
 #else

-#define ASSERT(x) do { } while(0)
+void assert_failed(void) NONRET;
+#define ASSERT(x) do { if (__builtin_constant_p(x) && !(x)) assert_failed(); } while(0)

 #endif
 
 #endif
 

-/* Allocation */
+#ifdef LOCAL_DEBUG
+#define DBG(x,y...) log(L_DEBUG, x,##y)
+#else
+#define DBG(x,y...) do { } while(0)
+#endif

 
 

-void *xmalloc(uns);
-void *xrealloc(void *, uns);
+/* Memory allocation */
+
+#ifdef DMALLOC
+/*
+ * The standard dmalloc macros tend to produce lots of namespace
+ * conflicts and we use only xmalloc and xfree, so we can define
+ * the stubs ourselves.
+ */
+#define DMALLOC_DISABLE
+#include <dmalloc.h>
+#define xmalloc(size) _xmalloc_leap(__FILE__, __LINE__, size)
+#define xrealloc(ptr,size) _xrealloc_leap(__FILE__, __LINE__, ptr, size)
+#define xfree(ptr) _xfree_leap(__FILE__, __LINE__, ptr)
+#else
+/*
+ * Unfortunately, several libraries we might want to link to define
+ * their own xmalloc and we don't want to interfere with them, hence
+ * the renaming.
+ */
+#define xmalloc sh_xmalloc
+void *xmalloc(unsigned);
+void *xrealloc(void *, unsigned);
+#define xfree(x) free(x)
+#endif
+
+void *xmalloc_zero(unsigned);

 byte *stralloc(byte *);
 
 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 *);
+struct oattr *obj_prepend_attr(struct odes *, uns, byte *);
+struct oattr *obj_insert_attr(struct odes *o, struct oattr *first, struct oattr *after, byte *v);
+

 /* Content-Type pattern matching and filters */
 
 int match_ct_patt(byte *, byte *);
 
 /* Content-Type pattern matching and filters */
 
 int match_ct_patt(byte *, byte *);
 

-/* Binary log */
+/* log2.c */

 
 int log2(u32);
 
 
 int log2(u32);
 


@@ -90,7 +138,7 @@ int log2(u32);
 
 int wordsplit(byte *, byte **, uns);
 
 
 int wordsplit(byte *, byte **, uns);
 

-/* pat(i)match.c */
+/* pat(i)match.c: Matching of shell patterns */

 
 int match_pattern(byte *, byte *);
 int match_pattern_nocase(byte *, byte *);
 
 int match_pattern(byte *, byte *);
 int match_pattern_nocase(byte *, byte *);


@@ -117,7 +165,7 @@ uns get_timer(void);
 
 typedef struct regex regex;
 
 
 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);
 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);


@@ -128,6 +176,16 @@ uns random_max(uns);
 
 /* mmap.c */
 
 
 /* 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
 
 #endif