fix possible huge sleep (stuck) in upload due to a race with timer and sleep time calculation underflow

Author: virco

pcallbacks.c

@@ -201,7 +201,7 @@ static void status_fill_formatted_str(pstatus_t *status, char *downloadstr, char
       }
     }
   }
-  else 
+  else
     dw=cat_const(dw, "Everything Downloaded");
 
   if (status->filestoupload){
@@ -226,7 +226,7 @@ static void status_fill_formatted_str(pstatus_t *status, char *downloadstr, char
       }
     }
   }
-  else 
+  else
     up=cat_const(up, "Everything Uploaded");
 
   assert(dw<downloadstr+MAX_STATUS_STR_LEN);
@@ -269,7 +269,7 @@ static void status_change_thread(void *ptr){
           (status_old.status == PSTATUS_PAUSED) ||
           (status_old.status == PSTATUS_OFFLINE) ) )
     )
-      psync_run_ratelimited("Rebuild icons.", psync_rebuild_icons, 1, 1);
+      psync_run_ratelimited("rebuild icons", psync_rebuild_icons, 1, 1);
     status_old = psync_status;
     pthread_mutex_unlock(&statusmutex);
     if (!psync_do_run)

pcompat.c

@@ -3138,7 +3138,8 @@ void psync_rebuild_icons(){
 void psync_rebuild_icons(){
   if (!overlays_running)
     return;
-  return;}
+  return;
+}
 #endif
 
 int psync_invalidate_os_cache(const char *path){

pupload.c

@@ -1007,14 +1007,17 @@ static int task_uploadfile(psync_syncid_t syncid, psync_folderid_t localfileid,
     else{
       ret=0;
       do {
-        psync_milisleep((psync_stat_mtime(&st)+PSYNC_UPLOAD_OLDER_THAN_SEC-ctime)*1000+500);
-        ctime=psync_timer_time();
+        if (ctime<psync_stat_mtime(&st))
+          ctime=psync_stat_mtime(&st);
+        if (psync_stat_mtime(&st)+PSYNC_UPLOAD_OLDER_THAN_SEC>ctime)
+          psync_milisleep((psync_stat_mtime(&st)+PSYNC_UPLOAD_OLDER_THAN_SEC-ctime)*1000+500);
         if (psync_stat(localpath, &st)){
           debug(D_NOTICE, "can not stat %s anymore, failing for now", localpath);
           psync_free(localpath);
           return -1;
         }
-      } while (psync_stat_mtime(&st)>=psync_timer_time()-PSYNC_UPLOAD_OLDER_THAN_SEC && ++ret<=10);
+        ctime=psync_timer_time();
+      } while (psync_stat_mtime(&st)>=ctime-PSYNC_UPLOAD_OLDER_THAN_SEC && ++ret<=10);
       if (ret==10){
         debug(D_NOTICE, "file %s kept changing %d times, skipping for now", localpath, ret);
         psync_free(localpath);