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

store the error string for files in the tree

Browse source
This commit is contained in:
Olivier Goffart 2013-03-28 13:04:13 +01:00
parent b4ec9f887c
commit 6659ee6d76
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/csync.c
View file

@ -583,6 +583,7 @@ static int _csync_treewalk_visitor(void *obj, void *data) {
trav.type = cur->type; trav.type = cur->type;
trav.instruction = cur->instruction; trav.instruction = cur->instruction;
trav.rename_path = cur->destpath; trav.rename_path = cur->destpath;
trav.error_string = cur->error_string;
rc = (*visitor)(&trav, twctx->userdata); rc = (*visitor)(&trav, twctx->userdata);
cur->instruction = trav.instruction; cur->instruction = trav.instruction;
@ -672,6 +673,7 @@ static void _tree_destructor(void *data) {
freedata = (csync_file_stat_t *) data; freedata = (csync_file_stat_t *) data;
SAFE_FREE(freedata->md5); SAFE_FREE(freedata->md5);
SAFE_FREE(freedata->destpath); SAFE_FREE(freedata->destpath);
SAFE_FREE(freedata->error_string);
SAFE_FREE(freedata); SAFE_FREE(freedata);
} }

1
src/csync.h
View file

@ -161,6 +161,7 @@ struct csync_tree_walk_file_s {
enum csync_instructions_e instruction; enum csync_instructions_e instruction;
const char *rename_path; const char *rename_path;
const char *error_string;
}; };
typedef struct csync_tree_walk_file_s TREE_WALK_FILE; typedef struct csync_tree_walk_file_s TREE_WALK_FILE;

1
src/csync_private.h
View file

@ -184,6 +184,7 @@ struct csync_file_stat_s {
char *destpath; /* for renames */ char *destpath; /* for renames */
const char *md5; const char *md5;
const char *error_string;
enum csync_instructions_e instruction; /* u32 */ enum csync_instructions_e instruction; /* u32 */
char path[1]; /* u8 */ char path[1]; /* u8 */

20
src/csync_propagate.c
View file

@ -57,11 +57,21 @@ static int _csync_cleanup_cmp(const void *a, const void *b) {
return strcmp(st_a->path, st_b->path); return strcmp(st_a->path, st_b->path);
} }
static void _csync_file_stat_set_error(csync_file_stat_t *st, const char *error)
{
st->instruction = CSYNC_INSTRUCTION_ERROR;
if (st->error_string)
return; // do not override first error.
st->error_string = c_strdup(error);
}
/* Record the error in the ctx->progress /* Record the error in the ctx->progress
pi may be a previous csync_progressinfo_t from the database. pi may be a previous csync_progressinfo_t from the database.
If pi is NULL, a new one is created, else it is re-used If pi is NULL, a new one is created, else it is re-used
*/ */
static void _csync_record_error(CSYNC *ctx, csync_file_stat_t *st, csync_progressinfo_t *pi) { static void _csync_record_error(CSYNC *ctx, csync_file_stat_t *st, csync_progressinfo_t *pi)
{
_csync_file_stat_set_error(st, csync_get_error_string(ctx));
if (pi) { if (pi) {
pi->error++; pi->error++;
} else { } else {
@ -541,7 +551,6 @@ out:
/* set instruction for the statedb merger */ /* set instruction for the statedb merger */
if (rc != 0) { if (rc != 0) {
st->instruction = CSYNC_INSTRUCTION_ERROR;
if (turi != NULL) { if (turi != NULL) {
if (_push_to_tmp_first(ctx)) { if (_push_to_tmp_first(ctx)) {
/* Remove the tmp file in error case. */ /* Remove the tmp file in error case. */
@ -679,7 +688,7 @@ static int _csync_backup_file(CSYNC *ctx, csync_file_stat_t *st) {
out: out:
/* set instruction for the statedb merger */ /* set instruction for the statedb merger */
if (rc != 0) { if (rc != 0) {
st->instruction = CSYNC_INSTRUCTION_ERROR; _csync_file_stat_set_error(st, csync_get_error_string(ctx));
} }
SAFE_FREE(suri); SAFE_FREE(suri);
@ -817,9 +826,8 @@ out:
/* set instruction for the statedb merger */ /* set instruction for the statedb merger */
if (rc != 0) { if (rc != 0) {
st->instruction = CSYNC_INSTRUCTION_ERROR; _csync_file_stat_set_error(st, csync_get_error_string(ctx));
if (other) { if (other) {
other->instruction = CSYNC_INSTRUCTION_ERROR;
/* We set the instruction to UPDATED so next try we try to rename again */ /* We set the instruction to UPDATED so next try we try to rename again */
st->instruction = CSYNC_INSTRUCTION_UPDATED; st->instruction = CSYNC_INSTRUCTION_UPDATED;
@ -1014,7 +1022,6 @@ out:
/* set instruction for the statedb merger */ /* set instruction for the statedb merger */
if (rc != 0) { if (rc != 0) {
st->instruction = CSYNC_INSTRUCTION_ERROR;
_csync_record_error(ctx, st, pi); _csync_record_error(ctx, st, pi);
pi = NULL; pi = NULL;
} }
@ -1101,7 +1108,6 @@ out:
/* set instruction for the statedb merger */ /* set instruction for the statedb merger */
if (rc != 0) { if (rc != 0) {
st->instruction = CSYNC_INSTRUCTION_ERROR;
_csync_record_error(ctx, st, pi); _csync_record_error(ctx, st, pi);
pi = NULL; pi = NULL;
} }