Fix some stuff on FreeBSD

diff --git a/etc/afpd/status.c b/etc/afpd/status.c
index 51c761dae05c0c4d48084b2fe9007a130bbc7091..96fb97d1f1e86fd876b8fe56d1920a9eb895ebfd 100644 (file)
--- a/etc/afpd/status.c
+++ b/etc/afpd/status.c
@@ -1,5 +1,5 @@
 /*
- * $Id: status.c,v 1.29 2009-11-22 11:52:38 franklahm Exp $
+ * $Id: status.c,v 1.30 2009-11-23 19:04:14 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -14,6 +14,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <atalk/logger.h>
 
 #ifdef BSD4_4

diff --git a/etc/cnid_dbd/db_param.c b/etc/cnid_dbd/db_param.c
index 82a9d35b52e12d1323d5a5fc37e0c8e107ba4474..029c21b00124ecafca0615c6cb30f1e1978e2bb7 100644 (file)
--- a/etc/cnid_dbd/db_param.c
+++ b/etc/cnid_dbd/db_param.c
@@ -1,5 +1,5 @@
 /*
- * $Id: db_param.c,v 1.8 2009-10-19 05:38:22 didg Exp $
+ * $Id: db_param.c,v 1.9 2009-11-23 19:04:14 franklahm Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * Copyright (c) Frank Lahm 2009
@@ -10,12 +10,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>

diff --git a/libatalk/util/socket.c b/libatalk/util/socket.c
index a2dfaccd6b3a5d0e66edc9500c1faa87e5426276..770c93fe2f03b69ca442a80dd4a923b774ad0f30 100644 (file)
--- a/libatalk/util/socket.c
+++ b/libatalk/util/socket.c
@@ -1,5 +1,5 @@
 /*
-   $Id: socket.c,v 1.4 2009-11-05 21:31:53 didg Exp $
+   $Id: socket.c,v 1.5 2009-11-23 19:04:15 franklahm Exp $
    Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
 
    This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/libatalk/vfs/sys_ea.c b/libatalk/vfs/sys_ea.c
index 5c1de77d733092e0afa9f83c3618cbf35fb06742..88b9e645762f0526f11c7107c1330c76cb75bbfa 100644 (file)
--- a/libatalk/vfs/sys_ea.c
+++ b/libatalk/vfs/sys_ea.c
@@ -25,7 +25,7 @@
    Copyright (C) 2001 Andreas Gruenbacher.
       
    Samba 3.0.28, modified for netatalk.
-   $Id: sys_ea.c,v 1.4 2009-11-20 16:26:23 franklahm Exp $
+   $Id: sys_ea.c,v 1.5 2009-11-23 19:04:15 franklahm Exp $
    
 */
 
@@ -107,7 +107,7 @@ ssize_t sys_getxattr (const char *path, const char *uname, void *value, size_t s
        ssize_t retval;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
        /*
         * The BSD implementation has a nasty habit of silently truncating
         * the returned value to the size of the buffer, so we have to check
@@ -164,7 +164,7 @@ ssize_t sys_lgetxattr (const char *path, const char *uname, void *value, size_t
        ssize_t retval;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
 
        if((retval=extattr_get_link(path, attrnamespace, attrname, NULL, 0)) >= 0) {
                if(retval > size) {
@@ -476,7 +476,7 @@ int sys_removexattr (const char *path, const char *uname)
        char *s;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
 
        return extattr_delete_file(path, attrnamespace, attrname);
 #elif defined(HAVE_ATTR_REMOVE)
@@ -514,7 +514,7 @@ int sys_lremovexattr (const char *path, const char *uname)
        char *s;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
 
        return extattr_delete_link(path, attrnamespace, attrname);
 #elif defined(HAVE_ATTR_REMOVE)
@@ -555,7 +555,7 @@ int sys_setxattr (const char *path, const char *uname, const void *value, size_t
        int retval = 0;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
        if (flags) {
                /* Check attribute existence */
                retval = extattr_get_file(path, attrnamespace, attrname, NULL, 0);
@@ -619,7 +619,7 @@ int sys_lsetxattr (const char *path, const char *uname, const void *value, size_
        int retval = 0;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
        if (flags) {
                /* Check attribute existence */
                retval = extattr_get_link(path, attrnamespace, attrname, NULL, 0);