Changeset 4121

Timestamp:

Jun 6, 2005, 11:21:05 AM (21 years ago)

Author:

jhoblitt

Message:

misc cleanups
some code additions

Location:

trunk/Nebulous/nebclient/src

Files:

• nebclient.c (modified) (6 diffs)
• nebclient.h (modified) (3 diffs)

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.2 2005-01-18 23:36:40 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.3 2005-06-06 21:21:05 jhoblitt Exp $
  */
 
@@ -22 +22 @@
 #define ERRBUF_SIZE 255
 
+static off_t idataCopyFile(char *source, char *dest);
+static off_t idataCopyFilehandle(int sourceFH, int destFH);
+
 void idataServerInit(idataServer *server)
 {
@@ -56 +59 @@
     if (soap_call_ns1__create_USCOREobject(server, NULL, NULL, key, class, volume, comment, &response) == SOAP_OK) {
         *URI = xmalloc(strlen(response.result));
-        strcpy(*URI,response.result);
+        strcpy(*URI, response.result);
 
         if (!idataParseURI(*URI, &filename)) {
@@ -82 +85 @@
     struct ns1__replicate_USCOREobjectResponse response;
     char            *filename;
-    int             file;
+    int             sourceFH, destFH;
 
     if (soap_call_ns1__replicate_USCOREobject(server, NULL, NULL, key, volume, &response) == SOAP_OK) {
         *URI = xmalloc(strlen(response.result));
-        strcpy(*URI,response.result);
+        strcpy(*URI, response.result);
 
         if (!idataParseURI(*URI, &filename)) {
@@ -94 +97 @@
         }
 
-        //idataOpen(key, "read");
-        //idataCopyFilehandle(
-
+        sourceFH = idataOpen(server, key, IDATA_READ);
+        if (sourceFH == -1) {
+            fprintf(stderr, "can not open key %s\n", key );
+
+            return -1;
+        }
+
+        destFH = open(filename, O_RDWR|O_TRUNC, 0660);
+        if (destFH == -1) {
+            fprintf(stderr, "can not open %s: %s\n", filename, strerror(errno));
+
+            return -1;
+        }
+
+        idataCopyFilehandle(sourceFH, destFH);
+
+        if (close(sourceFH) == -1) {
+            fprintf(stderr, "can not close file: %s", strerror(errno));
+
+            return -1;
+        }
+
+        if (close(destFH) == -1) {
+            fprintf(stderr, "can not close %s: %s", filename, strerror(errno));
+
+            return -1;
+        }
     }
 
@@ -121 +148 @@
 }
 
-int idataFindInstances(idataServer *server, char *key, char *volume )
-{
-
-    return 0;
+int idataFindInstances(idataServer *server, char *key, char *volume, char ***locations)
+{
+    struct ns1__find_USCOREinstancesResponse response;
+    int             resultElements = 0;
+    int             i;
+    char            **resultArray;
+    char            **loc;
+
+    // FIXME is this leaking memory when response goes out of scope?
+    if (soap_call_ns1__find_USCOREinstances(server, NULL, NULL, key, volume, &response) == SOAP_OK) {
+
+        resultElements = response.result->__size;
+        resultArray    = response.result->__ptr;
+
+        loc = xmalloc(sizeof(char*) * resultElements);
+
+        for (i = 0; i < resultElements; i++) {
+            loc[i] = xmalloc(strlen(resultArray[i]) + 1);
+
+            strcpy(loc[i], resultArray[i]);
+        }
+
+        *locations = loc;
+
+        return resultElements;
+    }
+
+    // server error
+    return -1;
 }
 

trunk/Nebulous/nebclient/src/nebclient.h

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.h,v 1.4 2005-01-19 00:18:08 jhoblitt Exp $
+ * $Id: nebclient.h,v 1.5 2005-06-06 21:21:05 jhoblitt Exp $
  */
 
@@ -31 +31 @@
 int idataUnlock(idataServer *server, char *key, rw flag);
 
-int idataFindInstances(idataServer *server, char *key, char *volume);
+int idataFindInstances(idataServer *server, char *key, char *volume, char ***locations);
 
 int idataFind(idataServer *server, char *key);
@@ -53 +53 @@
 void idataFree(void *ptr);
 
-static off_t idataCopyFile(char *source, char *dest);
-
-static off_t idataCopyFilehandle(int sourceFH, int destFH);
-
 #endif // IDATACLIENT_H