Changeset 23536 for branches/neb_distrib_20081210/Nebulous/nebclient/src/nebclient.c

Timestamp:

Mar 25, 2009, 3:37:05 PM (17 years ago)

Author:

eugene

Message:

merging differences from trunk: ptest.pl was re-written; nebGetXattr, nebRemoveXattr, nebListXattr functions and tests added; updates to Doxyfile.in; Build.PL removes nebclient installation

Location:

branches/neb_distrib_20081210/Nebulous

Files:

• . (modified) (2 props)
• nebclient (modified) (1 prop)
• nebclient/src/nebclient.c (modified) (5 diffs)

branches/neb_distrib_20081210/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.54.6.1 2008-12-14 22:03:08 eugene Exp $
+ * $Id: nebclient.c,v 1.57 2009-02-13 02:45:47 jhoblitt Exp $
  */
 
@@ -336 +336 @@
 bool nebSetXattr(nebServer *server, const char *key, const char *name, const char *value, nebCR flag)
 {
-
     REQUIRE_SERVER;
 
@@ -363 +362 @@
     if (!response) {
         nebSetErr(server, "can not set xattr");
+        return false;
+    }
+
+    return true;
+}
+
+
+char *nebGetXattr(nebServer *server, const char *key, const char *name) 
+{
+    REQUIRE_SERVER;
+
+    if (!key) {
+        nebSetErr(server, "parameter 'key' may not be NULL");
+        return false;
+    }
+    if (!name) {
+        nebSetErr(server, "parameter 'name' may not be NULL");
+        return false;
+    }
+
+    struct ns1__getxattr_USCOREobjectResponse response;
+    if (soap_call_ns1__getxattr_USCOREobject(server->soap, server->endpoint,
+        NULL, (char *)key, (char *)name, (char **)&response) != SOAP_OK) {
+        nebSetServerErr(server);
+        return false;
+    }
+
+    if (!(char *)response.result) {
+        nebSetErr(server, "server returned no result");
+        return NULL;
+    }
+
+    char *value = xmalloc(strlen((char *)response.result) + 1);
+    strcpy(value, (char *)response.result);
+
+    return value;
+}
+
+
+int nebListXattr(nebServer *server, const char *key, char ***xattrs)
+{
+    REQUIRE_SERVER;
+
+    if (!key) {
+        nebSetErr(server, "parameter 'key' may not be NULL");
+        return false;
+    }
+
+    struct ns1__listxattr_USCOREobjectResponse response;
+    if (soap_call_ns1__listxattr_USCOREobject(server->soap, server->endpoint,
+        NULL, (char *)key, &response) != SOAP_OK) {
+        nebSetServerErr(server);
+        return false;
+    }
+
+    int resultElements = response.result->__size;
+
+    if (xattrs) {
+        char **resultArray = response.result->__ptr;
+        *xattrs = xmalloc(resultElements * sizeof(char *));
+        if (resultElements) {
+            for (int i = 0; i < resultElements; i++) {
+                *xattrs[i] = xmalloc(strlen(resultArray[i]) + 1);
+                strcpy(*xattrs[i], resultArray[i]);
+            }
+
+        }
+    }
+
+    return resultElements;
+}
+
+
+bool nebRemoveXattr(nebServer *server, const char *key, const char *name)
+{
+    REQUIRE_SERVER;
+
+    if (!key) {
+        nebSetErr(server, "parameter 'key' may not be NULL");
+        return false;
+    }
+    if (!name) {
+        nebSetErr(server, "parameter 'name' may not be NULL");
+        return false;
+    }
+
+    int response;
+    if (soap_call_ns1__removexattr_USCOREobject(server->soap, server->endpoint,
+        NULL, (char *)key, (char *)name, &response) != SOAP_OK) {
+        nebSetServerErr(server);
+        return false;
+    }
+
+    if (!response) {
+        nebSetErr(server, "can not remove xattr");
         return false;
     }
@@ -539 +633 @@
 
     for (int i = 0; i < locations->n; i++) {
-        if (!nebDeleteInstance(server, key, locations->URI[i])) {
+      if (!nebDeleteInstance(server, key, locations->URI[i])) {
             nebSetErr(server, "can not delete instance");
             nebObjectInstancesFree(locations);
@@ -676 +770 @@
 
     if (soap_call_ns1__delete_USCOREinstance(server->soap, server->endpoint,
-            NULL, (char *)key, (char *)URI, &response) != SOAP_OK) {
+        NULL, (char *)key, (char *)URI, &response) != SOAP_OK) {
         nebFree(filename);