Merge master

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

diff --git a/include/atalk/volume.h b/include/atalk/volume.h
index da367964c389f0cc98033b26be16b966fc2299d5..6d651128bd81178b27e3494cf06a416dce021db5 100644 (file)
--- a/include/atalk/volume.h
+++ b/include/atalk/volume.h
@@ -6,6 +6,7 @@
 #ifndef ATALK_VOLUME_H
 #define ATALK_VOLUME_H 1
 
+#include <stdint.h>
 #include <sys/types.h>
 
 #include <atalk/unicode.h>
@@ -16,11 +17,11 @@
 #define AFPVOL_U8MNAMELEN   255 /* AFP3 sepc */
 #define AFPVOL_MACNAMELEN    27 /* AFP2 spec */
 
-typedef u_int64_t VolSpace;
+typedef uint64_t VolSpace;
 
 struct vol {
     struct vol      *v_next;
-    u_int16_t       v_vid;
+    uint16_t        v_vid;
     int             v_flags;
     char            *v_path;
     struct dir      *v_root;
@@ -28,8 +29,8 @@ struct vol {
 
     charset_t       v_volcharset;
     charset_t       v_maccharset;
-    u_int16_t       v_mtou_flags;    /* flags for convert_charset in mtoupath */
-    u_int16_t       v_utom_flags;
+    uint16_t        v_mtou_flags;    /* flags for convert_charset in mtoupath */
+    uint16_t        v_utom_flags;
     long            v_kTextEncoding; /* mac charset encoding in network order
                                       * FIXME: should be a u_int32_t ? */
     size_t          max_filename;
@@ -61,7 +62,10 @@ struct vol {
     char            *v_gvs;
     void            *v_nfsclient;
     int             v_nfs;
-
+    VolSpace        v_tm_used;  /* used bytes on a TM volume */
+    time_t          v_tm_cachetime; /* time at which v_tm_used was calculated last */
+    VolSpace        v_appended; /* amount of data appended to files */
+    
     /* only when opening/closing volumes or in error */
     int             v_casefold;
     char            *v_localname;   /* as defined in AppleVolumes.default */
@@ -127,10 +131,7 @@ struct vol {
 #define AFPVOL_TM        (1 << 23)   /* Supports TimeMachine */
 #define AFPVOL_ACLS      (1 << 24)   /* Volume supports ACLS */
 #define AFPVOL_SEARCHDB  (1 << 25)   /* Use fast CNID db search instead of filesystem */
-/* Found this in branch dir-rewrite, maybe we want to use it sometimes */
-#if 0
-#define AFPVOL_CDROM     (1 << XX)   /* Ejectable media eg CD -> in memory CNID db */
-#endif
+#define AFPVOL_NONETIDS  (1 << 26)   /* signal the client it shall do privelege mapping */
 
 /* Extended Attributes vfs indirection  */
 #define AFPVOL_EA_NONE           0   /* No EAs */
@@ -169,7 +170,7 @@ int wincheck(const struct vol *vol, const char *path);
 #define VOLPBIT_ATTR_BLANKACCESS  (1 << 4)
 #define VOLPBIT_ATTR_UNIXPRIV     (1 << 5)
 #define VOLPBIT_ATTR_UTF8         (1 << 6)
-#define VOLPBIT_ATTR_NONETUID     (1 << 7)
+#define VOLPBIT_ATTR_NONETIDS     (1 << 7)
 #define VOLPBIT_ATTR_EXT_ATTRS    (1 << 10)
 #define VOLPBIT_ATTR_ACLS         (1 << 11)
 #define VOLPBIT_ATTR_TM           (1 << 13)
@@ -190,7 +191,8 @@ int wincheck(const struct vol *vol, const char *path);
 
 #define utf8_encoding() (afp_version >= 30)
 
-#define vol_noadouble(vol) (((vol)->v_flags & AFPVOL_NOADOUBLE) ? 1 : 0)
+#define vol_noadouble(vol) ((((vol)->v_flags & AFPVOL_NOADOUBLE) \
+                             || ((vol)->v_adouble & AD_VERSION_EA)) ? 1 : 0)
 #define vol_nodev(vol) (((vol)->v_flags & AFPVOL_NODEV) ? 1 : 0)
 #define vol_unix_priv(vol) (afp_version >= 30 && ((vol)->v_flags & AFPVOL_UNIX_PRIV))
 #define vol_inv_dots(vol) (((vol)->v_flags & AFPVOL_INV_DOTS) ? 1 : 0)