dav/main.c

Tue, 13 Nov 2018 20:35:30 +0100

author
Mike Becker <universe@uap-core.de>
date
Tue, 13 Nov 2018 20:35:30 +0100
changeset 494
3aed354185eb
parent 489
fb69eae42ef0
child 498
37af2eac3e6a
permissions
-rw-r--r--

fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error

1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
364
3769ba002fd1 updates copyright date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 363
diff changeset
4 * Copyright 2018 Olaf Wintermann. All rights reserved.
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #include <stdio.h>
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30 #include <stdlib.h>
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
31 #include <string.h>
182
ca07f14f7bfe added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 181
diff changeset
32 #include <stdbool.h>
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
33 #include <errno.h>
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
34 #include <unistd.h>
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
35 #include <time.h>
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
36 #include <sys/types.h>
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
37 #include <ucx/string.h>
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
38 #include <ucx/utils.h>
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
39 #include <dirent.h>
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
40
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
41 #include <libidav/utils.h>
40
a95ee94b9204 supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 38
diff changeset
42 #include <libidav/crypto.h>
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
43 #include <libidav/session.h>
361
b6f2462ee055 adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 355
diff changeset
44 #include <libidav/xml.h>
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
45 #include "config.h"
191
0e45b04236a7 more specific error messages in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
46 #include "error.h"
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
47 #include "assistant.h"
410
0b9bea2d7283 adds file io abstraction functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
48 #include "system.h"
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
49 #include "pwd.h"
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
50 #include "main.h"
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
51
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
52 static DavContext *ctx;
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
53
142
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
54 static int printxmlerror = 1;
46
0542668d0f26 added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 45
diff changeset
55 static void xmlerrorfnc(void * c, const char * msg, ... ) {
142
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
56 if(printxmlerror) {
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
57 va_list ap;
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
58 va_start(ap, msg);
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
59 vfprintf(stderr, msg, ap);
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
60 va_end(ap);
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
61 }
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
62 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
63
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
64 //define DO_THE_TEST
363
e9ed8e130ccf adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 361
diff changeset
65 //include <libidav/davqlparser.h>
e9ed8e130ccf adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 361
diff changeset
66 //include <libidav/davqlexec.h>
e9ed8e130ccf adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 361
diff changeset
67 //include "tags.h"
e9ed8e130ccf adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 361
diff changeset
68
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
69 void test() {
363
e9ed8e130ccf adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 361
diff changeset
70
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
71 }
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
72
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
73 int main(int argc, char **argv) {
34
1b87b3b1921e removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 33
diff changeset
74 if(argc < 2) {
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
75 fprintf(stderr, "Missing command\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
76 print_usage(argv[0]);
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
77 return -1;
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
78 }
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
79
34
1b87b3b1921e removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 33
diff changeset
80 char *cmd = argv[1];
1b87b3b1921e removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 33
diff changeset
81 CmdArgs *args = cmd_parse_args(argc - 2, argv + 2);
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
82 if(!args) {
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
83 print_usage(argv[0]);
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
84 return -1;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
85 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
86
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
87 xmlGenericErrorFunc fnc = xmlerrorfnc;
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
88 initGenericErrorDefaultFunc(&fnc);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
89 ctx = dav_context_new();
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
90 dav_add_namespace(ctx, "apache", "http://apache.org/dav/props/");
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
91 int cfgret = load_config(ctx);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
92 int ret = EXIT_FAILURE;
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
93 printxmlerror = 0;
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
94 #ifdef DO_THE_TEST
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
95 test();
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
96 return 0;
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
97 #endif
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
98 if(!strcmp(cmd, "check") || !strcmp(cmd, "check-config")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
99 if(!cfgret) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
100 fprintf(stdout, "Configuration OK.\n");
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
101 ret = EXIT_SUCCESS;
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
102 } else {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
103 /* no output, the warnings are written by load_config */
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
104 ret = EXIT_FAILURE;
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
105 }
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
106 } else if(!cfgret) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
107 if(!strcasecmp(cmd, "list") || !strcasecmp(cmd, "ls")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
108 ret = cmd_list(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
109 } else if(!strcasecmp(cmd, "get")) {
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
110 ret = cmd_get(args, FALSE);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
111 } else if(!strcasecmp(cmd, "put")) {
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
112 ret = cmd_put(args, FALSE);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
113 } else if(
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
114 !strcasecmp(cmd, "remove") ||
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
115 !strcasecmp(cmd, "rm") ||
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
116 !strcasecmp(cmd, "delete"))
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
117 {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
118 ret = cmd_remove(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
119 } else if(!strcasecmp(cmd, "mkdir") || !strcasecmp(cmd, "mkcol")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
120 ret = cmd_mkdir(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
121 } else if(!strcasecmp(cmd, "copy") || !strcasecmp(cmd, "cp")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
122 ret = cmd_move(args, true);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
123 } else if(!strcasecmp(cmd, "move") || !strcasecmp(cmd, "mv")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
124 ret = cmd_move(args, false);
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
125 } else if(!strcasecmp(cmd, "export")) {
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
126 ret = cmd_get(args, TRUE);
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
127 } else if(!strcasecmp(cmd, "import")) {
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
128 ret = cmd_put(args, TRUE);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
129 } else if(!strcasecmp(cmd, "date")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
130 ret = cmd_date(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
131 } else if(!strcasecmp(cmd, "set-property")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
132 ret = cmd_set_property(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
133 } else if(!strcasecmp(cmd, "get-property")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
134 ret = cmd_get_property(args);
304
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
135 } else if(!strcasecmp(cmd, "remove-property")) {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
136 ret = cmd_remove_property(args);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
137 } else if(!strcasecmp(cmd, "lock")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
138 ret = cmd_lock(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
139 } else if(!strcasecmp(cmd, "unlock")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
140 ret = cmd_unlock(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
141 } else if(!strcasecmp(cmd, "info")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
142 ret = cmd_info(args);
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
143 } else if(!strcasecmp(cmd, "checkout")) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
144 ret = cmd_checkout(args);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
145 } else if(!strcasecmp(cmd, "checkin")) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
146 ret = cmd_checkin(args);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
147 } else if(!strcasecmp(cmd, "uncheckout")) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
148 ret = cmd_uncheckout(args);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
149 } else if(!strcasecmp(cmd, "versioncontrol")) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
150 ret = cmd_versioncontrol(args);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
151 } else if(!strcasecmp(cmd, "list-versions") || !strcasecmp(cmd, "lsv")) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
152 ret = cmd_list_versions(args);
256
54433cb371df implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents: 252
diff changeset
153 } else if(!strcasecmp(cmd, "add-repository")
54433cb371df implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents: 252
diff changeset
154 || !strcasecmp(cmd, "add-repo")) {
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
155 ret = cmd_add_repository(args);
398
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
156 } else if(!strcasecmp(cmd, "remove-repository")
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
157 || !strcasecmp(cmd, "remove-repo")
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
158 || !strcasecmp(cmd, "rm-repo")) {
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
159 ret = cmd_remove_repository(args);
256
54433cb371df implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents: 252
diff changeset
160 } else if(!strcasecmp(cmd, "list-repositories")
54433cb371df implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents: 252
diff changeset
161 || !strcasecmp(cmd, "list-repos")) {
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
162 ret = list_repositories();
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
163 } else if(!strcasecmp(cmd, "repository-url")
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
164 || !strcasecmp(cmd, "repo-url")) {
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
165 ret = cmd_repository_url(args);
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
166 } else if(!strcasecmp(cmd, "add-user")) {
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
167 ret = cmd_add_user(args);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
168 } else if(!strcasecmp(cmd, "version") || !strcasecmp(cmd, "-version")
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
169 || !strcasecmp(cmd, "--version")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
170 fprintf(stderr, "dav %s\n", DAV_VERSION);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
171 } else if(!strcasecmp(cmd, "complete")) {
432
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
172 if(args->argc < 2) {
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
173 return 1;
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
174 }
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
175 char *index_str = args->argv[0];
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
176 int64_t index = 0;
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
177 if(!util_strtoint(index_str, &index)) {
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
178 return 1;
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
179 }
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
180 if(args->argc + 2 != argc) {
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
181 // we have to fix the index
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
182
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
183 for(int i=2;i<args->argc;i++) {
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
184 if(index == i-2) {
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
185 break;
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
186 }
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
187 if(strcmp(argv[i+2], args->argv[i])) {
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
188 index--;
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
189 }
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
190 }
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
191 }
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
192
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
193 ret = shell_completion(args, index);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
194 } else {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
195 print_usage(argv[0]);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
196 }
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
197 }
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
198
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
199 dav_context_destroy(ctx);
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
200 cmd_args_free(args);
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
201 free_config();
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
202 xmlCleanupParser();
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
203 curl_global_cleanup();
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
204
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
205 return ret;
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
206 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
207
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
208 static char *cmdusageinfo[] = {
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
209 "list [-altdepcR] [-u <date>] <url>",
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
210 "get [-pcRK] [-o <file>] [-u <date>] [-V <version>] <url>",
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
211 "put [-pcR] [-k <key>] [-L <lock>] <url> <file>",
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
212 "mkdir [-pc] [-k <key>] [-L <lock>] <url>",
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
213 "remove [-pc] [-L <lock>] <url>",
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
214 "copy [-pcO] [-L <lock>] <url> <url>",
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
215 "move [-pcO] [-L <lock>] <url> <url>",
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
216 "export [-pc] [-o <file>] [-u <date>] <url>",
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
217 "import [-pc] [-k <key>] [-L <lock>] <url> <file>",
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
218 "get-property [-pcx] [-V <version>] [-n <uri>] <url> <property>",
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
219 "set-property [-pcx] [-L <lock>] [-n <uri>] <url> <property> [value]",
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
220 "remove-property [-pc] [-n <uri>] <url> <property>",
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
221 "lock [-pc] [-T timeout] <url>",
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
222 "unlock [-pc] [-L <lock>] <url>",
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
223 "info [-pc] [-V <version>] <url>",
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
224 "date [url]",
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
225 NULL
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
226 };
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
227
384
8bfde5687890 fixes definite chance of a memory leak in cmd_unlock() + marks a further possible source of memory leaks
Mike Becker <universe@uap-core.de>
parents: 383
diff changeset
228 char* find_usage_str(const char *cmd) {
8bfde5687890 fixes definite chance of a memory leak in cmd_unlock() + marks a further possible source of memory leaks
Mike Becker <universe@uap-core.de>
parents: 383
diff changeset
229 // TODO: use scstr_t after UCX update
8bfde5687890 fixes definite chance of a memory leak in cmd_unlock() + marks a further possible source of memory leaks
Mike Becker <universe@uap-core.de>
parents: 383
diff changeset
230 sstr_t c = sstr((char*)cmd);
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
231 for(int i=0;;i++) {
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
232 char *str = cmdusageinfo[i];
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
233 if(!str) {
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
234 break;
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
235 }
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
236 sstr_t u = sstr(str);
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
237 if(sstrprefix(u, c)) {
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
238 return str;
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
239 }
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
240 }
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
241 return NULL;
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
242 }
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
243
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
244 void print_usage(char *cmd) {
380
8a0c727aa409 adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 376
diff changeset
245 fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd);
8a0c727aa409 adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 376
diff changeset
246
8a0c727aa409 adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 376
diff changeset
247 fprintf(stderr, "Commands:\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
248 for(int i=0;;i++) {
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
249 char *str = cmdusageinfo[i];
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
250 if(!str) {
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
251 break;
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
252 }
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
253 fprintf(stderr, " %s\n", str);
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
254 }
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
255 fprintf(stderr, "\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
256 fprintf(stderr, "Options:\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
257 fprintf(stderr,
100
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
258 " -k <key> Key to use for encryption\n");
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
259 fprintf(stderr, " -p Don't encrypt or decrypt files\n");
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
260 fprintf(stderr, " -c Enable full encryption\n");
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
261 fprintf(stderr,
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
262 " -R "
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
263 "Recursively do the operation for all children\n");
330
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
264 fprintf(stderr, " -K Keep already present files\n");
382
1ce7211a1021 fixes memory leak in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 380
diff changeset
265 fprintf(stderr, " -o <file> Write output to file (use '-' for stdout)\n");
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
266 fprintf(
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
267 stderr,
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
268 " -u <date> "
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
269 "Get resources which are modified since the specified date\n");
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
270 fprintf(stderr, " -a show all files\n");
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
271 fprintf(stderr, " -l print resources in long list format\n");
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
272 fprintf(stderr, " -t print content type\n");
305
c3d98b2cccf3 adds tests for crypto util functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 304
diff changeset
273 fprintf(stderr, " -d order by last modified date\n");
213
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
274 fprintf(stderr, " -e show extended flags\n");
182
ca07f14f7bfe added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 181
diff changeset
275 fprintf(stderr, " -O override resources\n");
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
276 fprintf(stderr, " -L <lock> specificy lock token\n");
315
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
277 fprintf(stderr, " -T <sec> timeout in seconds\n");
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
278 fprintf(stderr, " -n <uri> specify namespace uri\n");
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
279 fprintf(stderr, " -x xml property content\n");
229
df158262f802 fixed dav_context_get_key
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 228
diff changeset
280 fprintf(stderr, " -N disable authentication prompt (all commands)\n");
199
f448fc8c9191 enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 198
diff changeset
281 fprintf(stderr, " -i disable cert verification (all commands)\n");
f448fc8c9191 enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 198
diff changeset
282 fprintf(stderr, " -v verbose output (all commands)\n");
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
283 fprintf(stderr, "\n");
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
284 fprintf(stderr, "Advanced commands:\n");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
285 fprintf(stderr, " versioncontrol, list-versions, checkout, checkin, uncheckout\n\n");
198
44054c452de1 added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 197
diff changeset
286 fprintf(stderr, "Config commands:\n");
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
287 fprintf(stderr, " add-repository\n");
398
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
288 fprintf(stderr, " remove-repository\n");
198
44054c452de1 added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 197
diff changeset
289 fprintf(stderr, " list-repositories\n");
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
290 fprintf(stderr, " repository-url\n");
256
54433cb371df implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents: 252
diff changeset
291 fprintf(stderr, " check-config\n");
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
292 fprintf(stderr, "\n");
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
293 fprintf(stderr,
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
294 "Instead of an url you can pass a repository name "
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
295 "with an optional path:\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
296 fprintf(stderr, " <repository>/path/\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
297 fprintf(stderr, "\n");
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
298 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
299
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
300
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
301 int request_auth2(DavSession *sn, void *userdata) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
302 Repository *repo = userdata;
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
303
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
304 char *user = NULL;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
305 char ubuf[256];
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
306 if(repo->user) {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
307 user = repo->user;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
308 } else {
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 147
diff changeset
309 fprintf(stderr, "User: ");
146
e48048334602 hidden password input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 144
diff changeset
310 fflush(stderr);
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
311 user = fgets(ubuf, 256, stdin);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
312 }
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
313 if(!user) {
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
314 return 0;
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
315 }
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
316
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 147
diff changeset
317 char *password = util_password_input("Password: ");
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
318 if(!password || strlen(password) == 0) {
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
319 return 0;
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
320 }
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
321
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
322 size_t ulen = strlen(user);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
323 if(user[ulen-1] == '\n') {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
324 user[ulen-1] = '\0';
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
325 }
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
326
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
327 dav_session_set_auth(sn, user, password);
146
e48048334602 hidden password input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 144
diff changeset
328 free(password);
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
329
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
330 return 0;
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
331 }
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
332
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
333 static Repository* url2repo(char *url, char **path) {
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
334 size_t ulen = strlen(url);
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
335 *path = NULL;
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
336
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
337 int s;
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
338 if(ulen > 7 && !strncasecmp(url, "http://", 7)) {
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
339 s = 7;
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
340 } else if(ulen > 8 && !strncasecmp(url, "https://", 8)) {
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
341 s = 8;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
342 } else {
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
343 s = 1;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
344 }
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
345
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
346 sstr_t r = sstr(url);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
347 sstr_t p = sstr("/");
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
348 for(int i=s;i<ulen;i++) {
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
349 char c = url[i];
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
350 if(c == '/') {
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
351 r = sstrn(url, i);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
352 p = sstrsubs(sstr(url), i);
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
353 if(p.length == 0) {
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
354 p = sstrn("/", 1);
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
355 }
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
356 break;
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
357 }
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
358 }
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
359
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
360 Repository *repo = get_repository(r);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
361 if(repo) {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
362 *path = sstrdup(p).ptr;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
363 } else {
384
8bfde5687890 fixes definite chance of a memory leak in cmd_unlock() + marks a further possible source of memory leaks
Mike Becker <universe@uap-core.de>
parents: 383
diff changeset
364 // TODO: who is responsible for freeing this repository?
8bfde5687890 fixes definite chance of a memory leak in cmd_unlock() + marks a further possible source of memory leaks
Mike Becker <universe@uap-core.de>
parents: 383
diff changeset
365 // how can the callee know, if he has to call free()?
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
366 repo = calloc(1, sizeof(Repository));
70
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
367 repo->name = strdup("");
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
368 repo->decrypt_content = true;
204
4f0207044837 added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 201
diff changeset
369 repo->verification = true;
187
38295f2fa231 added missing repo authmethods initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 186
diff changeset
370 repo->authmethods = CURLAUTH_BASIC;
70
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
371 if(url[ulen-1] == '/') {
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
372 repo->url = strdup(url);
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
373 *path = strdup("/");
100
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
374 } else if (strchr(url, '/')) {
70
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
375 repo->url = util_parent_path(url);
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
376 // TODO: check/fix
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
377 *path = strdup(util_resource_name(url)-1);
100
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
378 } else {
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
379 repo->url = strdup(url);
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
380 *path = strdup("/");
70
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
381 }
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
382 }
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
383
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
384 return repo;
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
385 }
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
386
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
387 static int set_session_config(DavSession *sn, CmdArgs *a) {
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
388 char *plain = cmd_getoption(a, "plain");
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
389 char *crypt = cmd_getoption(a, "crypt");
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
390
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
391 if(plain && crypt) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
392 fprintf(stderr, "Error: -p and -c option set\n");
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
393 return 1;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
394 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
395
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
396 if (plain) {
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
397 sn->flags &= ~DAV_SESSION_FULL_ENCRYPTION;
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
398 } else if(crypt) {
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
399 sn->flags |= DAV_SESSION_FULL_ENCRYPTION;
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
400 }
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
401
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
402 if (cmd_getoption(a, "verbose")) {
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
403 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L);
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
404 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr);
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
405 }
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
406
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
407 return 0;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
408 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
409
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
410 static void set_session_lock(DavSession *sn, CmdArgs *a) {
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
411 char *locktoken = cmd_getoption(a, "lock");
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
412 if(locktoken) {
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
413 DavLock *lock = dav_create_lock(sn, locktoken, NULL);
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
414 dav_add_collection_lock(sn, "/", lock);
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
415 }
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
416 }
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
417
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
418 static int decrypt_secrets(CmdArgs *a, PwdStore *secrets) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
419 if(cmd_getoption(a, "noinput")) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
420 return 1;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
421 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
422
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
423 char *ps_password = util_password_input("Master password: ");
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
424 if(!ps_password) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
425 return 1;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
426 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
427 if(pwdstore_setpassword(secrets, ps_password)) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
428 fprintf(stderr, "Error: cannot create key from password\n");
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
429 return 1;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
430 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
431 if(pwdstore_decrypt(secrets)) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
432 fprintf(stderr, "Error: cannot decrypt secrets store\n");
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
433 return 1;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
434 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
435 return 0;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
436 }
472
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
437
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
438 static int get_stored_credentials(CmdArgs *a, char *credid, char **user, char **password) {
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
439 if(!credid) {
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
440 return 0;
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
441 }
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
442
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
443 PwdStore *secrets = get_pwdstore();
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
444 if(!secrets) {
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
445 fprintf(stderr, "Error: no secrets store available\n");
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
446 return 0;
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
447 }
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
448
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
449 if(pwdstore_has_id(secrets, credid)) {
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
450 if(!secrets->isdecrypted) {
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
451 if(decrypt_secrets(a, secrets)) {
472
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
452 return 0;
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
453 }
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
454 }
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
455
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
456 PwdEntry *s_cred = pwdstore_get(secrets, credid);
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
457 if(s_cred) {
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
458 *user = s_cred->user;
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
459 *password = s_cred->password;
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
460 return 1;
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
461 }
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
462 } else {
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
463 fprintf(stderr, "Error: credentials id '%s' not found\n", credid);
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
464 }
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
465
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
466 return 0;
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
467 }
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
468
489
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
469 typedef struct CredLocation {
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
470 char *id;
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
471 char *location;
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
472 } CredLocation;
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
473
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
474 static int cmp_url_cred_entry(CredLocation *e1, CredLocation *e2, void *n) {
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
475 return strcmp(e2->location, e1->location);
472
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
476 }
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
477
489
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
478 static void free_cred_location(CredLocation *c) {
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
479 // c->id is not a copy, therefore we don't have to free it
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
480 free(c->location);
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
481 free(c);
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
482 }
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
483
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
484 static int get_location_credentials(CmdArgs *a, Repository *repo, char *path, char **user, char **password) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
485 PwdStore *secrets = get_pwdstore();
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
486 if(!secrets) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
487 return 0;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
488 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
489
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
490 /*
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
491 * The list secrets->location contains urls or repo names as
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
492 * location strings. We need a list, that contains only urls
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
493 */
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
494 UcxList *locations = NULL;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
495 UCX_FOREACH(elm, secrets->locations) {
474
017a4f09e6fa improves secret store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 473
diff changeset
496 PwdIndexEntry *e = elm->data;
489
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
497
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
498 UCX_FOREACH(loc, e->locations) {
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
499 char *path;
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
500 Repository *r = url2repo(loc->data, &path);
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
501 CredLocation *urlentry = calloc(1, sizeof(CredLocation));
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
502 urlentry->id = e->id;
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
503 urlentry->location = util_concat_path(r->url, path);
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
504 locations = ucx_list_append(locations, urlentry);
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
505 }
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
506 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
507 // the list must be sorted
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
508 locations = ucx_list_sort(locations, (cmp_func)cmp_url_cred_entry, NULL);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
509
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
510 // create full request url string and remove protocol prefix
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
511 sstr_t req_url_proto = sstr(util_concat_path(repo->url, path));
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
512 sstr_t req_url = req_url_proto;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
513 if(sstrprefix(req_url, S("http://"))) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
514 req_url = sstrsubs(req_url, 7);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
515 } else if(sstrprefix(req_url, S("https://"))) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
516 req_url = sstrsubs(req_url, 8);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
517 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
518
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
519 // iterate over sorted locations and check if a location is a prefix
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
520 // of the requested url
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
521 char *id = NULL;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
522 int ret = 0;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
523 UCX_FOREACH(elm, locations) {
489
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
524 CredLocation *cred = elm->data;
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
525 sstr_t cred_url = sstr(cred->location);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
526
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
527 // remove protocol prefix
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
528 if(sstrprefix(cred_url, S("http://"))) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
529 cred_url = sstrsubs(cred_url, 7);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
530 } else if(sstrprefix(cred_url, S("https://"))) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
531 cred_url = sstrsubs(cred_url, 8);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
532 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
533
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
534 if(sstrprefix(req_url, cred_url)) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
535 id = cred->id;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
536 break;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
537 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
538 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
539
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
540 // if an id is found and we can access the decrypted secret store
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
541 // we can set the user/password
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
542 if(id && (secrets->isdecrypted || !decrypt_secrets(a, secrets))) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
543 PwdEntry *cred = pwdstore_get(secrets, id);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
544 *user = cred->user;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
545 *password = cred->password;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
546 ret = 1;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
547 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
548
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
549 free(req_url_proto.ptr);
489
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
550 ucx_list_free_content(locations, (ucx_destructor)free_cred_location);
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
551 ucx_list_free(locations);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
552
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
553 return ret;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
554 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
555
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
556 static DavSession* connect_to_repo(Repository *repo, char *path, CmdArgs *a) {
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
557 char *user = repo->user;
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
558 char *password = repo->password;
472
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
559
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
560 if(!user && !password) {
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
561 if(!get_stored_credentials(a, repo->stored_user, &user, &password)) {
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
562 get_location_credentials(a, repo, path, &user, &password);
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
563 }
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
564 }
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
565
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
566 DavSession *sn = dav_session_new_auth(ctx, repo->url, user, password);
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
567 sn->flags = get_repository_flags(repo);
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
568 sn->key = dav_context_get_key(ctx, repo->default_key);
154
3cfb4670d9e6 added possibility to configure authentication methods via coma separated list in config.xml
Mike Becker <universe@uap-core.de>
parents: 152
diff changeset
569 curl_easy_setopt(sn->handle, CURLOPT_HTTPAUTH, repo->authmethods);
73
41e88442ad4e ssl version is now configurable
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 72
diff changeset
570 curl_easy_setopt(sn->handle, CURLOPT_SSLVERSION, repo->ssl_version);
199
f448fc8c9191 enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 198
diff changeset
571 if(repo->cert) {
f448fc8c9191 enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 198
diff changeset
572 curl_easy_setopt(sn->handle, CURLOPT_CAINFO, repo->cert);
f448fc8c9191 enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 198
diff changeset
573 }
f448fc8c9191 enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 198
diff changeset
574 if(!repo->verification || cmd_getoption(a, "insecure")) {
f448fc8c9191 enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 198
diff changeset
575 curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYPEER, 0);
f448fc8c9191 enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 198
diff changeset
576 curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYHOST, 0);
f448fc8c9191 enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 198
diff changeset
577 }
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
578 if(!cmd_getoption(a, "noinput")) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
579 dav_session_set_authcallback(sn, request_auth2, repo);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
580 }
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
581 return sn;
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
582 }
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
583
355
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
584 int update_progress(DavResource *res, int64_t total, int64_t now, Progress *p) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
585 int ret = 0;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
586 if(res != p->last_resource) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
587 p->cur += p->last_res_total - p->last_res_cur;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
588 ret = 1;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
589 } else {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
590 p->cur += now - p->last_res_cur;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
591 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
592
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
593 p->last_resource = res;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
594 p->last_res_cur = now;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
595 p->last_res_total = total;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
596
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
597 return ret;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
598 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
599
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
600 void download_progress(DavResource *res, int64_t total, int64_t now, void *data) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
601 Progress *p = data;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
602 int newres = update_progress(res, total, now, p);
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
603
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
604 time_t newts = time(NULL);
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
605 if((p->ts != newts)) {
355
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
606 fprintf(p->out, "[%s]: %" PRId64 "k/%" PRId64 "k total: %" PRId64 "M/%" PRId64 "M\n", res->name, now/1024, total/1024, p->cur/(1024*1024), p->total/(1024*1024));
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
607 fflush(p->out);
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
608 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
609 p->ts = newts;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
610 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
611
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
612
297
3cbe57eeaed1 adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 271
diff changeset
613 #define LIST_QUERY_ORDER_BY_NAME "select `idav:crypto-name`,`idav:crypto-key`,D:lockdiscovery,apache:executable from %s with depth = %d where lastmodified > %t order by iscollection desc, name"
3cbe57eeaed1 adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 271
diff changeset
614 #define LIST_QUERY_ORDER_BY_DATE "select `idav:crypto-name`,`idav:crypto-key`,D:lockdiscovery,apache:executable from %s with depth = %d where lastmodified > %t order by iscollection desc, lastmodified desc"
3cbe57eeaed1 adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 271
diff changeset
615
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
616 int cmd_list(CmdArgs *a) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
617 if(a->argc != 1) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
618 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
619 fprintf(stderr, "Usage: dav %s\n", find_usage_str("list"));
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
620 return -1;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
621 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
622
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
623 char *url = a->argv[0];
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
624 char *path = NULL;
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
625 Repository *repo = url2repo(url, &path);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
626 DavSession *sn = connect_to_repo(repo, path, a);
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
627
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
628 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
629 return -1;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
630 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
631
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
632 char *update = cmd_getoption(a, "update");
297
3cbe57eeaed1 adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 271
diff changeset
633 char *date = cmd_getoption(a, "date");
136
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
634 time_t t = -1;
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
635 if(update) {
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
636 t = util_parse_lastmodified(update);
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
637 }
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
638
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
639 int depth = cmd_getoption(a, "recursive") ? -1 : 1;
425
ae4d89c3477c fixes dav list return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 421
diff changeset
640 int ret = 0;
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
641 DavResource *ls = dav_query(
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
642 sn,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
643 date ? LIST_QUERY_ORDER_BY_DATE : LIST_QUERY_ORDER_BY_NAME,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
644 path,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
645 depth,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
646 t);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
647 if(ls) {
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
648 // parameters
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
649 void (*print_func)(DavResource*, char *, CmdArgs *);
213
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
650 if(cmd_getoption(a, "list") || cmd_getoption(a, "extended")) {
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
651 print_func = ls_print_list_elm;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
652 } else {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
653 print_func = ls_print_elm;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
654 }
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
655
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
656 DavResource *child = ls->children;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
657 while(child) {
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
658 print_func(child, path, a);
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
659 child = child->next;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
660 }
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
661 } else {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
662 print_resource_error(sn, path);
425
ae4d89c3477c fixes dav list return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 421
diff changeset
663 ret = -1;
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
664 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
665
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
666 free(path);
40
a95ee94b9204 supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 38
diff changeset
667 //free(base);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
668
144
c2c02c9b3be4 dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 143
diff changeset
669 dav_session_destroy(sn);
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
670
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
671 return ret;
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
672 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
673
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
674 static char* ls_date_str(time_t tm) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
675 struct tm t;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
676 struct tm n;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
677 time_t now = time(NULL);
32
c9d37bb97ea8 mingw support
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
678 #ifdef _WIN32
c9d37bb97ea8 mingw support
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
679 memcpy(&t, localtime(&tm), sizeof(struct tm));
c9d37bb97ea8 mingw support
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
680 memcpy(&n, localtime(&now), sizeof(struct tm));
c9d37bb97ea8 mingw support
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
681 #else
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
682 localtime_r(&tm, &t);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
683 localtime_r(&now, &n);
32
c9d37bb97ea8 mingw support
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
684 #endif /* _WIN32 */
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
685 char *str = malloc(16);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
686 if(t.tm_year == n.tm_year) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
687 strftime(str, 16, "%b %d %H:%M", &t);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
688 } else {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
689 strftime(str, 16, "%b %d %Y", &t);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
690 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
691 return str;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
692 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
693
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
694 static char* ls_size_str(DavResource *res) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
695 char *str = malloc(16);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
696 uint64_t size = res->contentlength;
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
697
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
698 if(res->iscollection) {
165
b66bed169fc3 fixed zero-length format string in ls_size_str
Mike Becker <universe@uap-core.de>
parents: 154
diff changeset
699 str[0] = '\0'; // currently no information for collections
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
700 } else if(size < 0x400) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
701 snprintf(str, 16, "%" PRIu64 " bytes", size);
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
702 } else if(size < 0x100000) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
703 float s = (float)size/0x400;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
704 int diff = (s*100 - (int)s*100);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
705 if(diff > 90) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
706 diff = 0;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
707 s += 0.10f;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
708 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
709 if(size < 0x2800 && diff != 0) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
710 // size < 10 KiB
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
711 snprintf(str, 16, "%.1f KiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
712 } else {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
713 snprintf(str, 16, "%.0f KiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
714 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
715 } else if(size < 0x40000000) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
716 float s = (float)size/0x100000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
717 int diff = (s*100 - (int)s*100);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
718 if(diff > 90) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
719 diff = 0;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
720 s += 0.10f;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
721 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
722 if(size < 0xa00000 && diff != 0) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
723 // size < 10 MiB
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
724 snprintf(str, 16, "%.1f MiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
725 } else {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
726 size /= 0x100000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
727 snprintf(str, 16, "%.0f MiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
728 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
729 } else if(size < 0x1000000000ULL) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
730 float s = (float)size/0x40000000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
731 int diff = (s*100 - (int)s*100);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
732 if(diff > 90) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
733 diff = 0;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
734 s += 0.10f;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
735 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
736 if(size < 0x280000000 && diff != 0) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
737 // size < 10 GiB
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
738 snprintf(str, 16, "%.1f GiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
739 } else {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
740 size /= 0x40000000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
741 snprintf(str, 16, "%.0f GiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
742 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
743 } else {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
744 size /= 1024;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
745 float s = (float)size/0x40000000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
746 int diff = (s*100 - (int)s*100);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
747 if(diff > 90) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
748 diff = 0;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
749 s += 0.10f;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
750 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
751 if(size < 0x280000000 && diff != 0) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
752 // size < 10 TiB
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
753 snprintf(str, 16, "%.1f TiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
754 } else {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
755 size /= 0x40000000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
756 snprintf(str, 16, "%.0f TiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
757 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
758 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
759 return str;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
760 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
761
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
762 static char* ls_name(char *parent, char *path, int *len) {
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
763 if(parent) {
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
764 path += strlen(parent);
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
765 }
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
766 if(path[0] == '/') {
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
767 path++;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
768 }
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
769 int pathlen = strlen(path);
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
770 if(path[pathlen-1] == '/') {
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
771 pathlen--;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
772 }
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
773 *len = pathlen;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
774 return path;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
775 }
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
776
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
777 void ls_print_list_elm(DavResource *res, char *parent, CmdArgs *a) {
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
778 int recursive = cmd_getoption(a, "recursive") ? 1 : 0;
138
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
779 int show_all = cmd_getoption(a, "all") ? 1 : 0;
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
780 if(res->name[0] == '.' && !show_all) {
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
781 return;
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
782 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
783
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
784 char flags[16];
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
785 memset(flags, '-', 15);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
786
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
787 int type_width = 0;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
788 char *type = res->contenttype;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
789
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
790 if(res->iscollection) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
791 flags[0] = 'd';
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
792 type = "";
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
793 }
331
9ca1e4706acc adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
794 char *keyprop = dav_get_string_property_ns(
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
795 res,
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
796 DAV_NS,
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
797 "crypto-key");
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
798 if(keyprop) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
799 flags[1] = 'c';
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
800 }
213
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
801
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
802 if(cmd_getoption(a, "extended")) {
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
803 flags[6] = '\0';
331
9ca1e4706acc adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
804 if(dav_get_string_property(res, "D:lockdiscovery")) {
213
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
805 flags[2] = 'l';
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
806 }
331
9ca1e4706acc adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
807 char *executable = dav_get_string_property_ns(
213
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
808 res,
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
809 "http://apache.org/dav/props/",
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
810 "executable");
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
811 if(executable && util_getboolean(executable)) {
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
812 flags[3] = 'x';
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
813 }
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
814 } else {
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
815 flags[2] = '\0';
211
3d12817414e9 dav list indicates locks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 210
diff changeset
816 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
817
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
818 if(cmd_getoption(a, "type")) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
819 type_width = 20;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
820 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
821 if(type == NULL || type_width == 0) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
822 type = "";
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
823 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
824
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
825 char *date = ls_date_str(res->lastmodified);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
826 char *size = ls_size_str(res);
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
827 int namelen = strlen(res->name);
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
828 char *name = recursive ? ls_name(parent, res->path, &namelen) : res->name;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
829
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
830 //char *name = recursive ? res->path+1 : res->name;
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
831 printf(
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
832 "%s %*s %10s %12s %.*s\n",
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
833 flags,
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
834 type_width, type,
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
835 size,
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
836 date,
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
837 namelen,
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
838 name);
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
839 free(date);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
840 free(size);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
841
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
842 if(recursive) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
843 DavResource *child = res->children;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
844 while(child) {
138
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
845 //ls_print_list_elm(child, a);
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
846 if(child->name[0] != '.' || show_all) {
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
847 ls_print_list_elm(child, parent, a);
138
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
848 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
849 child = child->next;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
850 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
851 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
852 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
853
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
854 void ls_print_elm(DavResource *res, char *parent, CmdArgs *a) {
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
855 int recursive = cmd_getoption(a, "recursive") ? 1 : 0;
138
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
856 int show_all = cmd_getoption(a, "all") ? 1 : 0;
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
857 if(res->name[0] == '.' && !show_all) {
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
858 return;
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
859 }
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
860
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
861 int namelen = strlen(res->name);
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
862 char *name = recursive ? ls_name(parent, res->path, &namelen) : res->name;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
863 printf("%.*s\n", namelen, name);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
864 if(recursive) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
865 DavResource *child = res->children;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
866 while(child) {
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
867 ls_print_elm(child, parent, a);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
868 child = child->next;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
869 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
870 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
871 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
872
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
873 static void free_getres(void *r) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
874 GetResource *getres = r;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
875 free(getres->path);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
876 free(getres);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
877 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
878
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
879 int cmd_get(CmdArgs *a, DavBool export) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
880 if(a->argc != 1) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
881 // TODO: change this, when get supports retrieval of multiple files
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
882 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
883 fprintf(stderr, "Usage: dav %s\n", find_usage_str("get"));
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
884 return -1;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
885 }
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
886 if(export) {
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
887 ucx_map_cstr_put(a->options, "recursive", "");
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
888 }
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
889
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
890 char *url = a->argv[0];
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
891 char *path = NULL;
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
892 Repository *repo = url2repo(url, &path);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
893 DavSession *sn = connect_to_repo(repo, path, a);
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
894
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
895 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
896 return -1;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
897 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
898
355
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
899 char *progressfile = cmd_getoption(a, "progressfile");
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
900 Progress pdata;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
901 memset(&pdata, 0, sizeof(Progress));
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
902 if(progressfile) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
903 if(!strcmp(progressfile, "-")) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
904 pdata.out = stdout;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
905 pdata.isstdout = 1;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
906 } else {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
907 pdata.out = fopen(progressfile, "w");
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
908 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
909 if(pdata.out) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
910 dav_session_set_progresscallback(sn, download_progress, NULL, &pdata);
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
911 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
912 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
913
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
914 char *update = cmd_getoption(a, "update");
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
915 time_t t = -1;
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
916 if(update) {
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
917 t = util_parse_lastmodified(update);
329
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
918 if (t == 0) {
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
919 fprintf(stderr,
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
920 "Invalid date format. Possible formats are:\n"
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
921 " RFC-1123 - example: Thu, 29 Nov 2012 21:35:35 GMT\n"
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
922 " RFC-3339 - example: 2012-11-29T21:35:35Z\n");
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
923 return -1;
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
924 }
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
925 }
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
926
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
927 int recursive = cmd_getoption(a, "recursive") ? 1 : 0;
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
928 char *version = cmd_getoption(a, "version");
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
929
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
930 if(recursive && version) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
931 fprintf(stderr, "-V option can only be used without -R option\n");
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
932 return -1;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
933 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
934
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
935 DavResource *res;
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
936
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
937 int depth = recursive ? -1 : 1;
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
938 res = dav_query(
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
939 sn,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
940 "select - from %s with depth = %d where iscollection or lastmodified > %t",
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
941 path,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
942 depth,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
943 t);
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
944 if(!res) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
945 print_resource_error(sn, path);
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
946 return -1;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
947 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
948 if(!recursive && res->iscollection) {
235
0468df02e18f fixed dav get with -u option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
949 fprintf(stderr, "Resource %s is a collection.\n", res->path);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
950 fprintf(stderr, "Use the -R option to download collections.\n");
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
951 return -1;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
952 }
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
953
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
954 if(version) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
955 DavResource *vres = find_version(res, version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
956 if(!vres) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
957 fprintf(stderr, "Cannot find version '%s' for resource.\n", version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
958 return -1;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
959 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
960 dav_resource_free_all(res);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
961 res = vres;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
962 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
963
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
964 /*
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
965 * determine the output file
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
966 * use stdout if the output file is -
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
967 */
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
968 char *outfile = cmd_getoption(a, "output");
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
969 char *basepath = outfile;
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
970 if(!outfile) {
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
971 if(res->iscollection) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
972 basepath = "";
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
973 } else {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
974 basepath = res->name;
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
975 }
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
976 if(export) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
977 outfile = "-";
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
978 }
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
979 } else if(export) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
980 basepath = "";
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
981 } else if(res->iscollection && !strcmp(outfile, "-")) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
982 fprintf(
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
983 stderr,
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
984 "Cannot write output to stdout "
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
985 "if the requested resource is a collection.\n");
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
986 return -1;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
987 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
988
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
989 // get list of resources
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
990 UcxList *reslist = NULL;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
991 uint64_t totalsize = 0;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
992 uint64_t rescount = 0;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
993
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
994 GetResource *getres = malloc(sizeof(GetResource));
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
995 getres->res = res;
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
996 getres->path = strdup(basepath);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
997
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
998 char *structure = cmd_getoption(a, "structure");
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
999
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1000 // iterate over resource tree
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1001 UcxList *stack = ucx_list_prepend(NULL, getres);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1002 while(stack) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1003 GetResource *g = stack->data;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1004 stack = ucx_list_remove(stack, stack);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1005
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1006 if(g->res->iscollection) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1007 DavResource *child = g->res->children;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1008 while(child) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1009 // add resource to stack
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1010 size_t pathlen = strlen(g->path);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1011 GetResource *newres = malloc(sizeof(GetResource));
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1012 newres->res = child;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1013 newres->path = pathlen > 0 ?
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1014 util_concat_path(g->path, child->name) : strdup(child->name);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1015
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1016 stack = ucx_list_prepend(stack, newres);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1017
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1018 child = child->next;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1019 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1020 } else {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1021 if(structure) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1022 // download only directory structure
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1023 // this is a hidden feature and will be replaced in the future
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1024 continue; // skip non-collection resource
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1025 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1026 totalsize += g->res->contentlength;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1027 rescount++;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1028 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1029
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1030 if(strlen(g->path) == 0) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1031 free_getres(g);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1032 } else {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1033 reslist = ucx_list_append(reslist, g);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1034 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1035 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1036
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1037 // download resources
355
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1038 pdata.total = totalsize;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1039
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1040 int ret;
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1041 getfunc get;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1042 TarOutputStream *tout = NULL;
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
1043 if(export) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1044 get = (getfunc)resource2tar;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1045 FILE *tarfile = strcmp(outfile, "-") ? fopen(outfile, "wb") : stdout;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1046 if(!tarfile) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1047 perror("Cannot open tar output file");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1048 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1049 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1050 tout = tar_open(tarfile);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1051 } else {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1052 get = get_resource;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1053 }
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1054 UCX_FOREACH(elm, reslist) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1055 GetResource *getres = elm->data;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1056
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1057 ret = get(repo, getres, a, tout);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1058 if(ret) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1059 break;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1060 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1061 }
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
1062 if(export) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1063 // close tar stream
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1064 if(tar_close(tout)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1065 fprintf(stderr, "tar stream broken\n");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1066 ret = -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1067 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1068 }
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1069
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1070 ucx_list_free_content(reslist, free_getres);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1071 ucx_list_free(reslist);
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1072 free(path);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1073
355
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1074 if(pdata.out && !pdata.isstdout) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1075 fclose(pdata.out);
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
1076 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1077 return ret;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1078 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1079
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1080 int get_resource(Repository *repo, GetResource *getres, CmdArgs *a, void *unused) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1081 DavResource *res = getres->res;
350
5fc457fb2cb1 fixes wrong output path in dav get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 346
diff changeset
1082 char *out = getres->path;
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1083
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1084 if(res->iscollection) {
309
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1085 printf("get: %s\n", res->path);
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1086
412
dc74f736aea1 adds more fs abstraction
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1087 int ret = sys_mkdir(out);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1088 if(ret != 0 && errno != EEXIST) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1089 fprintf(stderr, "Cannot create directory '%s': ", out);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1090 perror("");
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1091 return 1;
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1092 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1093
309
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1094 return 0;
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1095 }
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1096
330
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1097 int isstdout = !strcmp(out, "-");
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1098 if(cmd_getoption(a, "keep") && !isstdout) {
410
0b9bea2d7283 adds file io abstraction functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
1099 SYS_STAT s;
0b9bea2d7283 adds file io abstraction functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
1100 if(sys_stat(out, &s)) {
330
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1101 if(errno != ENOENT) {
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1102 perror("stat");
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1103 }
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1104 } else {
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1105 if(cmd_getoption(a, "recursive")) {
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1106 printf("skip: %s\n", res->path);
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1107 }
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1108 return 0;
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1109 }
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1110 }
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1111
309
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1112 // print some status message in recursive mode
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1113 if(cmd_getoption(a, "recursive")) {
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1114 printf("get: %s\n", res->path);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1115 }
330
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1116
410
0b9bea2d7283 adds file io abstraction functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
1117 FILE *fout = isstdout ? stdout : sys_fopen(out, "wb");
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1118 if(!fout) {
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1119 fprintf(stderr, "cannot open output file\n");
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1120 return -1;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1121 }
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1122
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1123 int ret = dav_get_content(res, fout, (dav_write_func)fwrite);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1124 fclose(fout);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1125 if(ret && strcmp(out, "-")) {
207
de23f8881e9f fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 204
diff changeset
1126 print_resource_error(res->session, res->path);
de23f8881e9f fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 204
diff changeset
1127 //if(strcmp(out, "-")) {
de23f8881e9f fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 204
diff changeset
1128 // unlink(out);
de23f8881e9f fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 204
diff changeset
1129 //}
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1130 }
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1131
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1132 return 0;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1133 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1134
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1135 #define DEFAULT_DIR_MODE T_IRUSR | T_IWUSR | T_IXUSR | T_IRGRP | T_IXGRP | T_IROTH | T_IXOTH
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1136 #define DEFAULT_FILE_MODE T_IRUSR | T_IWUSR | T_IRGRP | T_IROTH
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1137
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1138 int resource2tar(Repository *repo, GetResource *res, CmdArgs *a, TarOutputStream *tar) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1139 DavResource *d = res->res;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1140
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1141 if(d->iscollection) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1142 fprintf(stderr, "add d: %s\n", res->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1143 return tar_add_dir(tar, res->path, DEFAULT_DIR_MODE, d->lastmodified);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1144 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1145
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1146 fprintf(stderr, "add f: %s\n", res->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1147
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1148 // add tar file header
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1149 if(tar_begin_file(tar, res->path, DEFAULT_FILE_MODE, d->contentlength, d->lastmodified)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1150 fprintf(stderr, "TAR Error: %s\n", tar_error2str(tar->error));
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1151 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1152 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1153
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1154 if(dav_get_content(d, tar, (dav_write_func)tar_fwrite)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1155 print_resource_error(d->session, d->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1156 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1157 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1158
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1159 // download content
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1160
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1161 return tar_end_file(tar);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1162 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1163
494
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1164 static int check_encryption_key(CmdArgs *a, DavSession *sn) {
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1165 // override the session key if the -k option is specified
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1166 char *keyname = cmd_getoption(a, "key");
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1167 if(keyname) {
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1168 DavKey *key = dav_context_get_key(ctx, keyname);
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1169 if(key) {
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1170 sn->key = key;
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1171 } else {
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1172 fprintf(stderr, "Key %s not found!\nAbort.\n", keyname);
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1173 return 1;
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1174 }
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1175
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1176 /*
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1177 * If a key is explicitly specified, we can safely assume that the user
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1178 * wants to encrypt. For security reasons we report an error, if no
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1179 * encryption is enabled.
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1180 */
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1181 if(!DAV_IS_ENCRYPTED(sn)) {
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1182 fprintf(stderr, "A key has been explicitly specified, but no "
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1183 "encryption is requested.\n"
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1184 "You have the following options:\n"
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1185 " - pass '-c' as command line argument to request encryption\n"
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1186 " - activate encryption in the config.xml\n"
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1187 " - don't use '-k <key>' "
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1188 "(warning: encryption will NOT happen)\n");
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1189 return 1;
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1190 }
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1191 }
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1192
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1193 // if encryption is requested, but we still don't know the key, report error
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1194 if(DAV_IS_ENCRYPTED(sn) && !(sn->key)) {
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1195 fprintf(stderr, "Encryption has been requested, "
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1196 "but no default key is configured.\n"
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1197 "You may specify a custom key with the '-k' option.\n");
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1198 return 1;
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1199 }
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1200
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1201 return 0;
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1202 }
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1203
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
1204 int cmd_put(CmdArgs *a, DavBool import) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1205 if(a->argc != 2) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1206 // TODO: change, when put supports multiple files (however it should do)
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1207 fprintf(stderr, "Too %s arguments\n", a->argc < 2 ? "few":"many");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1208 fprintf(stderr, "Usage: dav %s\n", find_usage_str("put"));
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
1209 return -1;
3
323689ada09d disabled ssl cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1
diff changeset
1210 }
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
1211 if(import) {
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
1212 ucx_map_cstr_put(a->options, "resursive", "");
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
1213 }
3
323689ada09d disabled ssl cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1
diff changeset
1214
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
1215 char *url = a->argv[0];
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
1216 char *file = a->argv[1];
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1217 char *path = NULL;
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
1218 Repository *repo = url2repo(url, &path);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1219 DavSession *sn = connect_to_repo(repo, path, a);
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1220
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1221 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1222 return -1;
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1223 }
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
1224 set_session_lock(sn, a);
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1225
494
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1226 if(check_encryption_key(a, sn)) {
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1227 // TODO: free
352
76bd29a11cc9 fixes a segfault when full encryption is requested during a put without specifying the key
Mike Becker <universe@uap-core.de>
parents: 350
diff changeset
1228 return -1;
494
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1229 }
352
76bd29a11cc9 fixes a segfault when full encryption is requested during a put without specifying the key
Mike Becker <universe@uap-core.de>
parents: 350
diff changeset
1230
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1231 int ret;
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
1232 if(!import) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1233 if(!strcmp(file, "-")) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1234 FILE *in = stdin;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1235 ret = put_file(repo, a, sn, path, "stdin", in, 0);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1236 } else {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1237 ret = put_entry(repo, a, sn, path, file, TRUE);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1238 }
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1239 } else {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1240 ret = put_tar(repo, a, sn, file, path);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1241 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1242
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1243 free(path);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1244 return ret;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1245 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1246
241
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1247 int put_entry(Repository *repo, CmdArgs *a, DavSession *sn, char *path, char *file, DavBool root) {
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1248 int recursive = cmd_getoption(a, "recursive") ? 1 : 0;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1249 struct stat s;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1250 if(stat(file, &s)) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1251 perror("stat");
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1252 fprintf(stderr, "cannot stat file %s\n", file);
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
1253 return -1;
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
1254 }
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
1255
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1256 int ret = 0;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1257 if(S_ISDIR(s.st_mode)) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1258 if(!recursive) {
241
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1259 fprintf(
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1260 stderr,
318
7e0694423838 dav-sync bugfix: files that are not in the db but on the server should not be pushed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 317
diff changeset
1261 "%s is a directory.\nUse the -R option to upload directories.\n",
241
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1262 file);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1263 return 1;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1264 }
271
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1265
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1266 if(!root) {
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1267 printf("mkcol: %s\n", file);
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1268 }
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1269
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1270 DIR *dir = opendir(file);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1271 if(!dir) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1272 // error
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1273 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1274 struct dirent *entry;
241
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1275 int nument = 0;
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1276 while((entry = readdir(dir)) != NULL) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1277 if(!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1278 continue;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1279 }
241
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1280 nument++;
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1281 char *entry_file = util_concat_path(file, entry->d_name);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1282 char *entry_path = util_concat_path(path, entry->d_name);
241
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1283 int r = put_entry(repo, a, sn, entry_path, entry_file, FALSE);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1284 free(entry_path);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1285 free(entry_file);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1286 if(r) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1287 ret = 1;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1288 break;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1289 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1290 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1291 closedir(dir);
241
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1292
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1293 if(nument == 0) {
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1294 // create empty directory
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1295 DavResource *res = dav_resource_new(sn, path);
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1296 res->iscollection = TRUE;
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1297 if(!dav_exists(res)) {
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1298 if(dav_create(res)) {
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1299 fprintf(stderr, "Cannot create collection %s\n", path);
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1300 print_resource_error(sn, res->path);
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1301 ret = 1;
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1302 }
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1303 }
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1304 dav_resource_free(res);
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1305 }
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1306 } else if(S_ISREG(s.st_mode)) {
271
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1307 if(recursive) {
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1308 printf("put: %s\n", file);
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1309 }
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1310
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1311 /*
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1312 * use stdin if the input file is -
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1313 */
72
aac29f2e8030 dav now opens files in binary mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 70
diff changeset
1314 FILE *in = fopen(file, "rb");
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1315 if(!in) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1316 fprintf(stderr, "cannot open input file\n");
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1317 return -1;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1318 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1319 char *filename = util_resource_name(file);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1320 //path = util_concat_path(path, filename);
178
e137883e620f using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
1321 ret = put_file(repo, a, sn, path, filename, in, s.st_size);
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1322 //free(path);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1323 fclose(in);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1324 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1325
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1326 return ret;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1327 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1328
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1329 int put_tar(Repository *repo, CmdArgs *a, DavSession *sn, char *tarfile, char *path) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1330 int isstdin = !strcmp(tarfile, "-");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1331 FILE *in = isstdin ? stdin : fopen(tarfile, "rb");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1332 if(!in) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1333 perror("Cannot open tar file");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1334 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1335 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1336
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1337 DavResource *col = dav_query(sn, "select - from %s", path);
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1338 if(!col) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1339 if(sn->error == DAV_NOT_FOUND) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1340 col = dav_resource_new(sn, path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1341 col->iscollection = TRUE;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1342 if(dav_create(col)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1343 print_resource_error(sn, path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1344 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1345 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1346 } else {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1347 print_resource_error(sn, path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1348 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1349 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1350 } else if(!col->iscollection) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1351 fprintf(stderr, "%s is not a collection\n", col->href);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1352 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1353 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1354
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1355
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1356 int ret = 0;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1357 TarInputStream *tar = tar_inputstream_open(in);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1358 TarEntry *e = NULL;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1359 while((e = tar_read_entry(tar)) != NULL) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1360 char *newpath = util_concat_path(path, e->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1361 if(e->type == TAR_TYPE_FILE) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1362 fprintf(stderr, "put: %s\n", e->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1363 DavResource *res = dav_resource_new(sn, newpath);
478
baa63fef5c5c fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 476
diff changeset
1364 dav_set_content(res, tar, (dav_read_func)tar_fread, (dav_seek_func)tar_seek);
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1365 dav_set_content_length(res, (size_t)e->size);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1366
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1367 if(dav_store(res)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1368 print_resource_error(sn, res->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1369 fprintf(stderr, "Cannot upload file.\n");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1370 if(sn->errorstr) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1371 fprintf(stderr, "%s\n", sn->errorstr);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1372 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1373 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1374 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1375
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1376 } else if(e->type == TAR_TYPE_DIRECTORY) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1377 printf("mkcol: %s\n", e->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1378 DavResource *res = dav_resource_new(sn, newpath);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1379 res->iscollection = TRUE;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1380 if(!dav_exists(res)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1381 if(dav_create(res)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1382 fprintf(stderr, "Cannot create collection %s\n", newpath);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1383 print_resource_error(sn, res->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1384 ret = 1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1385 free(newpath);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1386 break;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1387 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1388 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1389 } else {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1390 fprintf(stderr, "skip: %s\n", e->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1391 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1392 free(newpath);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1393 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1394 if(tar->error != TAR_OK) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1395 ret = -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1396 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1397
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1398 if(!isstdin) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1399 fclose(in);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1400 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1401
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1402 return ret;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1403 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1404
478
baa63fef5c5c fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 476
diff changeset
1405 static int file_seek(FILE *f, curl_off_t offset, int origin) {
baa63fef5c5c fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 476
diff changeset
1406 int ret = fseek(f, offset, origin);
baa63fef5c5c fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 476
diff changeset
1407 return ret == 0 ? CURL_SEEKFUNC_OK : CURL_SEEKFUNC_CANTSEEK;
baa63fef5c5c fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 476
diff changeset
1408 }
baa63fef5c5c fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 476
diff changeset
1409
178
e137883e620f using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
1410 int put_file(Repository *repo, CmdArgs *a, DavSession *sn, char *path, char *name, FILE *in, off_t len) {
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1411 DavResource *res = dav_query(sn, "select - from %s", path);
201
8e5856182668 auth input for dav get, put, mkdir and remove commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 200
diff changeset
1412
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1413 if(!res) {
24
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
1414 if(sn->error == DAV_NOT_FOUND) {
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1415 res = dav_resource_new(sn, path);
24
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
1416 if(dav_create(res)) {
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
1417 fprintf(stderr, "Cannot create resource.\n");
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
1418 return -1;
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
1419 }
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1420 } else {
198
44054c452de1 added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 197
diff changeset
1421 print_resource_error(sn, path);
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1422 return -1;
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1423 }
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1424 } else if(res->iscollection) {
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1425 // TODO: free res
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1426 char *newpath = util_concat_path(path, name);
353
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1427
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1428 if (!strcmp(path, newpath)) {
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1429 // TODO: free res
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1430 fprintf(stderr, "Cannot put file, because a collection with "
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1431 "that name already exists.\n");
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1432 free(newpath);
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1433 return -1;
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1434 }
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1435
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1436 path = newpath;
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1437 res = dav_resource_new(sn, path);
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1438 free(newpath);
178
e137883e620f using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
1439 int ret = put_file(repo, a, sn, res->path, NULL, in, len);
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1440 // TODO: free res
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1441 return ret;
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1442 }
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
1443
478
baa63fef5c5c fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 476
diff changeset
1444 dav_set_content(res, in, (dav_read_func)fread, (dav_seek_func)file_seek);
180
5b58389ab9dd fixed large file support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
1445 if(len > 0 && len < 0x7d000000) {
179
802b48ae791d enable sharepoint put fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 178
diff changeset
1446 dav_set_content_length(res, (size_t)len);
178
e137883e620f using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
1447 }
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
1448
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1449 if(dav_store(res)) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1450 print_resource_error(sn, res->path);
13
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
1451 fprintf(stderr, "Cannot upload file.\n");
22
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
1452 if(sn->errorstr) {
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
1453 fprintf(stderr, "%s\n", sn->errorstr);
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
1454 }
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1455 return -1;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1456 }
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1457 return 0;
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1458 }
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1459
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1460
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1461 int cmd_remove(CmdArgs *a) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1462 if(a->argc != 1) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1463 // TODO: change, when removal of multiple files is supported
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1464 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1465 fprintf(stderr, "Usage: dav %s\n", find_usage_str("remove"));
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1466 return -1;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1467 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1468
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1469 char *url = a->argv[0];
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1470 char *path = NULL;
201
8e5856182668 auth input for dav get, put, mkdir and remove commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 200
diff changeset
1471 Repository *repo = url2repo(url, &path);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1472 DavSession *sn = connect_to_repo(repo, path, a);
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1473
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1474 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1475 return -1;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1476 }
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
1477 set_session_lock(sn, a);
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1478
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1479 DavResource *res = dav_resource_new(sn, path);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1480 if(!res) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1481 fprintf(stderr, "error\n");
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1482 return -1;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1483 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1484
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1485 if(dav_delete(res)) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1486 print_resource_error(sn, res->path);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1487 fprintf(stderr, "Cannot delete resource.\n");
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1488 return -1;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1489 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1490
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1491 free(path);
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1492 return 0;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1493 }
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1494
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1495 int cmd_mkdir(CmdArgs *a) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1496 if(a->argc != 1) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1497 // TODO: change, when creation of multiple dirs is supported
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1498 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1499 fprintf(stderr, "Usage: dav %s\n", find_usage_str("mkdir"));
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1500 return -1;
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1501 }
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1502
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1503 char *url = a->argv[0];
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1504 char *path = NULL;
201
8e5856182668 auth input for dav get, put, mkdir and remove commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 200
diff changeset
1505 Repository *repo = url2repo(url, &path);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1506 DavSession *sn = connect_to_repo(repo, path, a);
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1507
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1508 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1509 return -1;
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1510 }
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
1511 set_session_lock(sn, a);
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1512
494
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1513 if(check_encryption_key(a, sn)) {
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1514 // TODO: free
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1515 return -1;
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1516 }
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1517
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1518 DavResource *res = dav_resource_new(sn, path);
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1519 if(!res) {
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1520 fprintf(stderr, "error\n");
494
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1521 // TODO: free
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1522 return -1;
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1523 }
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1524 res->iscollection = 1;
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1525
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1526 if(dav_create(res)) {
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1527 print_resource_error(sn, res->path);
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1528 fprintf(stderr, "Cannot create collection.\n");
494
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1529 // TODO: free
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1530 return -1;
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1531 }
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1532
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1533 free(path);
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1534 return 0;
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1535 }
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1536
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1537 int cmd_move(CmdArgs *a, int cp) {
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1538 const char* actionstr = cp ? "copy" : "move";
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1539
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1540 if(a->argc != 2) {
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1541 // TODO: change, when creation of multiple dirs is supported
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1542 fprintf(stderr, "Too %s arguments\n", a->argc < 2 ? "few":"many");
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1543 fprintf(stderr, "Usage: dav %s\n", find_usage_str(actionstr));
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1544 return -1;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1545 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1546
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1547 char *srcurl = a->argv[0];
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1548 char *srcpath = NULL;
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1549 Repository *srcrepo = url2repo(srcurl, &srcpath);
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1550
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1551 DavSession *srcsn = connect_to_repo(srcrepo, srcpath, a);
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1552 if(set_session_config(srcsn, a)) {
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1553 return -1;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1554 }
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1555 set_session_lock(srcsn, a);
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
1556
182
ca07f14f7bfe added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 181
diff changeset
1557 DavBool override = cmd_getoption(a, "override") ? true : false;
ca07f14f7bfe added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 181
diff changeset
1558
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1559 char *desturl = a->argv[1];
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1560 char *destpath = NULL;
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1561 Repository *destrepo = url2repo(desturl, &destpath);
382
1ce7211a1021 fixes memory leak in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 380
diff changeset
1562
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1563 if(srcrepo == destrepo) {
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1564 DavResource *res = dav_resource_new(srcsn, srcpath);
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1565 int err = cp ? dav_copy_o(res, destpath, override)
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1566 : dav_move_o(res, destpath, override);
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1567 if(err) {
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1568 print_resource_error(srcsn, res->path);
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1569 fprintf(stderr, "Cannot %s resource.\n", actionstr);
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1570 return -1;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1571 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1572 } else {
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1573 char *srchost = util_url_base(srcrepo->url);
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1574 char *desthost = util_url_base(destrepo->url);
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1575 if(!strcmp(srchost, desthost)) {
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1576 DavSession *destsn = connect_to_repo(destrepo, destpath, a);
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1577 if(set_session_config(destsn, a)) {
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1578 return -1;
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1579 }
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1580 DavResource *dest = dav_resource_new(destsn, destpath);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1581 char *desthref = dav_resource_get_href(dest);
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1582 char *desturl = util_get_url(destsn, desthref);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1583
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1584 DavResource *res = dav_resource_new(srcsn, srcpath);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1585 int err = cp ? dav_copyto(res, desturl, override)
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1586 : dav_moveto(res, desturl, override);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1587
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1588 free(desturl);
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1589 dav_session_destroy(destsn);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1590
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1591 if(err) {
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1592 print_resource_error(srcsn, res->path);
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1593 fprintf(stderr, "Cannot %s resource.\n", actionstr);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1594 return -1;
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1595 }
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1596 } else {
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1597 fprintf(stderr, "Cannot %s between different hosts.\n", actionstr);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1598 return -1;
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1599 }
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1600 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1601
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1602 dav_session_destroy(srcsn);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1603
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1604 return 0;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1605 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1606
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1607
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1608 static size_t get_date_header_cb(void *header, int s, int n, void *data) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1609 char **date_str = (char**)data;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1610
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1611 //printf("header: %.*s\n", s*n, header);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1612 sstr_t h = sstrn(header, s*n);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1613 if(sstrprefix(h, S("Date:"))) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1614 sstr_t v = sstrsubs(h, 5);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1615 v = sstrdup(sstrtrim(v));
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1616 *date_str = v.ptr;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1617 }
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1618 return s*n;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1619 }
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1620
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1621 int cmd_date(CmdArgs *a) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1622 if(a->argc < 1) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1623 time_t now = time(NULL);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1624 struct tm *date = gmtime(&now);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1625 char str[32];
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1626 putenv("LC_TIME=C");
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1627 size_t len = strftime(str, 32, "%a, %d %b %Y %H:%M:%S GMT\n", date);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1628 fwrite(str, 1, len, stdout);
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1629 } else if (a->argc == 1) {
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1630 char *url = a->argv[0];
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1631 char *path = NULL;
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1632 Repository *repo = url2repo(url, &path);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1633 DavSession *sn = connect_to_repo(repo, path, a);
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1634
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1635 DavResource *res = dav_resource_new(sn, path);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1636 char *date = NULL;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1637 curl_easy_setopt(sn->handle, CURLOPT_HEADERFUNCTION, get_date_header_cb);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1638 curl_easy_setopt(sn->handle, CURLOPT_WRITEHEADER, &date);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1639 if(dav_exists(res) && date) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1640 printf("%s\n", date);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1641 } else {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1642 return -1;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1643 }
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1644 free(path);
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1645 return 0;
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1646 } else {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1647 fprintf(stderr, "Too many arguments\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1648 fprintf(stderr, "Usage: dav %s\n", find_usage_str("date"));
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1649 return -1;
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1650 }
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1651 return 0;
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1652 }
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1653
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1654 int cmd_get_property(CmdArgs *a) {
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1655 if(a->argc < 2) {
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1656 fprintf(stderr, "Too few arguments\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1657 fprintf(stderr, "Usage: dav %s\n", find_usage_str("get-property"));
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1658 return -1;
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1659 }
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1660
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1661 char *url = a->argv[0];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1662 char *path = NULL;
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
1663 Repository *repo = url2repo(url, &path);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1664 DavSession *sn = connect_to_repo(repo, path, a);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1665
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1666 if(set_session_config(sn, a)) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1667 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1668 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1669
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1670 char *namespace = cmd_getoption(a, "namespace");
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1671 char *property = a->argv[1];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1672
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1673 char *version = cmd_getoption(a, "version");
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1674
298
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1675 DavPropName propname;
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1676 if(namespace) {
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1677 propname.ns = namespace;
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1678 propname.name = property;
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1679 } else {
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1680 dav_get_property_namespace_str(ctx, property, &propname.ns, &propname.name);
317
7eea57f6d847 adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 316
diff changeset
1681 if(!propname.ns || !propname.name) {
7eea57f6d847 adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 316
diff changeset
1682 fprintf(stderr, "Error: unknown namespace prefix\n");
7eea57f6d847 adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 316
diff changeset
1683 return -1;
7eea57f6d847 adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 316
diff changeset
1684 }
298
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1685 }
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1686
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1687 DavResource *res = dav_resource_new(sn, path);
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1688 if(version) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1689 DavResource *vres = find_version(res, version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1690 if(!vres) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1691 fprintf(stderr, "Cannot find version '%s' for resource.\n", version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1692 return -1;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1693 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1694 dav_resource_free_all(res);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1695 res = vres;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1696 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1697
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1698 if(dav_load_prop(res, &propname, 1)) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1699 print_resource_error(sn, res->path);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1700 return -1;
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1701 }
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1702 free(path);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1703
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1704 DavXmlNode *x = dav_get_property_ns(res, propname.ns, propname.name);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1705 if(!x) {
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1706 fprintf(stderr, "Error: no property value.\n");
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1707 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1708 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1709
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1710 if(cmd_getoption(a, "xml")) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1711 // print a real xml document on stdout
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1712 printxmldoc(stdout, propname.name, propname.ns, x);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1713 } else {
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1714 // in this mode a simple string is printed on stdout
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1715 // or simplified and nicely formatted xml is printed on stderr
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1716 if(dav_xml_isstring(x)) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1717 printf("%s\n", dav_xml_getstring(x));
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1718 } else {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1719 char *str = xml2str(x);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1720 fprintf(stderr, "%s", str);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1721 free(str);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1722 }
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1723 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1724
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1725 return 0;
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1726 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1727
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1728 int cmd_set_property(CmdArgs *a) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1729 if(a->argc < 2) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1730 fprintf(stderr, "Too few arguments\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1731 fprintf(stderr, "Usage: dav %s\n", find_usage_str("set-property"));
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1732 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1733 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1734
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1735 char *url = a->argv[0];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1736 char *path = NULL;
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
1737 Repository *repo = url2repo(url, &path);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1738 DavSession *sn = connect_to_repo(repo, path, a);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1739
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1740 if(set_session_config(sn, a)) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1741 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1742 }
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
1743 set_session_lock(sn, a);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1744
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1745 DavResource *res = dav_resource_new(sn, path);
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1746 if(!dav_exists(res)) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1747 print_resource_error(sn, res->path);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1748 return -1;
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1749 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1750
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1751 char *namespace = cmd_getoption(a, "namespace");
371
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1752 char *xml = cmd_getoption(a, "xml");
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1753
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1754 char *property = a->argv[1];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1755 char *value = a->argc > 2 ? a->argv[2] : stdin2str();
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1756
371
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1757 int ret = 0;
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1758 if(xml) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1759 DavXmlNode *xmlvalue = dav_parse_xml(sn, value, strlen(value));
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1760 if(xmlvalue) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1761 if(namespace) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1762 dav_set_property_ns(res, namespace, property, xmlvalue->children);
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1763 } else {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1764 dav_set_property(res, property, xmlvalue->children);
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1765 }
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1766 } else {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1767 fprintf(stderr, "Error: property content is not valid xml\n");
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1768 ret = 1;
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1769 }
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1770 } else {
371
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1771 if(namespace) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1772 dav_set_string_property_ns(res, namespace, property, value);
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1773 } else {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1774 dav_set_string_property(res, property, value);
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1775 }
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1776 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1777
371
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1778 if(ret == 0) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1779 if(dav_store(res)) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1780 print_resource_error(sn, res->path);
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1781 fprintf(stderr, "Cannot set property.\n");
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1782 ret = -1;
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1783 }
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1784 } else
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1785
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1786 free(path);
371
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1787 dav_session_destroy(sn);
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
1788 return ret;
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1789 }
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1790
304
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1791 int cmd_remove_property(CmdArgs *a) {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1792 if(a->argc < 2) {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1793 fprintf(stderr, "Too few arguments\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1794 fprintf(stderr, "Usage: dav %s\n", find_usage_str("remove-property"));
304
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1795 return -1;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1796 }
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1797
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1798 char *url = a->argv[0];
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1799 char *path = NULL;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1800 Repository *repo = url2repo(url, &path);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1801 DavSession *sn = connect_to_repo(repo, path, a);
304
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1802
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1803 if(set_session_config(sn, a)) {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1804 return -1;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1805 }
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1806
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1807 char *namespace = cmd_getoption(a, "namespace");
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1808 char *property = a->argv[1];
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1809
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1810 DavPropName propname;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1811 if(namespace) {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1812 propname.ns = namespace;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1813 propname.name = property;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1814 } else {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1815 dav_get_property_namespace_str(ctx, property, &propname.ns, &propname.name);
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1816 }
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1817
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1818 int ret = 0;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1819 DavResource *res = dav_resource_new(sn, path);
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1820 dav_remove_property_ns(res, propname.ns, propname.name);
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1821
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1822 if(dav_store(res)) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1823 print_resource_error(sn, res->path);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1824 fprintf(stderr, "Cannot set property.\n");
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1825 ret = -1;
304
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1826 }
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1827
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1828 free(path);
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1829 return ret;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1830 }
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1831
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1832 int cmd_lock(CmdArgs *a) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1833 if(a->argc != 1) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1834 fprintf(stderr, "Too %s arguments\n", a->argc > 1 ? "many" : "few");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1835 fprintf(stderr, "Usage: dav %s\n", find_usage_str("lock"));
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1836 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1837 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1838
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1839 char *url = a->argv[0];
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1840 char *path = NULL;
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
1841 Repository *repo = url2repo(url, &path);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1842 DavSession *sn = connect_to_repo(repo, path, a);
230
fdcbde1d7d65 fixed memory leaks in lock and unlock commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
1843 ucx_mempool_reg_destr(sn->mp, path, free);
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1844
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1845 if(set_session_config(sn, a)) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1846 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1847 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1848
315
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1849 time_t timeout = 0;
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1850 char *timeoutstr = cmd_getoption(a, "timeout");
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1851 if(timeoutstr) {
316
9d0505d80044 adds dav-sync lock timeout config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 315
diff changeset
1852 if(!sstrcasecmp(sstr(timeoutstr), S("infinite"))) {
315
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1853 timeout = -1;
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1854 } else {
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1855 timeout = (time_t)atoi(timeoutstr); // TODO: use strtol
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1856 }
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1857 }
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1858
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1859 DavResource *res = dav_resource_new(sn, path);
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1860 if(dav_lock_t(res, timeout)) {
264
94c0a938b66c fixes error detection loop in dav lock/unlock/get-property/set-property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 258
diff changeset
1861 print_resource_error(sn, res->path);
94c0a938b66c fixes error detection loop in dav lock/unlock/get-property/set-property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 258
diff changeset
1862 return -1;
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1863 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1864
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1865 DavLock *lock = dav_get_lock(sn, res->path);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1866 if(!lock) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1867 // this should really not happen
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1868 // do some damage control
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1869 dav_unlock(res);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1870 fprintf(stderr, "Error: Cannot find lock token for %s\n", res->path);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1871 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1872 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1873
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1874 printf("%s\n", lock->token);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1875
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1876 dav_session_destroy(sn);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1877 return 0;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1878 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1879
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1880 static char* read_line() {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1881 UcxBuffer *buf = ucx_buffer_new(NULL, 128, UCX_BUFFER_AUTOEXTEND);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1882 int c;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1883 while((c = getchar()) != EOF) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1884 if(c == '\n') {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1885 break;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1886 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1887 ucx_buffer_putc(buf, c);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1888 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1889 char *str = NULL;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1890 sstr_t line = sstrtrim(sstrn(buf->space, buf->size));
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1891 if(line.length != 0) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1892 str = sstrdup(line).ptr;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1893 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1894 ucx_buffer_free(buf);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1895 return str;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1896 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1897
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1898 int cmd_unlock(CmdArgs *a) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1899 if(a->argc != 1) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1900 fprintf(stderr, "Too %s arguments\n", a->argc > 1 ? "many" : "few");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1901 fprintf(stderr, "Usage: dav %s\n", find_usage_str("unlock"));
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1902 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1903 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1904
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1905 char *url = a->argv[0];
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1906 char *path = NULL;
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1907 Repository *repo = url2repo(url, &path);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1908 DavSession *sn = connect_to_repo(repo, path, a);
230
fdcbde1d7d65 fixed memory leaks in lock and unlock commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
1909 ucx_mempool_reg_destr(sn->mp, path, free);
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1910 if(set_session_config(sn, a)) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1911 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1912 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1913
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1914 char *locktoken = cmd_getoption(a, "lock");
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1915 if(locktoken) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1916 DavLock *lock = dav_create_lock(sn, locktoken, NULL);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1917 dav_add_collection_lock(sn, "/", lock);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1918 } else {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1919 locktoken = read_line();
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1920 if(!locktoken) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1921 fprintf(stderr, "No lock token specified.\nAbort.\n");
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1922 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1923 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1924 DavLock *lock = dav_create_lock(sn, locktoken, NULL);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1925 dav_add_collection_lock(sn, "/", lock);
230
fdcbde1d7d65 fixed memory leaks in lock and unlock commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
1926 free(locktoken);
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1927 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1928
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
1929 int ret = 0;
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1930 DavResource *res = dav_resource_new(sn, path);
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1931 if(dav_unlock(res)) {
264
94c0a938b66c fixes error detection loop in dav lock/unlock/get-property/set-property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 258
diff changeset
1932 print_resource_error(sn, res->path);
94c0a938b66c fixes error detection loop in dav lock/unlock/get-property/set-property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 258
diff changeset
1933 ret = -1;
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1934 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1935
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1936 dav_session_destroy(sn);
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
1937 return ret;
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1938 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1939
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1940 static int count_children(DavResource *res) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1941 DavResource *child = res->children;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1942 int count = 0;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1943 while(child) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1944 count++;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1945 child = child->next;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1946 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1947 return count;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1948 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1949
373
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
1950 void print_xml_infostr(DavXmlNode *xml) {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
1951 if(xml->children) {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
1952 printf("<%s>...</%s>", xml->name, xml->name);
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
1953 } else {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
1954 printf("<%s/>", xml->name);
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
1955 }
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
1956 }
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
1957
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1958 int cmd_info(CmdArgs *a) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1959 if(a->argc < 1) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1960 fprintf(stderr, "Too few arguments\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1961 fprintf(stderr, "Usage: dav %s\n", find_usage_str("info"));
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1962 return -1;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1963 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1964
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1965 char *url = a->argv[0];
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1966 char *path = NULL;
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
1967 Repository *repo = url2repo(url, &path);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
1968 DavSession *sn = connect_to_repo(repo, path, a);
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1969
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1970 if(set_session_config(sn, a)) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1971 return -1;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1972 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1973
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1974 char *version = cmd_getoption(a, "version");
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1975
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1976 DavResource *res = dav_resource_new(sn, path);
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1977 if(version) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1978 DavResource *vres = find_version(res, version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1979 if(!vres) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1980 fprintf(stderr, "Cannot find version '%s' for resource.\n", version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1981 return -1;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1982 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1983 dav_resource_free_all(res);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1984 res = vres;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1985 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1986
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1987 if(!dav_load(res)) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1988 printf("name: %s\n", res->name);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1989 printf("path: %s\n", res->path);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1990
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1991 char *server = util_url_base(sn->base_url);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1992 char *url = util_concat_path(server, res->href);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1993 printf("url: %s\n", url);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1994 free(url);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1995 free(server);
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
1996
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1997 if(res->iscollection) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1998 printf("type: collection\n");
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1999 printf("size: %d\n", count_children(res));
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2000 } else {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2001 printf("type: resource\n");
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2002 char *len = ls_size_str(res);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2003 printf("size: %s\n", len);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2004 free(len);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2005 }
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2006
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2007 size_t count = 0;
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2008 DavPropName *properties = dav_get_property_names(res, &count);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2009
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2010 char *last_ns = NULL;
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2011 for(int i=0;i<count;i++) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2012 DavPropName p = properties[i];
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2013 if(!last_ns || strcmp(last_ns, p.ns)) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2014 printf("\nnamespace: %s\n", p.ns);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2015 last_ns = p.ns;
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2016 }
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2017
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2018 DavXmlNode *xval = dav_get_property_ns(res, p.ns, p.name);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2019 if(dav_xml_isstring(xval)) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2020 sstr_t value = sstr(dav_xml_getstring(xval));
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2021 printf(" %s: %.*s\n", p.name, (int)value.length, value.ptr);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2022 } else {
373
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2023 // find some xml elements
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2024 printf(" %s: ", p.name);
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2025 DavXmlNode *x = xval->type == DAV_XML_ELEMENT ? xval : dav_xml_nextelm(xval);
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2026 for(int i=0;i<3;i++) {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2027 if(x) {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2028 if(i == 2) {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2029 printf(" ...");
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2030 break;
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2031 } else {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2032 print_xml_infostr(x);
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2033 }
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2034 } else {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2035 break;
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2036 }
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2037 x = dav_xml_nextelm(x);
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2038 }
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2039 printf("\n");
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2040
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2041
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2042 }
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2043 }
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2044
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2045 dav_session_free(sn, properties);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2046 return 0;
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2047 } else {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2048 print_resource_error(sn, res->path);
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2049 }
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2050
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2051 return -1;
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2052 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2053
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2054 int cmd_checkout(CmdArgs *a) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2055 if(a->argc < 1) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2056 fprintf(stderr, "Too few arguments\n");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2057 fprintf(stderr, "Usage: dav %s\n", "checkout [-pc] <url>");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2058 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2059 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2060
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2061 char *url = a->argv[0];
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2062 char *path = NULL;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2063 Repository *repo = url2repo(url, &path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2064 DavSession *sn = connect_to_repo(repo, path, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2065
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2066 if(set_session_config(sn, a)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2067 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2068 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2069 set_session_lock(sn, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2070
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2071 int ret = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2072 DavResource *res = dav_resource_new(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2073 if(dav_checkout(res)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2074 print_resource_error(sn, res->path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2075 ret = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2076 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2077
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2078 return ret;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2079 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2080
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2081 int cmd_checkin(CmdArgs *a) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2082 if(a->argc < 1) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2083 fprintf(stderr, "Too few arguments\n");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2084 fprintf(stderr, "Usage: dav %s\n", "checkin [-pc] <url>");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2085 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2086 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2087
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2088 char *url = a->argv[0];
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2089 char *path = NULL;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2090 Repository *repo = url2repo(url, &path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2091 DavSession *sn = connect_to_repo(repo, path, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2092
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2093 if(set_session_config(sn, a)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2094 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2095 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2096 set_session_lock(sn, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2097
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2098 int ret = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2099 DavResource *res = dav_resource_new(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2100 if(dav_checkin(res)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2101 print_resource_error(sn, res->path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2102 ret = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2103 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2104
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2105 return ret;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2106 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2107
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2108 int cmd_uncheckout(CmdArgs *a) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2109 if(a->argc < 1) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2110 fprintf(stderr, "Too few arguments\n");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2111 fprintf(stderr, "Usage: dav %s\n", "uncheckout [-pc] <url>");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2112 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2113 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2114
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2115 char *url = a->argv[0];
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2116 char *path = NULL;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2117 Repository *repo = url2repo(url, &path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2118 DavSession *sn = connect_to_repo(repo, path, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2119
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2120 if(set_session_config(sn, a)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2121 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2122 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2123 set_session_lock(sn, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2124
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2125 int ret = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2126 DavResource *res = dav_resource_new(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2127 if(dav_uncheckout(res)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2128 print_resource_error(sn, res->path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2129 ret = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2130 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2131
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2132 return ret;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2133 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2134 int cmd_versioncontrol(CmdArgs *a) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2135 if(a->argc < 1) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2136 fprintf(stderr, "Too few arguments\n");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2137 fprintf(stderr, "Usage: dav %s\n", "versioncontrol [-pc] <url>");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2138 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2139 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2140
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2141 char *url = a->argv[0];
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2142 char *path = NULL;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2143 Repository *repo = url2repo(url, &path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2144 DavSession *sn = connect_to_repo(repo, path, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2145
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2146 if(set_session_config(sn, a)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2147 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2148 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2149 set_session_lock(sn, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2150
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2151 int ret = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2152 DavResource *res = dav_resource_new(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2153 if(dav_versioncontrol(res)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2154 print_resource_error(sn, res->path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2155 ret = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2156 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2157
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2158 return ret;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2159 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2160
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2161 int cmd_list_versions(CmdArgs *a) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2162 if(a->argc < 1) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2163 fprintf(stderr, "Too few arguments\n");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2164 fprintf(stderr, "Usage: dav %s\n", "list-versions [-pc] <url>");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2165 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2166 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2167
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2168 char *url = a->argv[0];
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2169 char *path = NULL;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2170 Repository *repo = url2repo(url, &path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2171 DavSession *sn = connect_to_repo(repo, path, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2172
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2173 if(set_session_config(sn, a)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2174 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2175 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2176
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2177 DavResource *res = dav_resource_new(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2178
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2179 int ret = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2180 DavResource *list = dav_versiontree(res, NULL);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2181 if(list) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2182 char* longlist = cmd_getoption(a, "list");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2183
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2184 DavResource *v = list;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2185 int addnl = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2186 while(v) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2187 char *vname = dav_get_string_property(v, "D:version-name");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2188
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2189 if(longlist) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2190 if(addnl) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2191 putchar('\n');
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2192 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2193 printf("name: %s\n", vname);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2194 printf("href: %s\n", v->href);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2195 addnl = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2196 } else {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2197 printf("%s\n", vname);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2198 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2199 v = v->next;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2200 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2201 } else if(sn->error != DAV_OK) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2202 print_resource_error(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2203 ret = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2204 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2205
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2206 return ret;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2207 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2208
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2209 DavResource* find_version(DavResource *res, char *version) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2210 DavResource *list = dav_versiontree(res, NULL);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2211 DavResource *ret = NULL;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2212 while(list) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2213 DavResource *next = list->next;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2214 if(!ret) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2215 char *vname = dav_get_string_property(list, "D:version-name");
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2216 if(vname && !strcmp(vname, version)) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2217 ret = list;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2218 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2219 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2220 if(list != ret) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2221 dav_resource_free(list);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2222 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2223 list = next;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2224 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2225 return ret;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2226 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2227
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2228
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2229 char* stdin2str() {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2230 UcxBuffer *buf = ucx_buffer_new(NULL, 1024, UCX_BUFFER_AUTOEXTEND);
256
54433cb371df implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents: 252
diff changeset
2231 size_t size = ucx_stream_copy(stdin, buf, fread, ucx_buffer_write);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2232 if(size == 0) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2233 ucx_buffer_free(buf);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2234 return NULL;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2235 } else {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2236 ucx_buffer_putc(buf, '\0');
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2237 char *str = buf->space;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2238 free(buf);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2239 return str;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2240 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2241 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2242
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2243 static void xml2str_i(DavXmlNode *node, UcxBuffer *buf, int indent) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2244 while(node) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2245 if(node->type == DAV_XML_ELEMENT) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2246 if(node->children) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2247 if(dav_xml_isstring(node->children)) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2248 sstr_t s = sstrtrim(sstr(dav_xml_getstring(node->children)));
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2249 ucx_bprintf(
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2250 buf,
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2251 "%*s<%s>%.*s</%s>\n",
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2252 indent,
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2253 "",
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2254 node->name,
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2255 (int)s.length,
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2256 s.ptr,
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2257 node->name);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2258 } else {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2259 ucx_bprintf(buf, "%*s<%s>\n", indent, "", node->name);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2260 xml2str_i(node->children, buf, indent+2);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2261 ucx_bprintf(buf, "%*s</%s>\n", indent, "", node->name);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2262 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2263 } else {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2264 ucx_bprintf(buf, "%*s<%s />", indent, "", node->name);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2265 ucx_buffer_putc(buf, '\n');
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2266 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2267 } else if(node->type == DAV_XML_TEXT) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2268 sstr_t val = sstrtrim(sstrn(node->content, node->contentlength));
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2269 if(val.length > 0) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2270 ucx_bprintf(buf, "%*.*s", indent, (int)val.length, val.ptr);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2271 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2272 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2273
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2274 node = node->next;
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2275 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2276 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2277
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2278 char* xml2str(DavXmlNode *node) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2279 char *str = malloc(256);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2280 UcxBuffer *buf = ucx_buffer_new(str, 256, UCX_BUFFER_AUTOEXTEND);
346
3e20fd78e555 fixes missing string terminator when printing simplified xml (dav get-property)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 338
diff changeset
2281 xml2str_i(node, buf, 0);
3e20fd78e555 fixes missing string terminator when printing simplified xml (dav get-property)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 338
diff changeset
2282 ucx_buffer_putc(buf, 0);
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2283 char *space = buf->space;
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2284 ucx_buffer_free(buf);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2285 return space;
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2286 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2287
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2288 void printxmldoc(FILE *out, char *root, char *rootns, DavXmlNode *content) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2289 UcxMap *nsmap = ucx_map_new(16);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2290
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2291 ucx_map_cstr_put(nsmap, rootns, "x0");
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2292 fprintf(out, "%s", "<?xml version=\"1.0\"?>\n");
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2293 fprintf(out, "<x0:%s xmlns:x0=\"%s\">", root, rootns);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2294
361
b6f2462ee055 adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 355
diff changeset
2295 dav_print_node(out, (write_func)fwrite, nsmap, content);
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2296
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2297 fprintf(out, "</x0:%s>\n", root);
361
b6f2462ee055 adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 355
diff changeset
2298
b6f2462ee055 adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 355
diff changeset
2299 // cleanup namespace map
b6f2462ee055 adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 355
diff changeset
2300 ucx_map_cstr_remove(nsmap, rootns);
b6f2462ee055 adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 355
diff changeset
2301 ucx_map_free_content(nsmap, free);
b6f2462ee055 adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 355
diff changeset
2302 ucx_map_free(nsmap);
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2303 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2304
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2305
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2306 /* ---------- config commands ---------- */
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2307
195
4b7823a58199 fixed add-repository function name
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 194
diff changeset
2308 int cmd_add_repository(CmdArgs *args) {
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2309 printf("Each repository must have an unique name.\n");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2310 char *name = assistant_getcfg("name");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2311 if(!name) {
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2312 fprintf(stderr, "Abort\n");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2313 return -1;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2314 }
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2315 if(get_repository(sstr(name))) {
200
cc474cf2c2f5 added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 199
diff changeset
2316 fprintf(stderr, "Repository %s already exists.\nAbort\n", name);
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2317 return -1;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2318 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2319
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2320 printf("\nSpecify the repository base url.\n");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2321 char *url = assistant_getcfg("url");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2322 if(!url) {
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2323 fprintf(stderr, "Abort\n");
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2324 return -1;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2325 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2326
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2327 printf("\nUser for HTTP authentication.\n");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2328 char *user = assistant_getoptcfg("user");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2329
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2330 char *password = NULL;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2331 if(user) {
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2332 password = assistant_gethiddenoptcfg("password");
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2333 }
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2334 printf("\n");
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2335
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2336 Repository repo;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2337 memset(&repo, 0, sizeof(Repository));
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2338 repo.name = name;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2339 repo.url = url;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2340 repo.user = user;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2341 repo.password = password;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2342
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2343 int ret = 0;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2344 if(add_repository(&repo)) {
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2345 fprintf(stderr, "Cannot write config.xml\n");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2346 ret = -1;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2347 } else {
200
cc474cf2c2f5 added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 199
diff changeset
2348 printf("\nAdded repository: %s (%s)\n", name, url);
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2349 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2350
197
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2351 free(name);
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2352 free(url);
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2353 if(user) {
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2354 free(user);
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2355 }
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2356 if(password) {
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2357 free(password);
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2358 }
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2359
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2360 return ret;
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2361 }
398
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2362
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2363 int cmd_remove_repository(CmdArgs *args) {
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2364 if(args->argc < 1) {
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2365 fprintf(stderr, "Too few arguments\n");
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2366 fprintf(stderr, "Usage: dav remove-repository <name...>\n");
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2367 return -1;
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2368 }
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2369
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2370 for(int i = 0 ; i < args->argc ; i++) {
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2371 sstr_t reponame = sstr(args->argv[i]);
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2372 Repository* repo = get_repository(reponame);
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2373 if(repo) {
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2374 if(remove_repository(repo)) {
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2375 fprintf(stderr, "Cannot write config.xml\n");
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2376 return -1;
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2377 }
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2378 } else {
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2379 fprintf(stderr, "Repository %s does not exist - skipped.\n",
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2380 reponame.ptr);
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2381 return -1;
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2382 }
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2383 }
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2384
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2385 return -1;
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2386 }
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2387
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2388 int cmd_repository_url(CmdArgs *args) {
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2389 if(args->argc != 1) {
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2390 fprintf(stderr, "Too few arguments\n");
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2391 fprintf(stderr, "Usage: dav repository-url [-p] <name>\n");
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2392 return -1;
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2393 }
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2394
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2395 sstr_t reponame = sstr(args->argv[0]);
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2396 Repository* repo = get_repository(reponame);
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2397 if(repo) {
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2398 sstr_t url = sstr(repo->url);
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2399 if(repo->user && !cmd_getoption(args, "plain")) {
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2400 int hostindex = 0;
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2401 if(sstrprefix(url, S("https://"))) {
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2402 printf("https://");
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2403 hostindex = 8;
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2404 } else if(sstrprefix(url, S("http://"))) {
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2405 printf("http://");
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2406 hostindex = 7;
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2407 }
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2408 printf("%s", repo->user);
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2409 if(repo->password) {
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2410 CURL *curl = curl_easy_init();
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2411 char *pw = curl_easy_escape(
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2412 curl,
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2413 repo->password,
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2414 strlen(repo->password));
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2415 printf(":%s", pw);
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2416 curl_free(pw);
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2417 curl_easy_cleanup(curl);
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2418 }
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2419 putchar('@');
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2420 printf("%.*s", (int)url.length-hostindex, url.ptr+hostindex);
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2421 } else {
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2422 printf("%s", url.ptr);
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2423 }
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2424 if(url.ptr[url.length-1] != '/') {
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2425 putchar('/');
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2426 }
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2427 putchar('\n');
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2428 } else {
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2429 fprintf(stderr, "Repository %s does not exist.\n", reponame.ptr);
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2430 return -1;
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2431 }
488
29b979ca8750 adds dav_pw2key commoncrypto implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 478
diff changeset
2432 return 0;
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2433 }
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2434
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2435 int cmd_add_user(CmdArgs *args) {
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2436 char *master_pw = util_password_input("Master password: ");
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2437 if(!master_pw) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2438 return 1;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2439 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2440
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2441 PwdStore *secrets = get_pwdstore();
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2442 if(!secrets) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2443 secrets = pwdstore_new();
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2444 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2445 if(pwdstore_setpassword(secrets, master_pw)) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2446 fprintf(stderr, "Error: Cannot generate key from password.\nAbort.\n");
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2447 return 1;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2448 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2449 if(pwdstore_decrypt(secrets)) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2450 fprintf(stderr, "Error: Cannot decrypt secrets store.\nAbort.\n");
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2451 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2452
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2453
472
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
2454 char *id = assistant_getcfg("Credentials identifier");
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2455 if(id && pwdstore_get(secrets, id)) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2456 fprintf(stderr, "Credentials with this id already exist");
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2457 return 1;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2458 }
472
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
2459
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2460 char *user = assistant_getcfg("User");
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2461 char *password = util_password_input("Password: ");
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2462 char *location = assistant_getoptcfg("Location");
489
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
2463 UcxList *locations = location ? ucx_list_append(NULL, location) : NULL;
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2464 int ret = 1;
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2465 if(user && password) {
489
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
2466 pwdstore_put_index(secrets, id, locations);
474
017a4f09e6fa improves secret store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 473
diff changeset
2467 pwdstore_put(secrets, id, user, password);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2468 int ret = pwdstore_save(secrets);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2469 if(ret) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2470 fprintf(stderr, "Error: saving srcrets store failed.\n");
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2471 }
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2472 }
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2474 pwdstore_free(secrets);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2475 if(id) free(id);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2476 if(user) free(user);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2477 if(password) free(password);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2478 if(location) free(location);
489
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
2479 if(locations) ucx_list_free(locations);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2480
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2481 return ret;
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2482 }
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2483
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2484
432
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
2485 int shell_completion(CmdArgs *args, int index) {
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
2486 if(args->argc < 2 || args->argc < 3) {
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2487 return 1;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2488 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2489
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2490 if(index == 1) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2491 sstr_t prefix = { NULL, 0 };
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2492 if(args->argc > 2) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2493 prefix = sstr(args->argv[2]);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2494 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2495 for(int i=0;;i++) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2496 char *str = cmdusageinfo[i];
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2497 if(!str) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2498 break;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2499 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2500 int len = (int)strlen(str);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2501 int maxlen = len;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2502 for(int w=0;w<len;w++) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2503 if(str[w] == ' ') {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2504 maxlen = w;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2505 break;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2506 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2507 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2508 if(prefix.ptr) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2509 if(!sstrprefix(sstrn(str, maxlen), prefix)) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2510 continue;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2511 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2512 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2513 printf("%.*s\n", (int)maxlen, str);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2514 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2515 return 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2516 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2517
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2518 char *cmd = args->argv[2];
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2519 if(!strcmp(cmd, "date")) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2520 return 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2521 }
458
295eaa04fc41 fixes url completion segfaulting for empty strings (in case the user hasn't already started typing an URL)
Mike Becker <universe@uap-core.de>
parents: 435
diff changeset
2522
295eaa04fc41 fixes url completion segfaulting for empty strings (in case the user hasn't already started typing an URL)
Mike Becker <universe@uap-core.de>
parents: 435
diff changeset
2523 // get already typed URL or NULL, if the user hasn't started typing yet
295eaa04fc41 fixes url completion segfaulting for empty strings (in case the user hasn't already started typing an URL)
Mike Becker <universe@uap-core.de>
parents: 435
diff changeset
2524 char *url = args->argc > 3 ? args->argv[3] : NULL;
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2525
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2526 //printf("index: {%s}\n", args->argv[0]);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2527 //printf("dav: {%s}\n", args->argv[1]);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2528 //printf("cmd: {%s}\n", cmd);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2529 //printf("url: {%s}\n", url);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2530 //printf("file: {%s}\n", file);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2531
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2532 if(index == 2) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2533 // url completion
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2534 return url_completion(url);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2535 } else if (index == 3) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2536 if(!strcmp(cmd, "put") || !strcmp(cmd, "import")) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2537 // file completion
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2538 return 12;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2539 } else if(!strcmp(cmd, "copy") || !strcmp(cmd, "cp") || !strcmp(cmd, "move") || !strcmp(cmd, "mv")) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2540 // url completion
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2541 return url_completion(url);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2542 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2543 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2544
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2545 return 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2546 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2547
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2548 int url_completion(char *u) {
458
295eaa04fc41 fixes url completion segfaulting for empty strings (in case the user hasn't already started typing an URL)
Mike Becker <universe@uap-core.de>
parents: 435
diff changeset
2549 sstr_t url;
295eaa04fc41 fixes url completion segfaulting for empty strings (in case the user hasn't already started typing an URL)
Mike Becker <universe@uap-core.de>
parents: 435
diff changeset
2550 url.ptr = u;
295eaa04fc41 fixes url completion segfaulting for empty strings (in case the user hasn't already started typing an URL)
Mike Becker <universe@uap-core.de>
parents: 435
diff changeset
2551 url.length = u ? strlen(u) : 0;
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2552
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2553 // repo completion
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2554 int repocomp = 1;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2555 for(int i=0;i<url.length;i++) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2556 if(url.ptr[i] == '/') {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2557 repocomp = 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2558 break;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2559 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2560 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2561 if(repocomp) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2562 UcxList *repos = get_repositories();
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2563 UCX_FOREACH(elm, repos) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2564 Repository *repo = elm->data;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2565 if(sstrprefix(sstr(repo->name), url)) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2566 printf("%s/\n", repo->name);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2567 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2568
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2569 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2570 } else {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2571 // url completion
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2572
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2573 CmdArgs a;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2574 memset(&a, 0, sizeof(CmdArgs));
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2575 a.options = ucx_map_new(4);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2576 ucx_map_cstr_put(a.options, "noinput", "");
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2577
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2578 char *path = NULL;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2579 Repository *repo = url2repo(u, &path);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2580 DavSession *sn = connect_to_repo(repo, path, &a);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2581 ucx_map_free(a.options);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2582 if(!sn) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2583 return 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2584 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2585
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2586 size_t plen = strlen(path);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2587
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2588 sstr_t filter;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2589 char *lspath = NULL;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2590 if(path[plen-1] == '/') {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2591 lspath = strdup(path);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2592 filter = S("");
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2593 } else {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2594 lspath = util_parent_path(path);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2595 filter = sstr(util_resource_name(path));
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2596 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2597
433
7096666628ca fixes url completion output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 432
diff changeset
2598 DavResource *ls = dav_query(sn, "select - from %s order by name", lspath);
435
def0359fb48f adds some error detection to completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 433
diff changeset
2599 DavResource *elm = ls ? ls->children : NULL;
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2600 while(elm) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2601 sstr_t name = sstr(elm->name);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2602 if(sstrprefix(name, filter)) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2603 int space = 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2604 for(int i=0;i<name.length;i++) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2605 if(name.ptr[i] == ' ') {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2606 space = 1;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2607 break;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2608 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2609 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2610
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2611 UcxBuffer *out = ucx_buffer_new(NULL, 512, UCX_BUFFER_AUTOEXTEND);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2612 ucx_buffer_puts(out, repo->name);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2613 if(space) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2614 size_t l = strlen(elm->path);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2615 for(int i=0;i<l;i++) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2616 if(elm->path[i] == ' ') {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2617 ucx_buffer_puts(out, "\\ ");
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2618 } else {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2619 ucx_buffer_putc(out, elm->path[i]);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2620 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2621 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2622 } else {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2623 ucx_buffer_puts(out, elm->path);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2624 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2625 if(elm->iscollection) {
433
7096666628ca fixes url completion output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 432
diff changeset
2626 if(out->space[out->pos-1] != '/') {
7096666628ca fixes url completion output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 432
diff changeset
2627 ucx_buffer_putc(out, '/');
7096666628ca fixes url completion output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 432
diff changeset
2628 }
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2629 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2630 printf("%.*s\n", (int)out->pos, out->space);
432
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
2631
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
2632 ucx_buffer_free(out);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2633 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2634 elm = elm->next;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2635 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2636
432
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
2637 free(lspath);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2638
432
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
2639 dav_session_destroy(sn);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2640 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2641
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2642 return 10;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2643 }

mercurial