comparison: libidav/resource.c
libidav/resource.c
- branch
- dav-2
- changeset 921
- 3ffee649f0b1
- parent 920
- 92fcd6a8cf9e
equal
deleted
inserted
replaced
| 920:92fcd6a8cf9e | 921:3ffee649f0b1 |
|---|---|
| 1177 dav_session_set_error(res->session, ret, status); | 1177 dav_session_set_error(res->session, ret, status); |
| 1178 return 1; | 1178 return 1; |
| 1179 } | 1179 } |
| 1180 } | 1180 } |
| 1181 | 1181 |
| 1182 DavResource* dav_create_child(DavResource *parent, char *name) { | 1182 DavResource* dav_create_child(DavResource *parent, const char *name) { |
| 1183 DavResource *res = dav_resource_new_child(parent->session, parent, name); | 1183 DavResource *res = dav_resource_new_child(parent->session, parent, name); |
| 1184 if(dav_create(res)) { | 1184 if(dav_create(res)) { |
| 1185 dav_resource_free(res); | 1185 dav_resource_free(res); |
| 1186 return NULL; | 1186 return NULL; |
| 1187 } else { | 1187 } else { |
| 1333 } | 1333 } |
| 1334 return 0; | 1334 return 0; |
| 1335 } | 1335 } |
| 1336 } | 1336 } |
| 1337 | 1337 |
| 1338 static int dav_cp_mv_url(DavResource *res, char *desturl, _Bool copy, _Bool override) { | 1338 static int dav_cp_mv_url(DavResource *res, const char *desturl, _Bool copy, _Bool override) { |
| 1339 DavSession *sn = res->session; | 1339 DavSession *sn = res->session; |
| 1340 CURL *handle = sn->handle; | 1340 CURL *handle = sn->handle; |
| 1341 util_set_url(sn, dav_resource_get_href(res)); | 1341 util_set_url(sn, dav_resource_get_href(res)); |
| 1342 | 1342 |
| 1343 DavLock *lock = dav_get_lock(sn, res->path); | 1343 DavLock *lock = dav_get_lock(sn, res->path); |
| 1353 dav_session_set_error(sn, ret, status); | 1353 dav_session_set_error(sn, ret, status); |
| 1354 return 1; | 1354 return 1; |
| 1355 } | 1355 } |
| 1356 } | 1356 } |
| 1357 | 1357 |
| 1358 static int dav_cp_mv(DavResource *res, char *newpath, _Bool copy, _Bool override) { | 1358 static int dav_cp_mv(DavResource *res, const char *newpath, _Bool copy, _Bool override) { |
| 1359 char *dest = dav_session_get_href(res->session, newpath); | 1359 char *dest = dav_session_get_href(res->session, newpath); |
| 1360 char *desturl = util_get_url(res->session, dest); | 1360 char *desturl = util_get_url(res->session, dest); |
| 1361 dav_session_free(res->session, dest); | 1361 dav_session_free(res->session, dest); |
| 1362 | 1362 |
| 1363 int ret = dav_cp_mv_url(res, desturl, copy, override); | 1363 int ret = dav_cp_mv_url(res, desturl, copy, override); |
| 1364 free(desturl); | 1364 free(desturl); |
| 1365 return ret; | 1365 return ret; |
| 1366 } | 1366 } |
| 1367 | 1367 |
| 1368 int dav_copy(DavResource *res, char *newpath) { | 1368 int dav_copy(DavResource *res, const char *newpath) { |
| 1369 return dav_cp_mv(res, newpath, true, false); | 1369 return dav_cp_mv(res, newpath, true, false); |
| 1370 } | 1370 } |
| 1371 | 1371 |
| 1372 int dav_move(DavResource *res, char *newpath) { | 1372 int dav_move(DavResource *res, const char *newpath) { |
| 1373 return dav_cp_mv(res, newpath, false, false); | 1373 return dav_cp_mv(res, newpath, false, false); |
| 1374 } | 1374 } |
| 1375 | 1375 |
| 1376 int dav_copy_o(DavResource *res, char *newpath, DavBool override) { | 1376 int dav_copy_o(DavResource *res, const char *newpath, DavBool override) { |
| 1377 return dav_cp_mv(res, newpath, true, override); | 1377 return dav_cp_mv(res, newpath, true, override); |
| 1378 } | 1378 } |
| 1379 | 1379 |
| 1380 int dav_move_o(DavResource *res, char *newpath, DavBool override) { | 1380 int dav_move_o(DavResource *res, const char *newpath, DavBool override) { |
| 1381 return dav_cp_mv(res, newpath, false, override); | 1381 return dav_cp_mv(res, newpath, false, override); |
| 1382 } | 1382 } |
| 1383 | 1383 |
| 1384 int dav_copyto(DavResource *res, char *url, DavBool override) { | 1384 int dav_copyto(DavResource *res, const char *url, DavBool override) { |
| 1385 return dav_cp_mv_url(res, url, true, override); | 1385 return dav_cp_mv_url(res, url, true, override); |
| 1386 } | 1386 } |
| 1387 | 1387 |
| 1388 int dav_moveto(DavResource *res, char *url, DavBool override) { | 1388 int dav_moveto(DavResource *res, const char *url, DavBool override) { |
| 1389 return dav_cp_mv_url(res, url, false, override); | 1389 return dav_cp_mv_url(res, url, false, override); |
| 1390 } | 1390 } |
| 1391 | 1391 |
| 1392 int dav_lock(DavResource *res) { | 1392 int dav_lock(DavResource *res) { |
| 1393 return dav_lock_t(res, 0); | 1393 return dav_lock_t(res, 0); |
