Sync volume options with volinfo stuff

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index fb61d38c5d957e78c64cd38a57899deaa0c81beb..324b88b9bdc9c252ff67fbf791ebefa59ae4f76a 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.84 2009-04-17 04:24:20 didg Exp $
+ * $Id: volume.c,v 1.85 2009-04-27 07:58:25 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -159,6 +159,8 @@ typedef struct _volopt_name {
        const char      *name;
 } _vol_opt_name;
 
+
+/* Keep in sync with libatalk/util/volinfo.c ! */
 static const _vol_opt_name vol_opt_names[] = {
     {AFPVOL_A2VOL,      "PRODOS"},      /* prodos volume */
     {AFPVOL_CRLF,       "CRLF"},        /* cr/lf translation */

diff --git a/etc/afpd/volume.h b/etc/afpd/volume.h
index 3b04693ac7d52a28acf298453abfebbf89cc63d0..002d601818e5916e351777f4fc89188021ef4d64 100644 (file)
--- a/etc/afpd/volume.h
+++ b/etc/afpd/volume.h
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.h,v 1.30 2009-04-17 04:24:20 didg Exp $
+ * $Id: volume.h,v 1.31 2009-04-27 07:58:25 franklahm Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -108,7 +108,10 @@ typedef u_int64_t VolSpace;
 #define AFPVOL_USTATFS (2<<2)
 #define AFPVOL_UQUOTA  (4<<2)
 
-/* flags that alter volume behaviour. */
+/* 
+   Flags that alter volume behaviour.
+   Keep in sync with include/atalk/volinfo.h and libatalk/util/volinfo.c
+*/
 #define AFPVOL_A2VOL     (1 << 5)   /* prodos volume */
 #define AFPVOL_CRLF      (1 << 6)   /* cr/lf translation */
 #define AFPVOL_NOADOUBLE (1 << 7)   /* don't create .AppleDouble by default */

diff --git a/include/atalk/volinfo.h b/include/atalk/volinfo.h
index 28caa335f4fb485fab6a602d5325c3b7d9e2b196..6a290059e6f287b20eed72f49ad98fc4c2b8e1ee 100644 (file)
--- a/include/atalk/volinfo.h
+++ b/include/atalk/volinfo.h
@@ -1,5 +1,5 @@
 /*
- * $Id: volinfo.h,v 1.2 2005-04-28 20:49:51 bfernhomberg Exp $
+ * $Id: volinfo.h,v 1.3 2009-04-27 07:58:26 franklahm Exp $
  */
 
 #ifndef _ATALK_VOLINFO_H
@@ -24,8 +24,16 @@
 #define AFPVOL_UNIX_PRIV (1 << 17)  /* support unix privileges */
 #define AFPVOL_NODEV     (1 << 18)  /* always use 0 for device number in cnid calls
                                      * help if device number is notconsistent across reboot
-                                     * NOTE symlink to a different device will return an ACCESS error
-                                     */
+                                     * NOTE symlink to a different device will return an ACCESS error */
+#define AFPVOL_CASEINSEN (1 << 19)  /* volume is case insensitive */
+#define AFPVOL_EILSEQ    (1 << 20)  /* encode illegal sequence 'asis' UCS2, ex "\217-", which is not 
+                                       a valid SHIFT-JIS char, is encoded  as U\217 -*/
+#define AFPVOL_CACHE     (1 << 21)   /* Use adouble v2 CNID caching, default don't use it */
+#define AFPVOL_INV_DOTS  (1 << 22)   /* dots files are invisible */
+#define AFPVOL_EXT_ATTRS (1 << 23)   /* Volume supports Extended Attributes */
+#define AFPVOL_ACLS      (1 << 25)   /* Volume supports ACLS */
+
+
 /* handle casefolding */
 #define AFPVOL_MTOUUPPER       (1 << 0)
 #define AFPVOL_MTOULOWER       (1 << 1)

diff --git a/libatalk/util/volinfo.c b/libatalk/util/volinfo.c
index 9a1a657e80388bbebc19888f9d15c56e8c524d13..68b7c71b0c3bd9c66275483079e14a50cee4f775 100644 (file)
--- a/libatalk/util/volinfo.c
+++ b/libatalk/util/volinfo.c
@@ -85,13 +85,19 @@ static const _vol_opt_name vol_opt_names[] = {
     {AFPVOL_NOHEX,      "NOHEX"},       /* don't do :hex translation */
     {AFPVOL_USEDOTS,    "USEDOTS"},     /* use real dots */
     {AFPVOL_LIMITSIZE,  "LIMITSIZE"},   /* limit size for older macs */
-    {AFPVOL_MAPASCII,  "MAPASCII"},    /* map the ascii range as well */
-    {AFPVOL_DROPBOX,   "DROPBOX"},     /* dropkludge dropbox support */
-    {AFPVOL_NOFILEID,  "NOFILEID"},    /* don't advertise createid resolveid and deleteid calls */
-    {AFPVOL_NOSTAT,    "NOSTAT"},      /* advertise the volume even if we can't stat() it
-                                        * maybe because it will be mounted later in preexec */
+    {AFPVOL_MAPASCII,   "MAPASCII"},    /* map the ascii range as well */
+    {AFPVOL_DROPBOX,    "DROPBOX"},     /* dropkludge dropbox support */
+    {AFPVOL_NOFILEID,   "NOFILEID"},    /* don't advertise createid resolveid and deleteid calls */
+    {AFPVOL_NOSTAT,     "NOSTAT"},      /* advertise the volume even if we can't stat() it
+                                         * maybe because it will be mounted later in preexec */
     {AFPVOL_UNIX_PRIV,  "UNIXPRIV"},    /* support unix privileges */
     {AFPVOL_NODEV,      "NODEV"},       /* always use 0 for device number in cnid calls */
+    {AFPVOL_CASEINSEN,  "CASEINSENSITIVE"}, /* volume is case insensitive */
+    {AFPVOL_EILSEQ,     "ILLEGALSEQ"},  /* encode illegal sequence */
+    {AFPVOL_CACHE,      "CACHEID"},     /* Use adouble v2 CNID caching, default don't use it */
+    {AFPVOL_INV_DOTS,   "INVISIBLEDOTS"}, 
+    {AFPVOL_EXT_ATTRS,  "EXT_ATTRS"},   /* Vol supports Extened Attributes */
+    {AFPVOL_ACLS,       "ACLS"},        /* Vol supports ACLs */
     {0, NULL}
 };