@@ -539,6 +539,7 @@ static void task_cloud_sync_backup_file(struct item_file *file)
539
539
CS_FILE_KEY (file ),
540
540
sizeof (new_path ));
541
541
strftime (new_path + len , sizeof (new_path ) - len , "-%y%m%d-%H%M%S" , & tm_ );
542
+ pathname_conform_slashes_to_os (new_path );
542
543
fill_pathname_basedir (new_dir , new_path , sizeof (new_dir ));
543
544
path_mkdir (new_dir );
544
545
filestream_rename (file -> path , new_path );
@@ -583,7 +584,8 @@ static void task_cloud_sync_fetch_server_file(task_cloud_sync_state_t *sync_stat
583
584
struct string_list * dirlist = task_cloud_sync_directory_map ();
584
585
struct item_file * server_file = & sync_state -> server_manifest -> list [sync_state -> server_idx ];
585
586
const char * key = CS_FILE_KEY (server_file );
586
- const char * path = strchr (key , PATH_DEFAULT_SLASH_C ()) + 1 ;
587
+ /* the key from the server file is in "portable" format, use '/' */
588
+ const char * path = strchr (key , '/' ) + 1 ;
587
589
settings_t * settings = config_get_ptr ();
588
590
589
591
/* we're just fetching a file the server has, we can update this now */
@@ -604,6 +606,7 @@ static void task_cloud_sync_fetch_server_file(task_cloud_sync_state_t *sync_stat
604
606
if (!string_starts_with (key , dirlist -> elems [i ].data ))
605
607
continue ;
606
608
fill_pathname_join_special (filename , dirlist -> elems [i ].userdata , path , sizeof (filename ));
609
+ pathname_conform_slashes_to_os (filename );
607
610
break ;
608
611
}
609
612
if (string_is_empty (filename ))
0 commit comments