move loop polling for upload completion into separate function

fuse/filecache.c

@@ -69,8 +69,6 @@ int filecache_upload_patch(const char *quickkey, uint64_t local_revision,
     char           *patch_file;
     int             retval;
     char           *upload_key;
-    int             status;
-    int             fileerror;
 
     cachefile = strdup_printf("%s/%s_%d", filecache_path, quickkey,
                               local_revision);
@@ -151,26 +149,14 @@ int filecache_upload_patch(const char *quickkey, uint64_t local_revision,
         return -1;
     }
     // poll for completion
-    for (;;) {
+    retval = mfconn_upload_poll_for_completion(conn, upload_key);
-        // no need to update the secret key after this
-        retval = mfconn_api_upload_poll_upload(conn, upload_key,
-                                               &status, &fileerror);
-        if (retval != 0) {
-            fprintf(stderr, "mfconn_api_upload_poll_upload failed\n");
-            return -1;
-        }
-        fprintf(stderr, "status: %d, filerror: %d\n", status, fileerror);
-
-        // values 98 and 99 are terminal states for a completed upload
-        if (status == 99 || status == 98) {
-            fprintf(stderr, "done\n");
-            break;
-        }
-        sleep(1);
-    }
-
     free(upload_key);
 
+    if (retval != 0) {
+        fprintf(stderr, "mfconn_upload_poll_for_completion failed\n");
+        return -1;
+    }
+
     return 0;
 }
 

fuse/operations.c

@@ -450,8 +450,6 @@ int mediafirefs_release(const char *path, struct fuse_file_info *file_info)
     int             retval;
     struct mediafirefs_context_private *ctx;
     struct mediafirefs_openfile *openfile;
-    int             status;
-    int             fileerror;
 
     ctx = fuse_get_context()->private_data;
 
@@ -511,26 +509,14 @@ int mediafirefs_release(const char *path, struct fuse_file_info *file_info)
             return -EACCES;
         }
         // poll for completion
-        for (;;) {
+        retval = mfconn_upload_poll_for_completion(ctx->conn, upload_key);
-            // no need to update the secret key after this
-            retval = mfconn_api_upload_poll_upload(ctx->conn, upload_key,
-                                                   &status, &fileerror);
-            if (retval != 0) {
-                fprintf(stderr, "mfconn_api_upload_poll_upload failed\n");
-                return -1;
-            }
-            fprintf(stderr, "status: %d, filerror: %d\n", status, fileerror);
-
-            // values 98 and 99 are terminal states for a completed upload
-            if (status == 99 || status == 98) {
-                fprintf(stderr, "done\n");
-                break;
-            }
-            sleep(1);
-        }
-
         free(upload_key);
 
+        if (retval != 0) {
+            fprintf(stderr, "mfconn_upload_poll_for_completion failed\n");
+            return -1;
+        }
+
         folder_tree_update(ctx->tree, ctx->conn, true);
         return 0;
     }

mfapi/apicalls.c

@@ -22,7 +22,7 @@
 
 #include "../utils/http.h"
 
