Whoops, forgot two files from my last commit.

Pointy hat to:	me

diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index 0969bd2b1b84c72aff599ca85309c943a108d9ca..cc5cd15d69a68bfb9acc3e2328d205b3557f49b0 100644 (file)
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -1,5 +1,5 @@
 /*
- * $Id: adouble.h,v 1.7 2001-07-31 19:51:12 srittau Exp $
+ * $Id: adouble.h,v 1.8 2002-05-13 07:21:55 jmarcus Exp $
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -215,13 +215,14 @@ struct adouble {
 #if defined(TRY_64BITOFF_T) && (~0UL > 0xFFFFFFFFU)
 /* synchronization locks */
 #define AD_FILELOCK_BASE (0x80000000)
-#define AD_FILELOCK_WR   (AD_FILELOCK_BASE + 0)
-#define AD_FILELOCK_RD   (AD_FILELOCK_BASE + 1)
 #else
-#define AD_FILELOCK_BASE (0x7FFFFFFE)
-#define AD_FILELOCK_WR   (AD_FILELOCK_BASE + 0)
-#define AD_FILELOCK_RD   (AD_FILELOCK_BASE + 1)
+#define AD_FILELOCK_BASE (0x7FFFFFFF -4)
 #endif
+#define AD_FILELOCK_OPEN_WR        (AD_FILELOCK_BASE + 0)
+#define AD_FILELOCK_OPEN_RD       (AD_FILELOCK_BASE + 1)
+#define AD_FILELOCK_DENY_WR       (AD_FILELOCK_BASE + 2)
+#define AD_FILELOCK_DENY_RD        (AD_FILELOCK_BASE + 3)
+#define AD_FILELOCK_OPEN_NONE      (AD_FILELOCK_BASE + 4)
 
 /* time stuff. we overload the bits a little.  */
 #define AD_DATE_CREATE        0

diff --git a/libatalk/adouble/ad_lock.c b/libatalk/adouble/ad_lock.c
index d7ee2a18eccfa94859254ea5b17aa5fe56c42258..dc8c52d2d4ad64c264c34c784113151e1226a60d 100644 (file)
--- a/libatalk/adouble/ad_lock.c
+++ b/libatalk/adouble/ad_lock.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: ad_lock.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: ad_lock.c,v 1.4 2002-05-13 07:21:57 jmarcus Exp $
  *
  * Copyright (c) 1998,1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT for more information.
