comparison: dav/sync.c
dav/sync.c
- changeset 316
- 9d0505d80044
- parent 313
- d721250984d0
- child 318
- 7e0694423838
equal
deleted
inserted
replaced
| 315:7db4dbf4e6f9 | 316:9d0505d80044 |
|---|---|
| 304 char *locktokenfile = NULL; | 304 char *locktokenfile = NULL; |
| 305 DavBool locked = FALSE; | 305 DavBool locked = FALSE; |
| 306 DavResource *root = dav_resource_new(sn, "/"); | 306 DavResource *root = dav_resource_new(sn, "/"); |
| 307 root->iscollection = TRUE; | 307 root->iscollection = TRUE; |
| 308 if((dir->lockpush || cmd_getoption(a, "lock")) && !cmd_getoption(a, "nolock")) { | 308 if((dir->lockpush || cmd_getoption(a, "lock")) && !cmd_getoption(a, "nolock")) { |
| 309 if(dav_lock(root)) { | 309 if(dav_lock_t(root, dir->lock_timeout)) { |
| 310 print_resource_error(sn, "/"); | 310 print_resource_error(sn, "/"); |
| 311 dav_session_destroy(sn); | 311 dav_session_destroy(sn); |
| 312 fprintf(stderr, "Abort\n"); | 312 fprintf(stderr, "Abort\n"); |
| 313 return -1; | 313 return -1; |
| 314 } | 314 } |
| 845 | 845 |
| 846 // lock repository | 846 // lock repository |
| 847 DavBool locked = FALSE; | 847 DavBool locked = FALSE; |
| 848 char *locktokenfile = NULL; | 848 char *locktokenfile = NULL; |
| 849 if((dir->lockpush || cmd_getoption(a, "lock")) && !cmd_getoption(a, "nolock")) { | 849 if((dir->lockpush || cmd_getoption(a, "lock")) && !cmd_getoption(a, "nolock")) { |
| 850 if(dav_lock(root)) { | 850 if(dav_lock_t(root, dir->lock_timeout)) { |
| 851 print_resource_error(sn, "/"); | 851 print_resource_error(sn, "/"); |
| 852 dav_session_destroy(sn); | 852 dav_session_destroy(sn); |
| 853 fprintf(stderr, "Abort\n"); | 853 fprintf(stderr, "Abort\n"); |
| 854 return -1; | 854 return -1; |
| 855 } | 855 } |
