comparison: dav/scfg.c
dav/scfg.c
- changeset 778
- bf53db813cc9
- parent 747
- efbd59642577
- child 783
- 36a7f2ea7d12
equal
deleted
inserted
replaced
| 777:15006651a5d1 | 778:bf53db813cc9 |
|---|---|
| 427 char *path = NULL; | 427 char *path = NULL; |
| 428 char *trash = NULL; | 428 char *trash = NULL; |
| 429 char *collection = NULL; | 429 char *collection = NULL; |
| 430 char *repository = NULL; | 430 char *repository = NULL; |
| 431 char *database = NULL; | 431 char *database = NULL; |
| 432 char *logfile = NULL; | |
| 432 TagConfig *tagconfig = NULL; | 433 TagConfig *tagconfig = NULL; |
| 433 Versioning *versioning = NULL; | 434 Versioning *versioning = NULL; |
| 434 CxList *include = cxLinkedListCreateSimple(sizeof(regex_t)); | 435 CxList *include = cxLinkedListCreateSimple(sizeof(regex_t)); |
| 435 CxList *exclude = cxLinkedListCreateSimple(sizeof(regex_t)); | 436 CxList *exclude = cxLinkedListCreateSimple(sizeof(regex_t)); |
| 436 CxList *tagfilter = cxLinkedListCreateSimple(CX_STORE_POINTERS); | 437 CxList *tagfilter = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
| 477 if(scfg_load_filter(node, include, exclude, tagfilter)) { | 478 if(scfg_load_filter(node, include, exclude, tagfilter)) { |
| 478 return 1; | 479 return 1; |
| 479 } | 480 } |
| 480 } else if(xstreq(node->name, "database")) { | 481 } else if(xstreq(node->name, "database")) { |
| 481 database = value; | 482 database = value; |
| 483 } else if(xstreq(node->name, "logfile")) { | |
| 484 logfile = value; | |
| 482 } else if(xstreq(node->name, "tagconfig")) { | 485 } else if(xstreq(node->name, "tagconfig")) { |
| 483 tagconfig = parse_tagconfig(node); | 486 tagconfig = parse_tagconfig(node); |
| 484 } else if(xstreq(node->name, "splitconfig")) { | 487 } else if(xstreq(node->name, "splitconfig")) { |
| 485 int err = 0; | 488 int err = 0; |
| 486 splitconfig = parse_splitconfig(node, &err); | 489 splitconfig = parse_splitconfig(node, &err); |
| 622 dir->name = strdup(name); | 625 dir->name = strdup(name); |
| 623 dir->path = scfg_create_path(path); | 626 dir->path = scfg_create_path(path); |
| 624 dir->collection = collection ? strdup(collection) : NULL; | 627 dir->collection = collection ? strdup(collection) : NULL; |
| 625 dir->repository = strdup(repository); | 628 dir->repository = strdup(repository); |
| 626 dir->database = strdup(database); | 629 dir->database = strdup(database); |
| 630 dir->logfile = strdup(logfile); | |
| 627 dir->tagconfig = tagconfig; | 631 dir->tagconfig = tagconfig; |
| 628 dir->versioning = versioning; | 632 dir->versioning = versioning; |
| 629 dir->max_retry = max_retry; | 633 dir->max_retry = max_retry; |
| 630 dir->allow_cmd = allow_cmd; | 634 dir->allow_cmd = allow_cmd; |
| 631 dir->backuppull = backuppull; | 635 dir->backuppull = backuppull; |
