minor fixes

7 files changed, 37 insertions, 24 deletions

diff --git a/src/lib/sync_api_download.c b/src/lib/sync_api_download.c
index a8750c1..719c1dc 100644
--- a/src/lib/sync_api_download.c
+++ b/src/lib/sync_api_download.c
@@ -203,7 +203,7 @@ handle_header (char *buffer,
     return total;
   }
   hdr_val = strtok (NULL,
-                    "");
+                    "\n\r");
   if (NULL == hdr_val)
   {
     GNUNET_free (ndup);
@@ -270,7 +270,7 @@ SYNC_download (struct GNUNET_CURL_Context *ctx,
   pub_str = GNUNET_STRINGS_data_to_string_alloc (pub,
                                                  sizeof (*pub));
   GNUNET_asprintf (&download->url,
-                   "%s%sbackup/%s",
+                   "%s%sbackups/%s",
                    base_url,
                    '/' == base_url[strlen (base_url) - 1]
                    ? ""
diff --git a/src/lib/test_sync_api.c b/src/lib/test_sync_api.c
index 25cd08f..3a1d942 100644
--- a/src/lib/test_sync_api.c
+++ b/src/lib/test_sync_api.c
@@ -219,6 +219,19 @@ run (void *cls,
                                     MHD_HTTP_NO_CONTENT,
                                     "Test-1",
                                     strlen ("Test-1")),
+    /* now updated upload should succeed */
+    SYNC_TESTING_cmd_backup_upload ("backup-upload-3",
+                                    sync_url,
+                                    "backup-upload-2",
+                                    SYNC_TESTING_UO_NONE,
+                                    MHD_HTTP_NO_CONTENT,
+                                    "Test-3",
+                                    strlen ("Test-3")),
+    /* Test download: no backup exists */
+    SYNC_TESTING_cmd_backup_download ("download-3",
+                                      sync_url,
+                                      MHD_HTTP_OK,
+                                      "backup-upload-3"),
 
     TALER_TESTING_cmd_end ()
   };
diff --git a/src/lib/testing_api_cmd_backup_download.c b/src/lib/testing_api_cmd_backup_download.c
index 5377900..b77ed41 100644
--- a/src/lib/testing_api_cmd_backup_download.c
+++ b/src/lib/testing_api_cmd_backup_download.c
@@ -166,7 +166,7 @@ backup_download_run (void *cls,
     if (GNUNET_OK !=
         SYNC_TESTING_get_trait_hash (upload_cmd,
                                      SYNC_TESTING_TRAIT_HASH_PREVIOUS,
-                                     &bds->upload_hash))
+                                     &bds->prev_upload_hash))
     {
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (bds->is);
diff --git a/src/sync/sync-httpd.c b/src/sync/sync-httpd.c
index 8700a50..14b2470 100644
--- a/src/sync/sync-httpd.c
+++ b/src/sync/sync-httpd.c
@@ -243,19 +243,19 @@ url_handler (void *cls,
     if (0 == strcasecmp (method,
                          MHD_HTTP_METHOD_GET))
     {
-      return sync_handler_backup_get (connection,
-                                      &account_pub);
+      return SH_backup_get (connection,
+                            &account_pub);
     }
     if (0 == strcasecmp (method,
                          MHD_HTTP_METHOD_POST))
     {
       int ret;
 
-      ret = sync_handler_backup_post (connection,
-                                      con_cls,
-                                      &account_pub,
-                                      upload_data,
-                                      upload_data_size);
+      ret = SH_backup_post (connection,
+                            con_cls,
+                            &account_pub,
+                            upload_data,
+                            upload_data_size);
       hc = *con_cls;
       if (NULL != hc)
       {
diff --git a/src/sync/sync-httpd_backup.c b/src/sync/sync-httpd_backup.c
index 8f5facc..0b4f6a0 100644
--- a/src/sync/sync-httpd_backup.c
+++ b/src/sync/sync-httpd_backup.c
@@ -33,8 +33,8 @@
  * @return MHD result code
  */
 int
-sync_handler_backup_get (struct MHD_Connection *connection,
-                         const struct SYNC_AccountPublicKeyP *account)
+SH_backup_get (struct MHD_Connection *connection,
+               const struct SYNC_AccountPublicKeyP *account)
 {
   struct GNUNET_HashCode backup_hash;
   enum SYNC_DB_QueryStatus qs;
diff --git a/src/sync/sync-httpd_backup.h b/src/sync/sync-httpd_backup.h
index 6326266..f90c3c5 100644
--- a/src/sync/sync-httpd_backup.h
+++ b/src/sync/sync-httpd_backup.h
@@ -54,8 +54,8 @@ SH_return_backup (struct MHD_Connection *connection,
  * @return MHD result code
  */
 int
-sync_handler_backup_get (struct MHD_Connection *connection,
-                         const struct SYNC_AccountPublicKeyP *account);
+SH_backup_get (struct MHD_Connection *connection,
+               const struct SYNC_AccountPublicKeyP *account);
 
 
 /**
@@ -67,11 +67,11 @@ sync_handler_backup_get (struct MHD_Connection *connection,
  * @return MHD result code
  */
 int
-sync_handler_backup_post (struct MHD_Connection *connection,
-                          void **con_cls,
-                          const struct SYNC_AccountPublicKeyP *account,
-                          const char *upload_data,
-                          size_t *upload_data_size);
+SH_backup_post (struct MHD_Connection *connection,
+                void **con_cls,
+                const struct SYNC_AccountPublicKeyP *account,
+                const char *upload_data,
+                size_t *upload_data_size);
 
 
 #endif
diff --git a/src/sync/sync-httpd_backup_post.c b/src/sync/sync-httpd_backup_post.c
index f203691..f0acc5a 100644
--- a/src/sync/sync-httpd_backup_post.c
+++ b/src/sync/sync-httpd_backup_post.c
@@ -599,11 +599,11 @@ handle_database_error (struct BackupContext *bc,
  * @return MHD result code
  */
 int
-sync_handler_backup_post (struct MHD_Connection *connection,
-                          void **con_cls,
-                          const struct SYNC_AccountPublicKeyP *account,
-                          const char *upload_data,
-                          size_t *upload_data_size)
+SH_backup_post (struct MHD_Connection *connection,
+                void **con_cls,
+                const struct SYNC_AccountPublicKeyP *account,
+                const char *upload_data,
+                size_t *upload_data_size)
 {
   struct BackupContext *bc;