Merge master branch

Author: Ivan Stoev

gitcommit.h

@@ -0,0 +1,8 @@
+#ifndef _GITCOMMIT_H
+#define _GITCOMMIT_H
+
+#define GIT_PREV_COMMIT_ID "94bcb6bc2320e3a73c2e3fccbda649bd79421db7"
+#define GIT_PREV_COMMIT_DATE "2016-12-21 18:57:17 +0200"
+#define GIT_COMMIT_DATE "2016-12-22 01:29:14 +0200"
+
+#endif

pCloudCC/lib/pclsync/Makefile

@@ -7,6 +7,7 @@ USESSL=mbed
 #CFLAGS=-Wall -Wpointer-arith -O2 -g -fsanitize=address -mtune=core2
 CFLAGS=-Wall -Wpointer-arith -O2 -g -fno-stack-protector -fomit-frame-pointer -mtune=core2 -fPIC
 #CFLAGS=-O2 -g -pg
+#CFLAGS=-Wall -Wpointer-arith -O2 -g -mtune=core2 -I../../psync32/zlib -I../../psync32/sqlite -m32 -D_FILE_OFFSET_BITS=64
 
 #CMAKE whants lib extension 
 LIB_A=libpsynclib.a 
@@ -39,7 +40,8 @@ endif
 OBJ=pcompat.o psynclib.o plocks.o plibs.o pcallbacks.o pdiff.o pstatus.o papi.o ptimer.o pupload.o pdownload.o pfolder.o\
      psyncer.o ptasks.o psettings.o pnetlibs.o pcache.o pscanner.o plist.o plocalscan.o plocalnotify.o pp2p.o\
      pcrypto.o pssl.o pfileops.o ptree.o ppassword.o prunratelimit.o pmemlock.o pnotifications.o pexternalstatus.o publiclinks.o\
-     pbusinessaccount.o pcontacts.o poverlay.o poverlay_lin.o poverlay_mac.o poverlay_win.o pcompression.o pasyncnet.o ppathstatus.o
+     pbusinessaccount.o pcontacts.o poverlay.o poverlay_lin.o poverlay_mac.o poverlay_win.o pcompression.o pasyncnet.o ppathstatus.o\
+     pdevice_monitor.o
 
 OBJFS=pfs.o ppagecache.o pfsfolder.o pfstasks.o pfsupload.o pintervaltree.o pfsxattr.o pcloudcrypto.o pfscrypto.o pcrc32c.o pfsstatic.o plocks.o
 

pCloudCC/lib/pclsync/pbusinessaccount.c