-const char *mfconn_file_link_types[] = {
+const char     *mfconn_file_link_types[] = {
     "normal_download",
     "direct_download",
     "view",

mfapi/apicalls.h

@@ -54,7 +54,7 @@ enum mfconn_file_link_type {
     MFCONN_FILE_LINK_TYPE_ONE_TIME_DOWNLOAD
 };
 
-extern const char *mfconn_file_link_types[]; // declared in apicalls.c
+extern const char *mfconn_file_link_types[];    // declared in apicalls.c
 
 struct mfconn_device_change {
     enum mfconn_device_change_type change;
@@ -72,7 +72,8 @@ int             mfconn_api_file_get_info(mfconn * conn, mffile * file,
 
 int             mfconn_api_file_get_links(mfconn * conn, mffile * file,
                                           const char *quickkey,
-                                          enum mfconn_file_link_type link_mask);
+                                          enum mfconn_file_link_type
+                                          link_mask);
 
 int             mfconn_api_file_move(mfconn * conn, const char *quickkey,
                                      const char *folderkey);

mfapi/mfconn.c

@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "../utils/strings.h"
 #include "apicalls.h"
@@ -402,3 +403,29 @@ int mfconn_get_max_num_retries(mfconn * conn)
 {
     return conn->max_num_retries;
 }
+
+int mfconn_upload_poll_for_completion(mfconn * conn, const char *upload_key)
+{
+    int             status;
+    int             fileerror;
+    int             retval;
+
+    for (;;) {
+        // no need to update the secret key after this
+        retval = mfconn_api_upload_poll_upload(conn, upload_key, &status,
+                                               &fileerror);
+        if (retval != 0) {
+            fprintf(stderr, "mfconn_api_upload_poll_upload failed\n");
+            return -1;
+        }
+        fprintf(stderr, "status: %d, filerror: %d\n", status, fileerror);
+
+        // values 98 and 99 are terminal states for a completed upload
+        if (status == 99 || status == 98) {
+            fprintf(stderr, "done\n");
+            break;
+        }
+        sleep(1);
+    }
+    return 0;
+}

mfapi/mfconn.h

@@ -59,4 +59,7 @@ uint32_t        mfconn_get_secret_key(mfconn * conn);
 
 int             mfconn_get_max_num_retries(mfconn * conn);
 
+int             mfconn_upload_poll_for_completion(mfconn * conn,
+                                                  const char *upload_key);
+
 #endif

mfshell/commands/put.c

@@ -21,10 +21,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <libgen.h>
 
 #include "../../mfapi/apicalls.h"
+#include "../../mfapi/mfconn.h"
 #include "../mfshell.h"
 #include "../../mfapi/folder.h"
 #include "../commands.h"        // IWYU pragma: keep
@@ -36,8 +36,6 @@ int mfshell_cmd_put(mfshell * mfshell, int argc, char *const argv[])
     char           *temp;
     char           *file_name;
     char           *upload_key;
-    int             status;
-    int             fileerror;
     FILE           *fh;
 
     if (mfshell == NULL)
@@ -83,23 +81,13 @@ int mfshell_cmd_put(mfshell * mfshell, int argc, char *const argv[])
     fprintf(stderr, "upload_key: %s\n", upload_key);
 
     // poll for completion
-    for (;;) {
+    retval = mfconn_upload_poll_for_completion(mfshell->conn, upload_key);
-        // no need to update the secret key after this
-        retval = mfconn_api_upload_poll_upload(mfshell->conn, upload_key,
-                                               &status, &fileerror);
-        if (retval != 0) {
-            fprintf(stderr, "mfconn_api_upload_poll_upload failed\n");
-            return -1;
-        }
-        fprintf(stderr, "status: %d, filerror: %d\n", status, fileerror);
-        if (status == 99) {
-            fprintf(stderr, "done\n");
-            break;
-        }
-        sleep(1);
-    }
-
     free(upload_key);
 
+    if (retval != 0) {
+        fprintf(stderr, "mfconn_upload_poll_for_completion failed\n");
+        return -1;
+    }
+
     return 0;
 }

utils/http.c

@@ -72,7 +72,7 @@ static void http_curl_reset(mfhttp * conn)
     curl_easy_setopt(conn->curl_handle, CURLOPT_VERBOSE, 0L);
 
     // it should never take 5 seconds to establish a connection to the server
-    curl_easy_setopt(conn->curl_handle, CURLOPT_CONNECTTIMEOUT_MS,5000L);
+    curl_easy_setopt(conn->curl_handle, CURLOPT_CONNECTTIMEOUT_MS, 5000L);
 
     //curl_easy_setopt(conn->curl_handle, CURLOPT_SSL_VERIFYPEER, 0L);
 }