@@ -185,6 +185,55 @@ static __inline__  int adf_findxlock(struct ad_fd *ad,
 #define LOCK_RSRC_WR (1)
 #define LOCK_DATA_RD (2)
 #define LOCK_DATA_WR (3)
+
+#define LOCK_RSRC_DRD (4)
+#define LOCK_RSRC_DWR (5)
+#define LOCK_DATA_DRD (6)
+#define LOCK_DATA_DWR (7)
+
+#define LOCK_RSRC_NONE (8)
+#define LOCK_DATA_NONE (9)
+
+/* -------------- 
+       translate a data fork lock to an offset
+*/
+
+static int df2off(int off)
+{
+int start = off;
+       if (off == AD_FILELOCK_OPEN_WR)
+               start = LOCK_DATA_WR;
+       else if (off == AD_FILELOCK_OPEN_RD)
+               start = LOCK_DATA_RD;
+    else if (off == AD_FILELOCK_DENY_RD)
+               start = LOCK_DATA_DRD;
+       else if (off == AD_FILELOCK_DENY_WR)
+               start = LOCK_DATA_DWR;
+       else if (off == AD_FILELOCK_OPEN_NONE)
+               start = LOCK_DATA_NONE;
+       return start;
+}
+
+/* -------------- 
+       translate a resource fork lock to an offset
+*/
+
+static int hf2off(int off)
+{
+int start = off;
+       if (off == AD_FILELOCK_OPEN_WR)
+               start = LOCK_RSRC_WR;
+       else if (off == AD_FILELOCK_OPEN_RD)
+               start = LOCK_RSRC_RD;
+    else if (off == AD_FILELOCK_DENY_RD)
+               start = LOCK_RSRC_DRD;
+       else if (off == AD_FILELOCK_DENY_WR)
+               start = LOCK_RSRC_DWR;
+       else if (off == AD_FILELOCK_OPEN_NONE)
+               start = LOCK_RSRC_NONE;
+       return start;
+}
+
 int ad_fcntl_lock(struct adouble *ad, const u_int32_t eid, const int type,
                  const off_t off, const size_t len, const int user)
 {
@@ -195,23 +244,18 @@ int ad_fcntl_lock(struct adouble *ad, const u_int32_t eid, const int type,
   
   lock.l_start = off;
   if (eid == ADEID_DFORK) {
-    if ((type & ADLOCK_FILELOCK) && (ad_hfileno(ad) != -1)) {
-      adf = &ad->ad_hf;
-      if (off == AD_FILELOCK_WR)
-       lock.l_start = LOCK_DATA_WR;
-      else if (off == AD_FILELOCK_RD)
-       lock.l_start = LOCK_DATA_RD;
-    } else
-      adf = &ad->ad_df;
-
+    adf = &ad->ad_df;
+    if ((type & ADLOCK_FILELOCK)) {
+        if (ad_hfileno(ad) != -1) {
+               lock.l_start = df2off(off);
+            adf = &ad->ad_hf;
+        }
+    }
   } else { /* rfork */
     adf = &ad->ad_hf;
-    if (type & ADLOCK_FILELOCK) {
-      if (off == AD_FILELOCK_WR)
-       lock.l_start = LOCK_RSRC_WR;
-      else if (off == AD_FILELOCK_RD)
-       lock.l_start = LOCK_RSRC_RD;
-    } else
+    if (type & ADLOCK_FILELOCK) 
+      lock.l_start = hf2off(off);
+    else
       lock.l_start += ad_getentryoff(ad, eid);
   }
 
@@ -302,7 +346,57 @@ fcntl_lock_err:
   return -1;
 }
 
+/* -------------------------
+   we are using lock as tristate variable
+   
+   we have a lock ==> 1
+   no             ==> 0
+   error          ==> -1
+      
+*/
+int ad_testlock(struct adouble *ad, int eid, const off_t off)
+{
+  struct flock lock;
+  struct ad_fd *adf;
+  adf_lock_t *plock;
+  int i;
+  int lockmode;
+    
+  lock.l_start = off;
+  if (eid == ADEID_DFORK) {
+    adf = &ad->ad_df;
+    if ((ad_hfileno(ad) != -1)) {
+       adf = &ad->ad_hf;
+       lock.l_start = df2off(off);
+       }
+  } else { /* rfork */
+       adf = &ad->ad_hf;
+    lock.l_start = hf2off(off);
+  }
+
+  plock = adf->adf_lock;
+  /* Does we have a lock? */
+  lock.l_whence = SEEK_SET;
+  lock.l_len = 1;
+  for (i = 0; i < adf->adf_lockcount; i++) {
+    if (OVERLAP(lock.l_start, 1, plock[i].lock.l_start, plock[i].lock.l_len)) 
+        return 1;   /* */
+  }
+  /* Does another process have a lock? 
+     FIXME F_GETLK ?
+  */
+  lock.l_type = (ad_getoflags(ad, eid) & O_RDWR) ?F_WRLCK : F_RDLCK;                                           
+
+  if (fcntl(adf->adf_fd, F_SETLK, &lock) < 0) {
+    return (errno == EACCES)?1:-1;
+  }
+  
+  lock.l_type = F_UNLCK;
+  return fcntl(adf->adf_fd, F_SETLK, &lock);
+}
 
+/* -------------------------
+*/
 /* with temp locks, we don't need to distinguish within the same
  * process as everything is single-threaded. in addition, if
  * multi-threading gets added, it will only be in a few areas. */
@@ -318,7 +412,14 @@ int ad_fcntl_tmplock(struct adouble *ad, const u_int32_t eid, const int type,
     adf = &ad->ad_df;
   } else {
     adf = &ad->ad_hf;
-    lock.l_start += ad_getentryoff(ad, eid);
+    /* if ADLOCK_FILELOCK we want a lock from offset 0
+     * it's used when deleting a file:
+     * in open we put read locks on meta datas
+     * in delete a write locks on the whole file
+     * so if the file is open by somebody else it fails
+    */
+    if (!(type & ADLOCK_FILELOCK))
+        lock.l_start += ad_getentryoff(ad, eid);
   }
   lock.l_type = XLATE_FCNTL_LOCK(type & ADLOCK_MASK);
   lock.l_whence = SEEK_SET;