The $(LIBxxx) mechanism proved useful, so I'm switching to it for all other

[libucw.git] / lib / lib.h

diff --git a/lib/lib.h b/lib/lib.h
index 05bde59ef85f7107fdd2d02f18a31068b6ba341f..c1709ea21a32b05c8d453b89a6946d6dc2906450 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -2,6 +2,9 @@
  *     Sherlock Library -- Miscellaneous Functions
  *
  *     (c) 1997--2001 Martin Mares <mj@ucw.cz>
  *     Sherlock Library -- Miscellaneous Functions
  *
  *     (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.

  */
 
 /*
  */
 
 /*


@@ -24,28 +27,16 @@
 #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 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))

 
 /* Some other macros */
 
 #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; })
 
 /* Some other macros */
 
 #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)))
 
 #define ARRAY_SIZE(a) (sizeof(a)/sizeof(*(a)))
 

-/* Temporary Files */
-
-#define TMP_DIR "tmp"
-#define TMP_DIR_LEN 3
-
-struct tempfile {
-  int fh;
-  byte name[32];
-};
-
-void open_temp(struct tempfile *, byte *);
-void delete_temp(struct tempfile *);
-u32 temprand(uns);
-

 /* Logging */
 
 #define L_DEBUG                'D'             /* Debugging messages */
 /* Logging */
 
 #define L_DEBUG                'D'             /* Debugging messages */


@@ -64,9 +55,11 @@ void log_file(byte *);
 void log_fork(void);
 
 #ifdef DEBUG
 void log_fork(void);
 
 #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
 
 #ifdef LOCAL_DEBUG
 #endif
 
 #ifdef LOCAL_DEBUG


@@ -96,11 +89,11 @@ void log_fork(void);
  */
 #define xmalloc sh_xmalloc
 void *xmalloc(unsigned);
  */
 #define xmalloc sh_xmalloc
 void *xmalloc(unsigned);

-void *xmalloc_zero(unsigned);

 void *xrealloc(void *, unsigned);
 #define xfree(x) free(x)
 #endif
 
 void *xrealloc(void *, unsigned);
 #define xfree(x) free(x)
 #endif
 

+void *xmalloc_zero(unsigned);

 byte *stralloc(byte *);
 
 /* Objects */
 byte *stralloc(byte *);
 
 /* Objects */


@@ -130,6 +123,8 @@ 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_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 */
 
 
 /* Content-Type pattern matching and filters */
 


@@ -170,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);


@@ -189,4 +184,8 @@ void munmap_file(void *start, unsigned len);
 void setproctitle_init(int argc, char **argv);
 void setproctitle(char *msg, ...) __attribute__((format(printf,1,2)));
 
 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