Changeset 4639

Timestamp:

Jul 27, 2005, 6:13:32 PM (21 years ago)

Author:

jhoblitt

Message:

nebOpen(server, key, NEB_WRITE) is not allowed when object has multiple instances

Location:

trunk/Nebulous/nebclient

Files:

• src/nebclient.c (modified) (3 diffs)
• tests/tests.c (modified) (2 diffs)

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.28 2005-07-28 02:55:20 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.29 2005-07-28 04:13:32 jhoblitt Exp $
  */
 
@@ -311 +311 @@
     char            **locations;
     char            *filename;
+    int             instances;
     int             fh;
 
-    if (nebFindInstances(server, key, NULL, &locations) < 0) {
+    instances = nebFindInstances(server, key, NULL, &locations);
+    if (instances < 1) {
         nebSetErr(server, "no instances found");
 
@@ -326 +328 @@
 
     if (flag == NEB_WRITE) {
+        if (instances > 1) {
+            nebSetErr(server, "write not allowed with multiple instances");
+            nebFree(filename);
+
+            return -1;
+        }
         fh = open(filename, O_RDWR);
     } else {

trunk/Nebulous/nebclient/tests/tests.c

@@ -21 +21 @@
     char            *key = "foobarbaz";
 
-    TESTS(16);
+    TESTS(17);
 
     if (getenv("NEBULOUS_SERVER")) {
@@ -43 +43 @@
 
     OK(nebReplicate(server, key, NULL, NULL), "replicate object");
+
+    OK(nebOpen(server, key, NEB_WRITE) < 0, "write to object with multiple instances");
 
     OK(nebCull(server, key), "cull object");