Merge master

[netatalk.git] / etc / afpd / desktop.h

diff --git a/etc/afpd/desktop.h b/etc/afpd/desktop.h
index f766c7579c8290d5bdb4f2177acde7e9bad2588f..ccaa1654ab3b9c63a8f1c57b9c5ed3a679cee469 100644 (file)
--- a/etc/afpd/desktop.h
+++ b/etc/afpd/desktop.h
@@ -1,5 +1,5 @@
 /*
- * $Id: desktop.h,v 1.3 2003-03-09 19:55:33 didg Exp $
+ * $Id: desktop.h,v 1.6 2009-10-15 10:43:13 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -26,15 +26,9 @@
 #ifndef AFPD_DESKTOP_H
 #define AFPD_DESKTOP_H 1
 
-#include <sys/cdefs.h>
-#include "globals.h"
-#include "volume.h"
+#include <atalk/globals.h>
 
-/* various finder info bits */
-#define FINDERINFO_FRFLAGOFF   8
-#define FINDERINFO_FRVIEWOFF  14 
-#define FINDERINFO_INVISIBLE  (1<<14)
-#define FINDERINFO_CLOSEDVIEW 0x100   
+#include "volume.h"
 
 struct savedt {
     u_char     sdt_creator[ 4 ];
@@ -45,26 +39,21 @@ struct savedt {
 
 typedef unsigned char CreatorType[4];
 
-extern char    *dtfile __P((const struct vol *, u_char [], char *));
-extern char    *mtoupath __P((const struct vol *, char *, int utf8));
-extern char    *utompath __P((const struct vol *, char *, int utf8));
-extern u_char  ucreator[];
-
-#define validupath(vol, name) ((((vol)->v_flags & AFPVOL_USEDOTS) ? \
-   (strncasecmp((name),".Apple", 6) && \
-    strcasecmp((name), ".Parent")) : (name)[0] != '.'))
+extern char    *dtfile (const struct vol *, u_char [], char *);
+extern char    *mtoupath (const struct vol *, char *, cnid_t, int utf8);
+extern char    *utompath (const struct vol *, char *, cnid_t, int utf8);
 
 /* FP functions */
-extern int     afp_opendt __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_addcomment __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_getcomment __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_rmvcomment __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_addappl __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_rmvappl __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_getappl __P((AFPObj *, char *, int, char *, int *));
-extern int      afp_closedt __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_addicon __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_geticoninfo __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_geticon __P((AFPObj *, char *, int, char *, int *));
+int afp_opendt (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_addcomment (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_getcomment (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_rmvcomment (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_addappl (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_rmvappl (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_getappl (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_closedt (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_addicon (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_geticoninfo (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_geticon (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
 
 #endif