X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flib.h;h=c58d83da573283fa5385a6a4dab61123bc789be9;hb=fa390094c968bc3b07f7af64edaddb7e773c3b04;hp=125deaca0f6c062aa4475d4e8ebce7640e495517;hpb=2c6ed18513ac6ba6b4877f314e5c20070f4e0637;p=libucw.git

diff --git a/lib/lib.h b/lib/lib.h
index 125deaca..c58d83da 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -1,7 +1,7 @@
 /*
  *	Sherlock Library -- Miscellaneous Functions
  *
- *	(c) 1997--2003 Martin Mares <mj@ucw.cz>
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
@@ -17,6 +17,7 @@
 #define _SHERLOCK_LIB_H
 
 #include "lib/config.h"
+#include <stdarg.h>
 
 /* Tell libc we're going to use all extensions available */
 
@@ -36,6 +37,11 @@
 #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 STRINGIFY(x) #x
+#define GLUE(x,y) x##y
+#define GLUE_(x,y) x##_##y
+#define COMPARE(x,y) do { if ((x)<(y)) return -1; if ((x)>(y)) return 1; } while(0)
+#define REV_COMPARE(x,y) COMPARE(y,x)
 
 /* Logging */
 
@@ -48,12 +54,22 @@
 #define L_ERROR_R	'e'
 #define L_FATAL		'!'		/* die() */
 
+extern char *log_title;			/* NULL - print no title, default is log_progname */
+extern char *log_filename;		/* Expanded name of the current log file */
+extern int log_switch_nest;		/* log_switch() nesting counter, increment to disable automatic switches */
+extern int log_pid;			/* 0 if shouldn't be logged */
+extern void (*log_die_hook)(void);
+struct tm;
+extern void (*log_switch_hook)(struct tm *tm);
+
 void log_msg(unsigned int cat, const char *msg, ...) __attribute__((format(printf,2,3)));
 #define log log_msg
+void vlog_msg(unsigned int cat, const char *msg, va_list args);
 void die(byte *, ...) NONRET;
-void log_init(byte *);
-void log_file(byte *);
+void log_init(byte *argv0);
+void log_file(byte *name);
 void log_fork(void);
+void log_switch(void);
 
 #ifdef DEBUG
 void assert_failed(char *assertion, char *file, int line) NONRET;
@@ -63,15 +79,20 @@ void assert_failed(void) NONRET;
 #define ASSERT(x) do { if (__builtin_constant_p(x) && !(x)) assert_failed(); } while(0)
 #endif
 
+#define COMPILE_ASSERT(name,x) typedef char _COMPILE_ASSERT_##name[!!(x)-1]
+
 #ifdef LOCAL_DEBUG
 #define DBG(x,y...) log(L_DEBUG, x,##y)
 #else
 #define DBG(x,y...) do { } while(0)
 #endif
 
+static inline void log_switch_disable(void) { log_switch_nest++; }
+static inline void log_switch_enable(void) { ASSERT(log_switch_nest); log_switch_nest--; }
+
 /* Memory allocation */
 
-#ifdef DMALLOC
+#ifdef DEBUG_DMALLOC
 /*
  * The standard dmalloc macros tend to produce lots of namespace
  * conflicts and we use only xmalloc and xfree, so we can define
@@ -95,7 +116,7 @@ void *xrealloc(void *, unsigned);
 #endif
 
 void *xmalloc_zero(unsigned);
-byte *stralloc(byte *);
+byte *xstrdup(byte *);
 
 /* Content-Type pattern matching and filters */
 
@@ -150,6 +171,14 @@ uns random_max(uns);
 void *mmap_file(byte *name, unsigned *len, int writeable);
 void munmap_file(void *start, unsigned len);
 
+/* partmap.c */
+
+struct partmap;
+struct partmap *partmap_open(byte *name, int writeable);
+void *partmap_map(struct partmap *p, sh_off_t offset, uns size);
+void partmap_close(struct partmap *p);
+sh_off_t partmap_size(struct partmap *p);
+
 /* proctitle.c */
 
 void setproctitle_init(int argc, char **argv);
@@ -159,4 +188,33 @@ void setproctitle(char *msg, ...) __attribute__((format(printf,1,2)));
 
 void randomkey(byte *buf, uns size);
 
+/* exitstatus.c */
+
+#define EXIT_STATUS_MSG_SIZE 32
+int format_exit_status(byte *msg, int stat);
+
+/* runcmd.c */
+
+int run_command(byte *cmd, ...);
+void NONRET exec_command(byte *cmd, ...);
+void echo_command(byte *buf, int size, byte *cmd, ...);
+int run_command_v(byte *cmd, va_list args);
+void NONRET exec_command_v(byte *cmd, va_list args);
+void echo_command_v(byte *buf, int size, byte *cmd, va_list args);
+
+/* carefulio.c */
+
+int careful_read(int fd, void *buf, int len);
+int careful_write(int fd, void *buf, int len);
+
+/* sighandler.c */
+
+typedef int (*sh_sighandler_t)(int);
+  /* obtains signum, returns nonzero if abort() should be called */
+extern sh_sighandler_t signal_handler[];
+
+struct sigaction;
+void handle_signal(int signum, struct sigaction *oldact);
+void unhandle_signal(int signum, struct sigaction *oldact);
+
 #endif