X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fatalk%2Futil.h;h=d6209ed93c86cf624ba3292c4cd98096cb3b8aab;hb=e83a5199e4f35ceea335dc3075b23e8d983e7642;hp=080b13408a216f153d18120bf3f3a075f7d7c9f3;hpb=70e8818ea52f3ff5bca42e6c3cbf5765f959f322;p=netatalk.git

diff --git a/include/atalk/util.h b/include/atalk/util.h
index 080b1340..d6209ed9 100644
--- a/include/atalk/util.h
+++ b/include/atalk/util.h
@@ -1,7 +1,3 @@
-/*
- * $Id: util.h,v 1.21 2010/02/28 22:29:16 didg Exp $
- */
-
 /*!
  * @file
  * Netatalk utility functions
@@ -28,19 +24,27 @@
 #define EXITERR_CONF 2  /* error in config files/cmd line parameters */
 #define EXITERR_SYS  3  /* local system error */
 
+/* Print a SBT and exit */
+#define AFP_PANIC(why) \
+    do {                                            \
+        netatalk_panic(why);                        \
+        abort();                                    \
+    } while(0);
+
 /* LOG assert errors */
 #ifndef NDEBUG
 #define AFP_ASSERT(b) \
     do {                                                                \
         if (!(b)) {                                                     \
-            LOG(log_error, logtype_default, "PANIC, assert failed: %s", #b); \
-            abort();                                                    \
+            AFP_PANIC(#b);                                              \
         } \
     } while(0);
 #else
 #define AFP_ASSERT(b)
 #endif /* NDEBUG */
 
+#define STRCMP(a,b,c) (strcmp(a,c) b 0)
+
 #ifdef WITH_SENDFILE
 extern ssize_t sys_sendfile (int __out_fd, int __in_fd, off_t *__offset,size_t __count);
 #endif
@@ -56,9 +60,9 @@ extern int atalk_aton     (char *, struct at_addr *);
 extern void bprint        (char *, int);
 extern int strdiacasecmp  (const char *, const char *);
 extern int strndiacasecmp (const char *, const char *, size_t);
-extern pid_t server_lock  (char * /*program*/, char * /*file*/, 
-			       int /*debug*/);
+extern pid_t server_lock  (char * /*program*/, char * /*file*/, int /*debug*/);
 extern void fault_setup	  (void (*fn)(void *));
+extern void netatalk_panic(const char *why);
 #define server_unlock(x)  (unlink(x))
 
 /* strlcpy and strlcat are used by pam modules */
@@ -123,6 +127,7 @@ extern int lock_reg(int fd, int cmd, int type, off_t offest, int whence, off_t l
  ******************************************************************/
 
 extern int setnonblock(int fd, int cmd);
+extern ssize_t readt(int socket, void *data, const size_t length, int setnonblocking, int timeout);
 extern const char *getip_string(const struct sockaddr *sa);
 extern unsigned int getip_port(const struct sockaddr *sa);
 extern void apply_ip_mask(struct sockaddr *ai, int maskbits);
@@ -133,6 +138,7 @@ extern int compare_ip(const struct sockaddr *sa1, const struct sockaddr *sa2);
  *****************************************************************/
 
 extern const char *getcwdpath(void);
+extern char *stripped_slashes_basename(char *p);
 extern int lchdir(const char *dir);
 
 #endif  /* _ATALK_UTIL_H */