Merge branch-2-1

[netatalk.git] / include / atalk / util.h

diff --git a/include/atalk/util.h b/include/atalk/util.h
index 3f10132121a62f7ca79f734477f191e9032b739f..d6209ed93c86cf624ba3292c4cd98096cb3b8aab 100644 (file)
--- 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
@@ -47,6 +43,8 @@
 #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
@@ -129,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);
@@ -139,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 */