fixes

Author: antonpcloud

poverlay.c

@@ -139,8 +139,9 @@ void psync_start_overlay_callbacks(){
 
 void get_answer_to_request(message *request, message *replay)
 {
-  char msg[4] = "Ok.";
   external_status stat = INVSYNC;
+  memcpy(replay->value, "Ok.", 4);
+  replay->length=sizeof(message)+4;
   //debug(D_NOTICE, "Client Request type [%u] len [%lu] string: [%s]", request->type, request->length, request->value);
   if (request->type < 20 ) {
 
@@ -182,30 +183,26 @@ void get_answer_to_request(message *request, message *replay)
         break;
       default:
         replay->type=13;
-        memcpy(msg, "No.", 4);
+        memcpy(replay->value, "No.", 4);
     }
   } else if ((callbacks_running)&&(request->type < 36)) {
     int ind = request->type - 20;
     int ret = 0;
     if (callbacks[ind]) {
       if ((ret = callbacks[ind](request->value)) == 0) {
         replay->type = 0;
-        replay->length = sizeof(message)+4;
-        strncpy(replay->value, msg, 4);
       } else {
         replay->type = ret;
-        strncpy(msg,"No.\0",4);
+        memcpy(replay->value, "No.", 4);
       }
-      strncpy(replay->value, msg, 4);
-      replay->length = sizeof(message)+4;
     } else {
       replay->type = 13;
-      strncpy(replay->value, "No callback with this id registered.\0", 37);
+      memcpy(replay->value, "No callback with this id registered.", 37);
       replay->length = sizeof(message)+37;
     }
   } else {
       replay->type = 13;
-      strncpy(replay->value, "Invalid type.\0", 14);
+      memcpy(replay->value, "Invalid type.", 14);
       replay->length = sizeof(message)+14;
     }
 

ppathstatus.c

@@ -374,6 +374,8 @@ static psync_path_status_t rdunlock_return_in_prog() {
 }
 
 static psync_path_status_t psync_path_status_drive_folder_locked(psync_folderid_t folderid) {
+  if (get_folder_tasks(folderid, 0))
+    return rdunlock_return_in_prog();
   psync_sql_rdunlock();
   return PSYNC_PATH_STATUS_IN_SYNC;
 }
@@ -472,6 +474,7 @@ static psync_path_status_t psync_path_status_drive(const char *path, size_t path
             folderid=ce->itemid;
             flags=ce->flags;
             found=1;
+            poff=off+1;
             break;
           }
         if (found)
@@ -504,6 +507,7 @@ static psync_path_status_t psync_path_status_drive(const char *path, size_t path
         memcpy(ce->hash, hash, sizeof(hash));
         ce->itemid=folderid;
         ce->flags=flags;
+        poff=off+1;
       }
     }
   if (poff==path_len)
@@ -519,7 +523,7 @@ static psync_path_status_t psync_path_status_drive(const char *path, size_t path
   h=(hash[0]+hash[2])%PATH_HASH_SIZE;
   found=0;
   psync_list_for_each_element (ce, &path_cache_hash[h], path_cache_entry_t, list_hash)
-    if (!memcmp(hash, ce->hash, sizeof(hash)) && (ce->flags&ENTRY_FLAG_FOLDER)) {
+    if (!memcmp(hash, ce->hash, sizeof(hash))) {
       if (wrlocked) {
         psync_list_del(&ce->list_lru);
         psync_list_add_tail(&path_cache_lru, &ce->list_lru);