X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Flib.h;h=c2ec50b03d8516ca8f004ec5922a03e9c7a1b51d;hb=5d26aed3953fe00d6d394f9767b4a029406eeeea;hp=923afca5622d349a258f82b08b359e6c0a3171b6;hpb=7093c3275e649ae60935fe07bb6b44398b3ca4c0;p=libucw.git

diff --git a/lib/lib.h b/lib/lib.h
index 923afca5..c2ec50b0 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -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 */
 
@@ -39,6 +40,8 @@
 #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 */
 
@@ -52,30 +55,48 @@
 #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;
+void assert_failed_noinfo(void) NONRET;
+
+#ifdef DEBUG_ASSERTS
 #define ASSERT(x) do { if (unlikely(!(x))) assert_failed(#x, __FILE__, __LINE__); } while(0)
 #else
-void assert_failed(void) NONRET;
-#define ASSERT(x) do { if (__builtin_constant_p(x) && !(x)) assert_failed(); } while(0)
+#define ASSERT(x) do { if (__builtin_constant_p(x) && !(x)) assert_failed_noinfo(); } 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 */
 
+#define xmalloc sh_xmalloc
+#define xrealloc sh_xrealloc
+#define xfree sh_xfree
+
 #ifdef DEBUG_DMALLOC
 /*
  * The standard dmalloc macros tend to produce lots of namespace
@@ -84,23 +105,22 @@ void assert_failed(void) NONRET;
  */
 #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)
+#define sh_xmalloc(size) _xmalloc_leap(__FILE__, __LINE__, size)
+#define sh_xrealloc(ptr,size) _xrealloc_leap(__FILE__, __LINE__, ptr, size)
+#define sh_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)
+#define sh_xfree(x) free(x)
 #endif
 
 void *xmalloc_zero(unsigned);
-byte *stralloc(byte *);
+byte *xstrdup(byte *);
 
 /* Content-Type pattern matching and filters */
 
@@ -112,6 +132,7 @@ int fls(u32);
 
 /* wordsplit.c */
 
+int sepsplit(byte *str, byte sep, byte **rec, uns max);
 int wordsplit(byte *, byte **, uns);
 
 /* pat(i)match.c: Matching of shell patterns */
@@ -172,4 +193,37 @@ 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);
+
+/* sync.c */
+
+void sync_dir(byte *name);
+
+/* 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