mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 05:45:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Only refresh the folder id for remote replica

Browse source 
Also don't remove trailing slash, there is no trailing slashes in the
path
This commit is contained in:
Olivier Goffart 2012-12-05 18:10:46 +01:00
parent 69a979c16b
commit ce94beb068
3 changed files with 12 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/csync.c
View file

@ -708,7 +708,6 @@ int csync_destroy(CSYNC *ctx) {
/* free memory */
c_rbtree_free(ctx->local.tree);
c_list_free(ctx->local.list);
c_list_free(ctx->local.id_list);
c_rbtree_free(ctx->remote.tree);
c_list_free(ctx->remote.list);
c_list_free(ctx->remote.id_list);

1
src/csync_private.h
View file

@ -98,7 +98,6 @@ struct csync_s {
char *uri;
c_rbtree_t *tree;
c_list_t *list;
c_list_t *id_list;
enum csync_replica_e type;
} local;

46
src/csync_propagate.c
View file

@ -50,22 +50,12 @@ static int _csync_cleanup_cmp(const void *a, const void *b) {
static void _store_id_update(CSYNC *ctx, csync_file_stat_t *st) {
c_list_t *list = NULL;
CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "SYNCED remember dir: %s", st->path);
switch (ctx->current) {
case LOCAL_REPLICA:
list = c_list_prepend(ctx->local.id_list, (void*)st);
if( list != NULL ) {
ctx->local.id_list = list;
}
break;
case REMOTE_REPLICA:
list = c_list_prepend(ctx->remote.id_list, (void*)st);
if(list != NULL ) {
ctx->remote.id_list = list;
}
break;
list = c_list_prepend(ctx->remote.id_list, (void*)st);
if( list != NULL ) {
ctx->remote.id_list = list;
}
}
@ -1115,21 +1105,13 @@ static int _csync_correct_id(CSYNC *ctx) {
const char *replica = NULL;
char *path = NULL;
switch (ctx->current) {
case LOCAL_REPLICA:
list = ctx->local.id_list;
tree = ctx->local.tree;
replica = "LOCAL_REPLICA";
break;
case REMOTE_REPLICA:
list = ctx->remote.id_list;
tree = ctx->remote.tree;
replica = "REMOTE_REPLICA";
break;
default:
break;
if (ctx->current != REMOTE_REPLICA) {
return 0;
}
list = ctx->remote.id_list;
tree = ctx->remote.tree;
if (list == NULL) {
return 0;
}
@ -1163,7 +1145,6 @@ static int _csync_correct_id(CSYNC *ctx) {
int len;
c_rbnode_t *node = NULL;
char pathbuf[PATH_MAX] = {'\0' };
char *old_path = path;
csync_file_stat_t *tfs = NULL;
@ -1172,7 +1153,7 @@ static int _csync_correct_id(CSYNC *ctx) {
if( seen_dirs && c_list_find_custom( seen_dirs, path, _cmp_char)) {
// CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "saw this dir already: %s", path);
} else {
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "climb on dir: %s (%s)", path, replica);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "climb on dir: %s", path);
seen_dirs = c_list_prepend( seen_dirs, c_strdup(path));
/* Find the correct target entry. */
@ -1200,11 +1181,8 @@ static int _csync_correct_id(CSYNC *ctx) {
}
}
}
/* get the parent dir */
/* copy one byte less, omit the trailing slash */
strncpy( pathbuf, path, strlen(path)-1 );
/* and get the path name */
path = c_dirname( pathbuf );
/* get the parent dir */
path = c_dirname( path );
/* free the old path memory */
SAFE_FREE(old_path );