Merge pull request #28 from hansdude/master

Added the S3 compatible GET and PUT commands back.

Author: hansdude

src/ds3.c

@@ -709,6 +709,11 @@ ds3_request* ds3_init_get_bucket(const char* bucket_name) {
     return (ds3_request*) _common_request_init(HTTP_GET, _build_path("/", bucket_name, NULL));
 }
 
+ds3_request* ds3_init_get_object(const char* bucket_name, const char* object_name) {
+    struct _ds3_request* request = _common_request_init(HTTP_GET, _build_path("/", bucket_name, object_name));
+    return (ds3_request*) request;
+}
+
 ds3_request* ds3_init_get_object_for_job(const char* bucket_name, const char* object_name, uint64_t offset, const char* job_id) {
     char buff[21];
     struct _ds3_request* request = _common_request_init(HTTP_GET, _build_path("/", bucket_name, object_name));
@@ -725,6 +730,12 @@ ds3_request* ds3_init_delete_object(const char* bucket_name, const char* object_
     return (ds3_request*) _common_request_init(HTTP_DELETE, _build_path("/", bucket_name, object_name));
 }
 
+ds3_request* ds3_init_put_object(const char* bucket_name, const char* object_name, uint64_t length) {
+    struct _ds3_request* request = _common_request_init(HTTP_PUT, _build_path("/", bucket_name, object_name));
+    request->length = length;
+    return (ds3_request*) request;
+}
+
 ds3_request* ds3_init_put_object_for_job(const char* bucket_name, const char* object_name, uint64_t offset, uint64_t length, const char* job_id) {
     struct _ds3_request* request = _common_request_init(HTTP_PUT, _build_path("/", bucket_name, object_name));
     char buff[21];

src/ds3.h

@@ -197,8 +197,10 @@ LIBRARY_API ds3_error*  ds3_create_client_from_env(ds3_client** client);
 
 LIBRARY_API ds3_request* ds3_init_get_service(void);
 LIBRARY_API ds3_request* ds3_init_get_bucket(const char* bucket_name);
+LIBRARY_API ds3_request* ds3_init_get_object(const char* bucket_name, const char* object_name);
 LIBRARY_API ds3_request* ds3_init_get_object_for_job(const char* bucket_name, const char* object_name, uint64_t offset, const char* job_id);
 LIBRARY_API ds3_request* ds3_init_put_bucket(const char* bucket_name);
+LIBRARY_API ds3_request* ds3_init_put_object(const char* bucket_name, const char* object_name, uint64_t size);
 LIBRARY_API ds3_request* ds3_init_put_object_for_job(const char* bucket_name, const char* object_name, uint64_t offset, uint64_t length, const char* job_id);
 LIBRARY_API ds3_request* ds3_init_delete_bucket(const char* bucket_name);
 LIBRARY_API ds3_request* ds3_init_delete_object(const char* bucket_name, const char* object_name);

test/test.cpp

@@ -33,8 +33,8 @@ void print_error(const ds3_error* error) {
 void handle_error(ds3_error* error) {
     if (error != NULL) {
         print_error(error);
-        ds3_free_error(error);
         BOOST_FAIL("Test failed with a ds3_error");
+        ds3_free_error(error);
     }
 }