diff --git a/Makefile.am b/Makefile.am index f9e53fa5..ade6a17c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,7 +127,9 @@ endif echo --- Create some files, sync and check in RAID5/6/TP $(TESTENV) ./mktest$(EXEEXT) generate 1 4 $(CHECKCOUNT) $(CHECKSIZE) $(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -v -c $(CONF) diff > test.log + $(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -v -c $(CONF) diff -G > test.log $(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -v -c $(CONF) dup + $(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -v -c $(CONF) dup -G $(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) --test-force-order-physical sync $(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) status if HAVE_SYMLINK diff --git a/check.c b/check.c index 32809db0..c2ee95d3 100644 --- a/check.c +++ b/check.c @@ -175,7 +175,7 @@ static int repair_step(struct snapraid_state* state, int rehash, unsigned pos, u return 0; } - fprintf(stdlog, "error:%u:qarity: Data error\n", pos); + fprintf(stdlog, "error:%u:q-parity: Data error\n", pos); ++error; } @@ -197,7 +197,7 @@ static int repair_step(struct snapraid_state* state, int rehash, unsigned pos, u return 0; } - fprintf(stdlog, "error:%u:parity/qarity: Data error\n", pos); + fprintf(stdlog, "error:%u:parity/q-parity: Data error\n", pos); ++error; } @@ -228,7 +228,7 @@ static int repair_step(struct snapraid_state* state, int rehash, unsigned pos, u return 0; } - fprintf(stdlog, "error:%u:parity/qarity: Data error\n", pos); + fprintf(stdlog, "error:%u:parity/q-parity: Data error\n", pos); ++error; } diff --git a/dup.c b/dup.c index 19425bfd..d7d6adc5 100644 --- a/dup.c +++ b/dup.c @@ -95,7 +95,7 @@ void state_dup(struct snapraid_state* state) count = 0; size = 0; - + /* for each disk */ for(i=state->disklist;i!=0;i=i->next) { tommy_node* j; diff --git a/snapraid.c b/snapraid.c index 6d21be4f..fccea839 100644 --- a/snapraid.c +++ b/snapraid.c @@ -508,6 +508,21 @@ int main(int argc, char* argv[]) raid_init(); crc32c_init(); + /* open the log file */ + if (log == 0) + log = "2"; + if (strcmp(log, "1") == 0) { + stdlog = stdout; + } else if (strcmp(log, "2") == 0) { + stdlog = stderr; + } else { + stdlog = fopen(log, "wt"); + if (!stdlog) { + fprintf(stderr, "Error opening the log file '%s'. %s.\n", log, strerror(errno)); + exit(EXIT_FAILURE); + } + } + if (!opt.skip_self) selftest(opt.gui); @@ -534,21 +549,6 @@ int main(int argc, char* argv[]) (void)lock; #endif - /* open the log file */ - if (log == 0) - log = "2"; - if (strcmp(log, "1") == 0) { - stdlog = stdout; - } else if (strcmp(log, "2") == 0) { - stdlog = stderr; - } else { - stdlog = fopen(log, "wt"); - if (!stdlog) { - fprintf(stderr, "Error opening the log file '%s'. %s.\n", log, strerror(errno)); - exit(EXIT_FAILURE); - } - } - if (operation == OPERATION_DIFF) { state_read(&state);