* More work in progress - list buckets starting to work

2 files changed, 16 insertions, 5 deletions

diff --git a/inc/libs3.h b/inc/libs3.h
index d27bcf5..f554358 100644
--- a/inc/libs3.h
+++ b/inc/libs3.h
@@ -97,7 +97,17 @@ typedef enum
     S3StatusFailedToCreateRequestContext                    ,
     S3StatusMetaHeadersTooLong                              ,
     S3StatusBadMetaHeader                                   ,
-    S3StatusHeadersTooLong
+    S3StatusBadContentType                                  ,
+    S3StatusContentTypeTooLong                              ,
+    S3StatusBadMD5                                          ,
+    S3StatusMD5TooLong                                      ,
+    S3StatusBadContentDispositionFilename                   ,
+    S3StatusContentDispositionFilenameTooLong               ,
+    S3StatusBadContentEncoding                              ,
+    S3StatusContentEncodingTooLong                          ,
+    S3StatusHeadersTooLong                                  ,
+    S3StatusKeyTooLong                                      ,
+    S3StatusUriTooLong
 } S3Status;
 
 
@@ -486,7 +496,7 @@ typedef struct S3RequestHeaders
      * information is typically only delivered to users who download the
      * content via a web browser.
      **/
-    struct timeval *expires;
+    const time_t *expires;
     /**
      * This identifies the "canned ACL" that should be used for this object.
      * The default (0) gives only the owner of the object access to it.
diff --git a/inc/private.h b/inc/private.h
index 5640313..3249866 100644
--- a/inc/private.h
+++ b/inc/private.h
@@ -116,7 +116,7 @@ typedef struct RequestParams
     // The number of x-amz- headers
     int amzHeadersCount;
     // Storage for amzHeaders (the +256 is for x-amz-acl and x-amz-date)
-    char *amzHeadersRaw[COMPACTED_META_HEADER_BUFFER_SIZE + 256 + 1];
+    char amzHeadersRaw[COMPACTED_META_HEADER_BUFFER_SIZE + 256 + 1];
     // Canonicalized x-amz- headers
     char canonicalizedAmzHeaders[COMPACTED_META_HEADER_BUFFER_SIZE + 256 + 1];
     // URL-Encoded key
@@ -135,8 +135,6 @@ typedef struct RequestParams
     char expiresHeader[128];
     // Authorization header
     char authorizationHeader[128];
-    // Uri
-    char uri[MAX_URI_SIZE + 1];
 } RequestParams;
 
 
@@ -150,6 +148,9 @@ typedef struct Request
     // The CURL structure driving the request
     CURL *curl;
 
+    // The HTTP headers to use for the curl request
+    struct curl_slist *headers;
+
     // libcurl requires that the uri be stored outside of the curl handle
     char uri[MAX_URI_SIZE + 1];