@@ -621,7 +621,7 @@ void psync_update_cryptostatus(){
   uint64_t u, crexp, crsub = 0, is_business = 0;
   int crst = 0,crstat;
 
-  binparam params[] = { P_STR("auth", psync_my_auth) };
+  binparam params[] = { P_STR("auth", psync_my_auth), P_STR("timeformat","timestamp") };
   res = psync_api_run_command("userinfo", params);
   if (!res) {
     debug(D_WARNING, "Send command returned invalid result.\n");
@@ -691,34 +691,44 @@ static int check_write_permissions (psync_folderid_t folderid) {
    psync_sql_free_result(res);
    return ret;
 }
-
-psync_folderid_t psync_check_and_create_folder (const char * path) {
-  psync_folderid_t folderid=psync_get_folderid_by_path_or_create(path);
-  if (folderid==PSYNC_INVALID_FOLDERID || (!check_write_permissions(folderid))){
-    char *buff=NULL;
-    uint32_t bufflen;
-    int ind = 1;
-    char *err=NULL;
+static psync_folderid_t create_index_folder(const char * path) {
+  char *buff=NULL;
+  uint32_t bufflen;
+  int ind = 1;
+  char * err;
+  psync_folderid_t folderid;
 
-    while (ind < 100) {
-      folderid=PSYNC_INVALID_FOLDERID;
-      bufflen = strlen(path) + 1 /*zero char*/ + 3 /*parenthesis*/ + 3 /*up to 3 digit index*/;
-      buff = (char *) psync_malloc(bufflen);
-      snprintf(buff, bufflen - 1, "%s (%d)", path, ind);
-      if (psync_create_remote_folder_by_path(buff, &err)!=0)
-        debug(D_NOTICE, "Unable to create folder %s error is %s.", buff, err);
-      folderid=psync_get_folderid_by_path_or_create(buff);
-      if ((folderid!=PSYNC_INVALID_FOLDERID)&&check_write_permissions(folderid)) {
-        psync_free(buff);
-        break;
-      }
-      ++ind;
-
-      if (err)
-        psync_free(err);
+  while (ind < 100) {
+    folderid=PSYNC_INVALID_FOLDERID;
+    bufflen = strlen(path) + 1 /*zero char*/ + 3 /*parenthesis*/ + 3 /*up to 3 digit index*/;
+    buff = (char *) psync_malloc(bufflen);
+    snprintf(buff, bufflen - 1, "%s (%d)", path, ind);
+    if (psync_create_remote_folder_by_path(buff, &err)!=0)
+      debug(D_NOTICE, "Unable to create folder %s error is %s.", buff, err);
+    folderid=psync_get_folderid_by_path(buff);
+    if ((folderid!=PSYNC_INVALID_FOLDERID)&&check_write_permissions(folderid)) {
       psync_free(buff);
+      break;
     }
+    ++ind;
+    if (err)
+      psync_free(err);
+    psync_free(buff);
   }
+  return folderid;
+}
+psync_folderid_t psync_check_and_create_folder (const char * path) {
+  psync_folderid_t folderid=psync_get_folderid_by_path(path);
+  char *err;
+  
+  if (folderid==PSYNC_INVALID_FOLDERID) {
+    if(psync_create_remote_folder_by_path(path, &err)!=0) {
+      debug(D_NOTICE, "Unable to create folder %s error is %s.", path, err);
+      psync_free(err);
+      folderid = create_index_folder(path);
+    }
+  } else if (!check_write_permissions(folderid))
+   folderid = create_index_folder(path);
 
   return folderid; 
 }

pCloudCC/lib/pclsync/pcallbacks.c

@@ -172,6 +172,13 @@ static char *fill_formatted_time(char *str, uint64_t totalsec){
   return str;
 }
 
+static uint64_t sub_no_underf(uint64_t a, uint64_t b){
+  if (likely(b<a))
+    return a-b;
+  else
+    return 0;
+}
+
 static void status_fill_formatted_str(pstatus_t *status, char *downloadstr, char *uploadstr){
   char *up, *dw;
   uint64_t remsec;
@@ -188,12 +195,12 @@ static void status_fill_formatted_str(pstatus_t *status, char *downloadstr, char
         dw=cat_const(dw, "Stopped. ");
       else if (status->localisfull)
         dw=cat_const(dw, "Disk full. ");
-      dw=fill_remaining(dw, status->filestodownload, status->bytestodownload-status->bytesdownloaded);
+      dw=fill_remaining(dw, status->filestodownload, sub_no_underf(status->bytestodownload, status->bytesdownloaded));
     }
     else{
       dw=fill_formatted_bytes(dw, speed);
       dw=cat_const(dw, "/sec, ");
-      dw=fill_remaining(dw, status->filestodownload, status->bytestodownload-status->bytesdownloaded);
+      dw=fill_remaining(dw, status->filestodownload, sub_no_underf(status->bytestodownload, status->bytesdownloaded));
       remsec=(status->bytestodownload-status->bytesdownloaded)/speed;
       if (remsec<DONT_SHOW_TIME_IF_SEC_OVER || speed>=DONT_SHOW_TIME_IF_SPEED_BELOW){
         *dw++=' ';
@@ -213,12 +220,12 @@ static void status_fill_formatted_str(pstatus_t *status, char *downloadstr, char
         up=cat_const(up, "Stopped. ");
       else if (status->remoteisfull)
         up=cat_const(up, "Account full. ");
-      up=fill_remaining(up, status->filestoupload, status->bytestoupload-status->bytesuploaded);
+      up=fill_remaining(up, status->filestoupload, sub_no_underf(status->bytestoupload, status->bytesuploaded));
     }
     else{
       up=fill_formatted_bytes(up, speed);
       up=cat_const(up, "/sec, ");
-      up=fill_remaining(up, status->filestoupload, status->bytestoupload-status->bytesuploaded);
+      up=fill_remaining(up, status->filestoupload, sub_no_underf(status->bytestoupload, status->bytesuploaded));
       remsec=(status->bytestoupload-status->bytesuploaded)/speed;
       if (remsec<DONT_SHOW_TIME_IF_SEC_OVER || speed>=DONT_SHOW_TIME_IF_SPEED_BELOW){
         *up++=' ';