Mon, 01 Jan 2018 19:53:36 +0100
adds xattr lib and tag support
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 | * |
185
cd42cccee550
updated copyright notice
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
182
diff
changeset
|
4 | * Copyright 2016 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 | 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 | 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" |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | #include "main.h" |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | |
12
493128ef1b12
added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
50 | static DavContext *ctx; |
493128ef1b12
added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
51 | |
142
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
139
diff
changeset
|
52 | static int printxmlerror = 1; |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
53 | 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
|
54 | if(printxmlerror) { |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
139
diff
changeset
|
55 | va_list ap; |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
139
diff
changeset
|
56 | va_start(ap, msg); |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
139
diff
changeset
|
57 | vfprintf(stderr, msg, ap); |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
139
diff
changeset
|
58 | va_end(ap); |
0c0ccb7f71ba
startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
139
diff
changeset
|
59 | } |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | } |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | |
135
664aeaec8d25
replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
62 | //define DO_THE_TEST |
105
ee0de2b1872e
fixed control flow in int_cmd + committed testcase (enable with #define DO_THE_TEST)
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
63 | #include <libidav/davqlparser.h> |
123
806c4dccf2ae
added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
64 | #include <libidav/davqlexec.h> |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
65 | #include "tags.h" |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
66 | void test() { |
264
94c0a938b66c
fixes error detection loop in dav lock/unlock/get-property/set-property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
258
diff
changeset
|
67 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
68 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
69 | |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | int main(int argc, char **argv) { |
34
1b87b3b1921e
removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
71 | if(argc < 2) { |
11 | 72 | fprintf(stderr, "Missing command\n"); |
73 | print_usage(argv[0]); | |
74 | return -1; | |
75 | } | |
76 | ||
34
1b87b3b1921e
removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
77 | char *cmd = argv[1]; |
1b87b3b1921e
removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
33
diff
changeset
|
78 | CmdArgs *args = cmd_parse_args(argc - 2, argv + 2); |
11 | 79 | if(!args) { |
80 | print_usage(argv[0]); | |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
81 | cmd_args_free(args); |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | return -1; |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | } |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | |
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
|
85 | 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
|
86 | 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
|
87 | 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
|
88 | 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
|
89 | 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
|
90 | 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
|
91 | 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
|
92 | #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
|
93 | 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
|
94 | 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
|
95 | #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
|
96 | 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
|
97 | 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
|
98 | 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
|
99 | 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
|
100 | } 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
|
101 | /* 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
|
102 | 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
|
103 | } |
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 | } 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
|
105 | 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
|
106 | 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
|
107 | } else if(!strcasecmp(cmd, "get")) { |
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_get(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, "put")) { |
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
|
110 | ret = cmd_put(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
|
111 | } 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
|
112 | !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
|
113 | !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
|
114 | !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
|
115 | { |
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 | 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
|
117 | } 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
|
118 | 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
|
119 | } 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
|
120 | 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
|
121 | } 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
|
122 | ret = cmd_move(args, false); |
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, "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
|
124 | 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
|
125 | } 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
|
126 | 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
|
127 | } 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
|
128 | ret = cmd_get_property(args); |
304
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
129 | } else if(!strcasecmp(cmd, "remove-property")) { |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
130 | 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
|
131 | } 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
|
132 | 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
|
133 | } 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
|
134 | 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
|
135 | } 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
|
136 | ret = cmd_info(args); |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
137 | } else if(!strcasecmp(cmd, "add-repository") |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
138 | || !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
|
139 | ret = cmd_add_repository(args); |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
140 | } else if(!strcasecmp(cmd, "list-repositories") |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
141 | || !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
|
142 | ret = list_repositories(); |
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
|
143 | } 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
|
144 | || !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
|
145 | fprintf(stderr, "dav %s\n", DAV_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
|
146 | } 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
|
147 | 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
|
148 | } |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
149 | } |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
150 | |
16
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
151 | dav_context_destroy(ctx); |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
152 | cmd_args_free(args); |
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
153 | free_config(); |
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
154 | xmlCleanupParser(); |
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
155 | curl_global_cleanup(); |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
156 | |
16
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
157 | return ret; |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
158 | } |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | |
332
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
160 | static char *cmdusageinfo[] = { |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
161 | "list [-altdepcR] [-u <date>] <url>", |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
162 | "get [-pcRKA] [-o <file>] [-u <date>] <url>", |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
163 | "put [-pcRA] [-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
|
164 | "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
|
165 | "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
|
166 | "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
|
167 | "move [-pcO] [-L <lock>] <url> <url>", |
338
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
168 | "get-property [-pcx] [-n <uri>] <url> <property>", |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
169 | "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
|
170 | "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
|
171 | "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
|
172 | "unlock [-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
|
173 | "info [-pc] <url>", |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
174 | "date [url]", |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
175 | NULL |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
176 | }; |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
177 | |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
178 | char* find_usage_str(char *cmd) { |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
179 | sstr_t c = sstr(cmd); |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
180 | 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
|
181 | 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
|
182 | if(!str) { |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
183 | break; |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
184 | } |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
185 | 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
|
186 | 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
|
187 | return str; |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
188 | } |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
189 | } |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
190 | return NULL; |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
191 | } |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
192 | |
11 | 193 | void print_usage(char *cmd) { |
332
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
194 | 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
|
195 | 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
|
196 | if(!str) { |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
197 | break; |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
198 | } |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
199 | fprintf(stderr, " %s\n", str); |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
200 | } |
5587282ebe1c
dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
201 | |
11 | 202 | fprintf(stderr, "\n"); |
203 | fprintf(stderr, "Options:\n"); | |
204 | fprintf(stderr, | |
100
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
205 | " -k <key> Key to use for encryption\n"); |
11 | 206 | 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
|
207 | fprintf(stderr, " -c Enable full encryption\n"); |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
208 | fprintf(stderr, |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
209 | " -R " |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
210 | "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
|
211 | fprintf(stderr, " -K Keep already present files\n"); |
11 | 212 | fprintf(stderr, " -o <file> Write output to file\n"); |
30
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
213 | fprintf( |
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
214 | stderr, |
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
215 | " -u <date> " |
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
216 | "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
|
217 | fprintf(stderr, " -a show all files\n"); |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
218 | 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
|
219 | 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
|
220 | 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
|
221 | 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
|
222 | fprintf(stderr, " -O override resources\n"); |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
223 | fprintf(stderr, " -A tar import/export\n"); |
209
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
224 | fprintf(stderr, " -L <lock> specificy lock token\n"); |
315
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
225 | 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
|
226 | 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
|
227 | fprintf(stderr, " -x xml property content\n"); |
229
df158262f802
fixed dav_context_get_key
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
228 | fprintf(stderr, " -N disable authentication prompt (all commands)\n"); |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
229 | fprintf(stderr, " -i disable cert verification (all commands)\n"); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
230 | fprintf(stderr, " -v verbose output (all commands)\n"); |
11 | 231 | fprintf(stderr, "\n"); |
198
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
197
diff
changeset
|
232 | fprintf(stderr, "Config commands:\n"); |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
233 | fprintf(stderr, " add-repository\n"); |
198
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
197
diff
changeset
|
234 | fprintf(stderr, " list-repositories\n"); |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
235 | fprintf(stderr, " check-config\n"); |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
236 | fprintf(stderr, "\n"); |
11 | 237 | fprintf(stderr, |
238 | "Instead of an url you can pass a repository name " | |
239 | "with an optional path:\n"); | |
240 | fprintf(stderr, " <repository>/path/\n"); | |
241 | fprintf(stderr, "\n"); | |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
242 | } |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
243 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
244 | |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
245 | int request_auth2(DavSession *sn, void *userdata) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
246 | Repository *repo = userdata; |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
247 | |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
248 | char *user = NULL; |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
249 | char ubuf[256]; |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
250 | if(repo->user) { |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
251 | user = repo->user; |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
252 | } else { |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
253 | fprintf(stderr, "User: "); |
146
e48048334602
hidden password input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
254 | fflush(stderr); |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
255 | user = fgets(ubuf, 256, stdin); |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
256 | } |
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
|
257 | 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
|
258 | 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
|
259 | } |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
260 | |
150
37fb12574acd
added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
261 | 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
|
262 | 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
|
263 | 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
|
264 | } |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
265 | |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
266 | size_t ulen = strlen(user); |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
267 | if(user[ulen-1] == '\n') { |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
268 | user[ulen-1] = '\0'; |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
269 | } |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
270 | |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
271 | dav_session_set_auth(sn, user, password); |
146
e48048334602
hidden password input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
272 | free(password); |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
273 | |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
274 | return 0; |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
275 | } |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
276 | |
210
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
277 | 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
|
278 | 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
|
279 | *path = NULL; |
4 | 280 | |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
281 | int s; |
11 | 282 | 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
|
283 | s = 7; |
11 | 284 | } 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
|
285 | s = 8; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
286 | } else { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
287 | s = 1; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
288 | } |
4 | 289 | |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
290 | sstr_t r = sstr(url); |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
291 | 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
|
292 | 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
|
293 | char c = url[i]; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
294 | if(c == '/') { |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
295 | r = sstrn(url, i); |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
296 | 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
|
297 | if(p.length == 0) { |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
298 | p = sstrn("/", 1); |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
299 | } |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
300 | break; |
4 | 301 | } |
302 | } | |
303 | ||
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
304 | Repository *repo = get_repository(r); |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
305 | if(repo) { |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
306 | *path = sstrdup(p).ptr; |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
307 | } else { |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
308 | repo = calloc(1, sizeof(Repository)); |
70 | 309 | repo->name = strdup(""); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
310 | repo->decrypt_content = true; |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
201
diff
changeset
|
311 | repo->verification = true; |
187
38295f2fa231
added missing repo authmethods initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
312 | repo->authmethods = CURLAUTH_BASIC; |
70 | 313 | if(url[ulen-1] == '/') { |
314 | repo->url = strdup(url); | |
315 | *path = strdup("/"); | |
100
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
316 | } else if (strchr(url, '/')) { |
70 | 317 | repo->url = util_parent_path(url); |
318 | // TODO: check/fix | |
319 | *path = strdup(util_resource_name(url)-1); | |
100
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
320 | } else { |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
321 | repo->url = strdup(url); |
f4127c4d1018
improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
84
diff
changeset
|
322 | *path = strdup("/"); |
70 | 323 | } |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
324 | } |
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 | return repo; |
4 | 327 | } |
328 | ||
210
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
329 | 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
|
330 | char *plain = cmd_getoption(a, "plain"); |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
331 | char *crypt = cmd_getoption(a, "crypt"); |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
332 | |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
333 | if(plain && crypt) { |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
334 | 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
|
335 | return 1; |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
336 | } |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
337 | |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
338 | if (plain) { |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
339 | sn->flags &= ~DAV_SESSION_FULL_ENCRYPTION; |
45
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
340 | } else if(crypt) { |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
341 | sn->flags |= DAV_SESSION_FULL_ENCRYPTION; |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
342 | } |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
343 | |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
344 | if (cmd_getoption(a, "verbose")) { |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
345 | 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
|
346 | 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
|
347 | } |
210
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
348 | |
45
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
349 | return 0; |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
350 | } |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
351 | |
210
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
352 | 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
|
353 | char *locktoken = cmd_getoption(a, "lock"); |
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
354 | if(locktoken) { |
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
355 | 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
|
356 | dav_add_collection_lock(sn, "/", lock); |
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
357 | } |
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
358 | } |
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
359 | |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
360 | static DavSession* connect_to_repo(Repository *repo, CmdArgs *a) { |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
361 | DavSession *sn = dav_session_new_auth(ctx, repo->url, repo->user, repo->password); |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
362 | sn->flags = get_repository_flags(repo); |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
363 | 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
|
364 | 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
|
365 | 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
|
366 | if(repo->cert) { |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
367 | curl_easy_setopt(sn->handle, CURLOPT_CAINFO, repo->cert); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
368 | } |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
369 | if(!repo->verification || cmd_getoption(a, "insecure")) { |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
370 | curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYPEER, 0); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
371 | curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYHOST, 0); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
372 | } |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
373 | if(!cmd_getoption(a, "noinput")) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
374 | 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
|
375 | } |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
376 | return sn; |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
377 | } |
4 | 378 | |
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
379 | 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
|
380 | int ret = 0; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
381 | if(res != p->last_resource) { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
382 | 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
|
383 | ret = 1; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
384 | } else { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
385 | p->cur += now - p->last_res_cur; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
386 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
387 | |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
388 | p->last_resource = res; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
389 | p->last_res_cur = now; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
390 | p->last_res_total = total; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
391 | |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
392 | return ret; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
393 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
394 | |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
395 | 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
|
396 | Progress *p = data; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
397 | int newres = update_progress(res, total, now, p); |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
398 | |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
399 | time_t newts = time(NULL); |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
400 | if(newres || (p->ts != newts)) { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
401 | 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
|
402 | fflush(p->out); |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
403 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
404 | p->ts = newts; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
405 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
406 | |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
407 | |
297
3cbe57eeaed1
adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
271
diff
changeset
|
408 | #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
|
409 | #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
|
410 | |
11 | 411 | int cmd_list(CmdArgs *a) { |
35
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
412 | if(a->argc != 1) { |
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
413 | 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
|
414 | 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
|
415 | return -1; |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
416 | } |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
417 | |
11 | 418 | 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
|
419 | char *path = NULL; |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
420 | Repository *repo = url2repo(url, &path); |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
421 | DavSession *sn = connect_to_repo(repo, a); |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
422 | |
45
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
423 | if(set_session_config(sn, a)) { |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
424 | return -1; |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
425 | } |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
426 | |
30
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
427 | 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
|
428 | 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
|
429 | time_t t = -1; |
30
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
430 | if(update) { |
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
431 | t = util_parse_lastmodified(update); |
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
432 | } |
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
433 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
434 | int depth = cmd_getoption(a, "recursive") ? -1 : 1; |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
435 | int ret = -1; |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
436 | DavResource *ls = dav_query( |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
437 | sn, |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
438 | 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
|
439 | path, |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
440 | depth, |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
441 | t); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
442 | if(ls) { |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
443 | // parameters |
270
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
444 | 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
|
445 | 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
|
446 | print_func = ls_print_list_elm; |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
447 | } else { |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
448 | print_func = ls_print_elm; |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
449 | } |
135
664aeaec8d25
replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
450 | |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
451 | DavResource *child = ls->children; |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
452 | while(child) { |
270
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
453 | print_func(child, path, a); |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
454 | child = child->next; |
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
455 | } |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
456 | } else { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
457 | 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
|
458 | } |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
459 | |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
460 | free(path); |
40
a95ee94b9204
supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
38
diff
changeset
|
461 | //free(base); |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
462 | |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
143
diff
changeset
|
463 | dav_session_destroy(sn); |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
464 | |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
465 | return ret; |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
466 | } |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
467 | |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
468 | 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
|
469 | struct tm t; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
470 | struct tm n; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
471 | time_t now = time(NULL); |
32 | 472 | #ifdef _WIN32 |
473 | memcpy(&t, localtime(&tm), sizeof(struct tm)); | |
474 | memcpy(&n, localtime(&now), sizeof(struct tm)); | |
475 | #else | |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
476 | localtime_r(&tm, &t); |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
477 | localtime_r(&now, &n); |
32 | 478 | #endif /* _WIN32 */ |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
479 | char *str = malloc(16); |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
480 | if(t.tm_year == n.tm_year) { |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
481 | 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
|
482 | } else { |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
483 | strftime(str, 16, "%b %d %Y", &t); |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
484 | } |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
485 | return str; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
486 | } |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
487 | |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
488 | static char* ls_size_str(DavResource *res) { |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
489 | char *str = malloc(16); |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
490 | uint64_t size = res->contentlength; |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
491 | |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
492 | if(res->iscollection) { |
165
b66bed169fc3
fixed zero-length format string in ls_size_str
Mike Becker <universe@uap-core.de>
parents:
154
diff
changeset
|
493 | 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
|
494 | } else if(size < 0x400) { |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
495 | snprintf(str, 16, "%" PRIu64 " bytes", size); |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
496 | } else if(size < 0x100000) { |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
497 | float s = (float)size/0x400; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
498 | int diff = (s*100 - (int)s*100); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
499 | if(diff > 90) { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
500 | diff = 0; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
501 | s += 0.10f; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
502 | } |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
503 | if(size < 0x2800 && diff != 0) { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
504 | // size < 10 KiB |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
505 | snprintf(str, 16, "%.1f KiB", s); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
506 | } else { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
507 | snprintf(str, 16, "%.0f KiB", s); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
508 | } |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
509 | } else if(size < 0x40000000) { |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
510 | float s = (float)size/0x100000; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
511 | int diff = (s*100 - (int)s*100); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
512 | if(diff > 90) { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
513 | diff = 0; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
514 | s += 0.10f; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
515 | } |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
516 | if(size < 0xa00000 && diff != 0) { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
517 | // size < 10 MiB |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
518 | snprintf(str, 16, "%.1f MiB", s); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
519 | } else { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
520 | size /= 0x100000; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
521 | snprintf(str, 16, "%.0f MiB", s); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
522 | } |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
523 | } else if(size < 0x1000000000ULL) { |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
524 | float s = (float)size/0x40000000; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
525 | int diff = (s*100 - (int)s*100); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
526 | if(diff > 90) { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
527 | diff = 0; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
528 | s += 0.10f; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
529 | } |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
530 | if(size < 0x280000000 && diff != 0) { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
531 | // size < 10 GiB |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
532 | snprintf(str, 16, "%.1f GiB", s); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
533 | } else { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
534 | size /= 0x40000000; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
535 | snprintf(str, 16, "%.0f GiB", s); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
536 | } |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
537 | } else { |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
538 | size /= 1024; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
539 | float s = (float)size/0x40000000; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
540 | int diff = (s*100 - (int)s*100); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
541 | if(diff > 90) { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
542 | diff = 0; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
543 | s += 0.10f; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
544 | } |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
545 | if(size < 0x280000000 && diff != 0) { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
546 | // size < 10 TiB |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
547 | snprintf(str, 16, "%.1f TiB", s); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
548 | } else { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
549 | size /= 0x40000000; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
550 | snprintf(str, 16, "%.0f TiB", s); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
551 | } |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
552 | } |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
553 | return str; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
554 | } |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
555 | |
270
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
556 | 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
|
557 | if(parent) { |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
558 | path += strlen(parent); |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
559 | } |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
560 | if(path[0] == '/') { |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
561 | path++; |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
562 | } |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
563 | int pathlen = strlen(path); |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
564 | if(path[pathlen-1] == '/') { |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
565 | pathlen--; |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
566 | } |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
567 | *len = pathlen; |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
568 | return path; |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
569 | } |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
570 | |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
571 | 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
|
572 | 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
|
573 | 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
|
574 | 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
|
575 | return; |
6a3248e22d58
-a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
576 | } |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
577 | |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
578 | char flags[16]; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
579 | memset(flags, '-', 15); |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
580 | |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
581 | int type_width = 0; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
582 | char *type = res->contenttype; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
583 | |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
584 | if(res->iscollection) { |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
585 | flags[0] = 'd'; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
586 | type = ""; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
587 | } |
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
330
diff
changeset
|
588 | 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
|
589 | res, |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
590 | DAV_NS, |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
591 | "crypto-key"); |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
592 | if(keyprop) { |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
593 | flags[1] = 'c'; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
594 | } |
213
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
595 | |
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
596 | 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
|
597 | flags[6] = '\0'; |
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
330
diff
changeset
|
598 | 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
|
599 | flags[2] = 'l'; |
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
600 | } |
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
330
diff
changeset
|
601 | 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
|
602 | res, |
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
603 | "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
|
604 | "executable"); |
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
605 | 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
|
606 | flags[3] = 'x'; |
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
607 | } |
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
608 | } else { |
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
609 | flags[2] = '\0'; |
211
3d12817414e9
dav list indicates locks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
210
diff
changeset
|
610 | } |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
611 | |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
612 | if(cmd_getoption(a, "type")) { |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
613 | type_width = 20; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
614 | } |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
615 | if(type == NULL || type_width == 0) { |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
616 | type = ""; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
617 | } |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
618 | |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
619 | char *date = ls_date_str(res->lastmodified); |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
620 | char *size = ls_size_str(res); |
270
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
621 | int namelen = strlen(res->name); |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
622 | 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
|
623 | |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
624 | //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
|
625 | printf( |
270
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
626 | "%s %*s %10s %12s %.*s\n", |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
627 | flags, |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
628 | type_width, type, |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
629 | size, |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
630 | date, |
270
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
631 | namelen, |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
632 | name); |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
633 | free(date); |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
634 | free(size); |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
635 | |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
636 | if(recursive) { |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
637 | DavResource *child = res->children; |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
638 | while(child) { |
138
6a3248e22d58
-a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
639 | //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
|
640 | if(child->name[0] != '.' || show_all) { |
270
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
641 | 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
|
642 | } |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
643 | child = child->next; |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
644 | } |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
645 | } |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
646 | } |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
647 | |
270
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
648 | 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
|
649 | 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
|
650 | 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
|
651 | 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
|
652 | return; |
6a3248e22d58
-a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
653 | } |
6a3248e22d58
-a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
654 | |
270
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
655 | int namelen = strlen(res->name); |
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
656 | 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
|
657 | printf("%.*s\n", namelen, name); |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
658 | if(recursive) { |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
659 | DavResource *child = res->children; |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
660 | while(child) { |
270
0edfb4c0e7f8
fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
264
diff
changeset
|
661 | ls_print_elm(child, parent, a); |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
662 | child = child->next; |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
663 | } |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
664 | } |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
665 | } |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
13
diff
changeset
|
666 | |
333
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
667 | static void free_getres(void *r) { |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
668 | GetResource *getres = r; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
669 | free(getres->path); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
670 | free(getres); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
671 | } |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
672 | |
11 | 673 | int cmd_get(CmdArgs *a) { |
35
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
674 | if(a->argc != 1) { |
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
675 | // 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
|
676 | 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
|
677 | 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
|
678 | return -1; |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
679 | } |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
680 | |
11 | 681 | 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
|
682 | char *path = NULL; |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
683 | Repository *repo = url2repo(url, &path); |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
684 | DavSession *sn = connect_to_repo(repo, a); |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
685 | |
45
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
686 | if(set_session_config(sn, a)) { |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
687 | return -1; |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
688 | } |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
689 | |
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
690 | char *progressfile = cmd_getoption(a, "progressfile"); |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
691 | Progress pdata; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
692 | memset(&pdata, 0, sizeof(Progress)); |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
693 | if(progressfile) { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
694 | if(!strcmp(progressfile, "-")) { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
695 | pdata.out = stdout; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
696 | pdata.isstdout = 1; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
697 | } else { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
698 | pdata.out = fopen(progressfile, "w"); |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
699 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
700 | if(pdata.out) { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
701 | dav_session_set_progresscallback(sn, download_progress, NULL, &pdata); |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
702 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
703 | } |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
704 | |
30
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
705 | char *update = cmd_getoption(a, "update"); |
135
664aeaec8d25
replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
706 | time_t t = -1; |
30
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
707 | if(update) { |
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
708 | 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
|
709 | 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
|
710 | 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
|
711 | "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
|
712 | " 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
|
713 | " 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
|
714 | 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
|
715 | } |
30
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
716 | } |
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
717 | |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
718 | int recursive = cmd_getoption(a, "recursive") ? 1 : 0; |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
719 | DavResource *res; |
30
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
720 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
721 | int depth = recursive ? -1 : 1; |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
722 | res = dav_query( |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
723 | sn, |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
724 | "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
|
725 | path, |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
726 | depth, |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
727 | t); |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
728 | if(!res) { |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
729 | 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
|
730 | return -1; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
731 | } |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
732 | if(!recursive && res->iscollection) { |
235
0468df02e18f
fixed dav get with -u option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
230
diff
changeset
|
733 | 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
|
734 | 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
|
735 | return -1; |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
736 | } |
12
493128ef1b12
added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
737 | |
493128ef1b12
added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
738 | /* |
493128ef1b12
added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
739 | * determine the output file |
493128ef1b12
added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
740 | * 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
|
741 | */ |
493128ef1b12
added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
742 | char *outfile = cmd_getoption(a, "output"); |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
743 | char *basepath = outfile; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
744 | char *tar = cmd_getoption(a, "tar"); |
12
493128ef1b12
added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
745 | if(!outfile) { |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
746 | if(res->iscollection) { |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
747 | basepath = ""; |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
748 | } else { |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
749 | basepath = res->name; |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
750 | } |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
751 | if(tar) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
752 | outfile = "-"; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
753 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
754 | } else if(tar) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
755 | basepath = ""; |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
756 | } else if(res->iscollection && !strcmp(outfile, "-")) { |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
757 | fprintf( |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
758 | stderr, |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
759 | "Cannot write output to stdout " |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
760 | "if the requested resource is a collection.\n"); |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
761 | return -1; |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
762 | } |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
763 | |
333
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
764 | // get list of resources |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
765 | UcxList *reslist = NULL; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
766 | uint64_t totalsize = 0; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
767 | uint64_t rescount = 0; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
768 | |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
769 | GetResource *getres = malloc(sizeof(GetResource)); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
770 | getres->res = res; |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
771 | getres->path = strdup(basepath); |
333
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
772 | |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
773 | char *structure = cmd_getoption(a, "structure"); |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
774 | |
333
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
775 | // iterate over resource tree |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
776 | UcxList *stack = ucx_list_prepend(NULL, getres); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
777 | while(stack) { |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
778 | GetResource *g = stack->data; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
779 | stack = ucx_list_remove(stack, stack); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
780 | |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
781 | if(g->res->iscollection) { |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
782 | DavResource *child = g->res->children; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
783 | while(child) { |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
784 | // add resource to stack |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
785 | size_t pathlen = strlen(g->path); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
786 | GetResource *newres = malloc(sizeof(GetResource)); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
787 | newres->res = child; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
788 | newres->path = pathlen > 0 ? |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
789 | 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
|
790 | |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
791 | stack = ucx_list_prepend(stack, newres); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
792 | |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
793 | child = child->next; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
794 | } |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
795 | } else { |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
796 | if(structure) { |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
797 | // download only directory structure |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
798 | // 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
|
799 | continue; // skip non-collection resource |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
800 | } |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
801 | totalsize += g->res->contentlength; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
802 | rescount++; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
803 | } |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
804 | |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
805 | if(strlen(g->path) == 0) { |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
806 | free_getres(g); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
807 | } else { |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
808 | reslist = ucx_list_append(reslist, g); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
809 | } |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
810 | } |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
811 | |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
812 | // download resources |
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
813 | pdata.total = totalsize; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
814 | |
333
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
815 | int ret; |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
816 | getfunc get; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
817 | TarOutputStream *tout = NULL; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
818 | if(tar) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
819 | get = (getfunc)resource2tar; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
820 | FILE *tarfile = strcmp(outfile, "-") ? fopen(outfile, "wb") : stdout; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
821 | if(!tarfile) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
822 | perror("Cannot open tar output file"); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
823 | return -1; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
824 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
825 | tout = tar_open(tarfile); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
826 | } else { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
827 | get = get_resource; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
828 | } |
333
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
829 | UCX_FOREACH(elm, reslist) { |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
830 | GetResource *getres = elm->data; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
831 | |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
832 | ret = get(repo, getres, a, tout); |
333
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
833 | if(ret) { |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
834 | break; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
835 | } |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
836 | } |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
837 | if(tar) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
838 | // close tar stream |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
839 | if(tar_close(tout)) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
840 | fprintf(stderr, "tar stream broken\n"); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
841 | ret = -1; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
842 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
843 | } |
333
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
844 | |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
845 | ucx_list_free_content(reslist, free_getres); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
846 | ucx_list_free(reslist); |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
847 | free(path); |
333
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
848 | |
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
849 | if(pdata.out && !pdata.isstdout) { |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
850 | fclose(pdata.out); |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
851 | } |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
852 | return ret; |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
853 | } |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
854 | |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
855 | 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
|
856 | DavResource *res = getres->res; |
350
5fc457fb2cb1
fixes wrong output path in dav get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
346
diff
changeset
|
857 | char *out = getres->path; |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
858 | |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
859 | 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
|
860 | 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
|
861 | |
333
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
862 | mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
863 | int ret = util_mkdir(out, mode); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
864 | if(ret != 0 && errno != EEXIST) { |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
865 | fprintf(stderr, "Cannot create directory '%s': ", out); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
866 | perror(""); |
000cdd124115
refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
867 | return 1; |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
868 | } |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
869 | |
309
8a474d2ad209
adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
305
diff
changeset
|
870 | return 0; |
8a474d2ad209
adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
305
diff
changeset
|
871 | } |
8a474d2ad209
adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
305
diff
changeset
|
872 | |
330
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
873 | int isstdout = !strcmp(out, "-"); |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
874 | if(cmd_getoption(a, "keep") && !isstdout) { |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
875 | struct stat s; |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
876 | if(stat(out, &s)) { |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
877 | if(errno != ENOENT) { |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
878 | perror("stat"); |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
879 | } |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
880 | } else { |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
881 | if(cmd_getoption(a, "recursive")) { |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
882 | 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
|
883 | } |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
884 | return 0; |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
885 | } |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
886 | } |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
887 | |
309
8a474d2ad209
adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
305
diff
changeset
|
888 | // 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
|
889 | 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
|
890 | printf("get: %s\n", res->path); |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
891 | } |
330
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
892 | |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
329
diff
changeset
|
893 | FILE *fout = isstdout ? stdout : fopen(out, "wb"); |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
894 | if(!fout) { |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
895 | 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
|
896 | return -1; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
897 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
898 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
899 | 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
|
900 | fclose(fout); |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
17
diff
changeset
|
901 | if(ret && strcmp(out, "-")) { |
207
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
204
diff
changeset
|
902 | print_resource_error(res->session, res->path); |
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
204
diff
changeset
|
903 | //if(strcmp(out, "-")) { |
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
204
diff
changeset
|
904 | // unlink(out); |
de23f8881e9f
fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
204
diff
changeset
|
905 | //} |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
906 | } |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
907 | |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
908 | return 0; |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
909 | } |
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
910 | |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
911 | #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
|
912 | #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
|
913 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
914 | 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
|
915 | DavResource *d = res->res; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
916 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
917 | if(d->iscollection) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
918 | fprintf(stderr, "add d: %s\n", res->path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
919 | 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
|
920 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
921 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
922 | fprintf(stderr, "add f: %s\n", res->path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
923 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
924 | // add tar file header |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
925 | 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
|
926 | 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
|
927 | return -1; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
928 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
929 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
930 | 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
|
931 | print_resource_error(d->session, d->path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
932 | return -1; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
933 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
934 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
935 | // download content |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
936 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
937 | return tar_end_file(tar); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
938 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
939 | |
11 | 940 | int cmd_put(CmdArgs *a) { |
35
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
941 | if(a->argc != 2) { |
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
942 | // 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
|
943 | 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
|
944 | fprintf(stderr, "Usage: dav %s\n", find_usage_str("put")); |
4 | 945 | return -1; |
3
323689ada09d
disabled ssl cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
946 | } |
323689ada09d
disabled ssl cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
947 | |
11 | 948 | char *url = a->argv[0]; |
949 | 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
|
950 | char *path = NULL; |
38
b855f76e965b
code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
36
diff
changeset
|
951 | Repository *repo = url2repo(url, &path); |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
952 | DavSession *sn = connect_to_repo(repo, a); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
953 | |
45
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
954 | if(set_session_config(sn, a)) { |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
955 | return -1; |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
956 | } |
210
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
957 | set_session_lock(sn, a); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
958 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
959 | // override the session key if the -k option is specified |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
960 | char *keyname = cmd_getoption(a, "key"); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
961 | if(keyname) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
962 | DavKey *key = dav_context_get_key(ctx, keyname); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
963 | if(key) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
964 | sn->key = key; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
965 | } else { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
966 | fprintf(stderr, "Key %s not found!\nAbort.\n", keyname); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
967 | // TODO: free |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
968 | return -1; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
969 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
970 | } |
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
|
971 | |
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
|
972 | // if encryption is requested, but we still don't know the key, abort |
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
|
973 | if (DAV_IS_ENCRYPTED(sn) && !(sn->key)) { |
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
|
974 | fprintf(stderr, "Encryption has been requested, " |
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
|
975 | "but no default key is configured.\n" |
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
|
976 | "You may specify a custom key with the '-k' option.\n"); |
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
|
977 | return -1; |
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
|
978 | } |
4 | 979 | |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
980 | char *tar = cmd_getoption(a, "tar"); |
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
|
981 | |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
982 | int ret; |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
983 | if(!tar) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
984 | if(!strcmp(file, "-")) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
985 | FILE *in = stdin; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
986 | 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
|
987 | } else { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
988 | ret = put_entry(repo, a, sn, path, file, TRUE); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
989 | } |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
990 | } else { |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
991 | ret = put_tar(repo, a, sn, file, path); |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
992 | } |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
993 | |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
994 | free(path); |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
995 | return ret; |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
996 | } |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
997 | |
241
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
998 | 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
|
999 | int recursive = cmd_getoption(a, "recursive") ? 1 : 0; |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1000 | struct stat s; |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1001 | if(stat(file, &s)) { |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1002 | perror("stat"); |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1003 | 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
|
1004 | return -1; |
493128ef1b12
added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
1005 | } |
493128ef1b12
added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
1006 | |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1007 | int ret = 0; |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1008 | if(S_ISDIR(s.st_mode)) { |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1009 | if(!recursive) { |
241
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1010 | fprintf( |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1011 | 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
|
1012 | "%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
|
1013 | file); |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1014 | return 1; |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1015 | } |
271
7b1ca53f3897
fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
1016 | |
7b1ca53f3897
fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
1017 | if(!root) { |
7b1ca53f3897
fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
1018 | printf("mkcol: %s\n", file); |
7b1ca53f3897
fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
1019 | } |
7b1ca53f3897
fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
1020 | |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1021 | DIR *dir = opendir(file); |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1022 | if(!dir) { |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1023 | // error |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1024 | } |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1025 | struct dirent *entry; |
241
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1026 | int nument = 0; |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1027 | while((entry = readdir(dir)) != NULL) { |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1028 | if(!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")) { |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1029 | continue; |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1030 | } |
241
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1031 | nument++; |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1032 | char *entry_file = util_concat_path(file, entry->d_name); |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1033 | 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
|
1034 | 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
|
1035 | free(entry_path); |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1036 | free(entry_file); |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1037 | if(r) { |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1038 | ret = 1; |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1039 | break; |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1040 | } |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1041 | } |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1042 | closedir(dir); |
241
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1043 | |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1044 | if(nument == 0) { |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1045 | // create empty directory |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1046 | DavResource *res = dav_resource_new(sn, path); |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1047 | res->iscollection = TRUE; |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1048 | if(!dav_exists(res)) { |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1049 | if(dav_create(res)) { |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1050 | fprintf(stderr, "Cannot create collection %s\n", path); |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1051 | print_resource_error(sn, res->path); |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1052 | ret = 1; |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1053 | } |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1054 | } |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1055 | dav_resource_free(res); |
da7ace67deab
improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
236
diff
changeset
|
1056 | } |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1057 | } else if(S_ISREG(s.st_mode)) { |
271
7b1ca53f3897
fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
1058 | if(recursive) { |
7b1ca53f3897
fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
1059 | printf("put: %s\n", file); |
7b1ca53f3897
fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
1060 | } |
7b1ca53f3897
fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
1061 | |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1062 | /* |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1063 | * use stdin if the input file is - |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1064 | */ |
72
aac29f2e8030
dav now opens files in binary mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
70
diff
changeset
|
1065 | FILE *in = fopen(file, "rb"); |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1066 | if(!in) { |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1067 | fprintf(stderr, "cannot open input file\n"); |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1068 | return -1; |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1069 | } |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1070 | char *filename = util_resource_name(file); |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1071 | //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
|
1072 | 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
|
1073 | //free(path); |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1074 | fclose(in); |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1075 | } |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1076 | |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1077 | return ret; |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1078 | } |
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1079 | |
334
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1080 | 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
|
1081 | int isstdin = !strcmp(tarfile, "-"); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1082 | FILE *in = isstdin ? stdin : fopen(tarfile, "rb"); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1083 | if(!in) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1084 | perror("Cannot open tar file"); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1085 | return -1; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1086 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1087 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1088 | 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
|
1089 | if(!col) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1090 | if(sn->error == DAV_NOT_FOUND) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1091 | col = dav_resource_new(sn, path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1092 | col->iscollection = TRUE; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1093 | if(dav_create(col)) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1094 | print_resource_error(sn, path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1095 | return -1; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1096 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1097 | } else { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1098 | print_resource_error(sn, path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1099 | return -1; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1100 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1101 | } else if(!col->iscollection) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1102 | 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
|
1103 | return -1; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1104 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1105 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1106 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1107 | int ret = 0; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1108 | TarInputStream *tar = tar_inputstream_open(in); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1109 | TarEntry *e = NULL; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1110 | while((e = tar_read_entry(tar)) != NULL) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1111 | char *newpath = util_concat_path(path, e->path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1112 | if(e->type == TAR_TYPE_FILE) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1113 | fprintf(stderr, "put: %s\n", e->path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1114 | DavResource *res = dav_resource_new(sn, newpath); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1115 | dav_set_content(res, tar, (dav_read_func)tar_fread); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1116 | dav_set_content_length(res, (size_t)e->size); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1117 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1118 | if(dav_store(res)) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1119 | print_resource_error(sn, res->path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1120 | fprintf(stderr, "Cannot upload file.\n"); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1121 | if(sn->errorstr) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1122 | fprintf(stderr, "%s\n", sn->errorstr); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1123 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1124 | return -1; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1125 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1126 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1127 | } else if(e->type == TAR_TYPE_DIRECTORY) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1128 | printf("mkcol: %s\n", e->path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1129 | DavResource *res = dav_resource_new(sn, newpath); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1130 | res->iscollection = TRUE; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1131 | if(!dav_exists(res)) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1132 | if(dav_create(res)) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1133 | fprintf(stderr, "Cannot create collection %s\n", newpath); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1134 | print_resource_error(sn, res->path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1135 | ret = 1; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1136 | free(newpath); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1137 | break; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1138 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1139 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1140 | } else { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1141 | fprintf(stderr, "skip: %s\n", e->path); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1142 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1143 | free(newpath); |
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 | if(tar->error != TAR_OK) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1146 | ret = -1; |
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 | |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1149 | if(!isstdin) { |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1150 | fclose(in); |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1151 | } |
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 | return ret; |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1154 | } |
5f80c5d0e87f
adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
1155 | |
178
e137883e620f
using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
165
diff
changeset
|
1156 | 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
|
1157 | 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
|
1158 | |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
1159 | if(!res) { |
24
a317202ae787
implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
1160 | if(sn->error == DAV_NOT_FOUND) { |
21 | 1161 | 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
|
1162 | if(dav_create(res)) { |
a317202ae787
implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
1163 | fprintf(stderr, "Cannot create resource.\n"); |
a317202ae787
implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
1164 | return -1; |
a317202ae787
implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
22
diff
changeset
|
1165 | } |
21 | 1166 | } else { |
198
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
197
diff
changeset
|
1167 | print_resource_error(sn, path); |
21 | 1168 | return -1; |
1169 | } | |
1170 | } else if(res->iscollection) { | |
1171 | // TODO: free res | |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1172 | 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
|
1173 | |
e554f3d72d9e
fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents:
352
diff
changeset
|
1174 | 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
|
1175 | // 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
|
1176 | 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
|
1177 | "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
|
1178 | 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
|
1179 | 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
|
1180 | } |
e554f3d72d9e
fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents:
352
diff
changeset
|
1181 | |
21 | 1182 | path = newpath; |
1183 | res = dav_resource_new(sn, path); | |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
1184 | free(newpath); |
178
e137883e620f
using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
165
diff
changeset
|
1185 | 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
|
1186 | // TODO: free res |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1187 | return ret; |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
1188 | } |
12
493128ef1b12
added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
1189 | |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1190 | dav_set_content(res, in, (dav_read_func)fread); |
180
5b58389ab9dd
fixed large file support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
1191 | if(len > 0 && len < 0x7d000000) { |
179
802b48ae791d
enable sharepoint put fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
178
diff
changeset
|
1192 | 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
|
1193 | } |
4 | 1194 | |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
1195 | if(dav_store(res)) { |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1196 | print_resource_error(sn, res->path); |
13
8a0cc4d90de7
added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
12
diff
changeset
|
1197 | fprintf(stderr, "Cannot upload file.\n"); |
22
e593f7e41be0
added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
1198 | if(sn->errorstr) { |
e593f7e41be0
added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
1199 | fprintf(stderr, "%s\n", sn->errorstr); |
e593f7e41be0
added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
21
diff
changeset
|
1200 | } |
5
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
1201 | return -1; |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
1202 | } |
88625853ae74
new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
1203 | return 0; |
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1204 | } |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1205 | |
28
4e46c65711ef
added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
27
diff
changeset
|
1206 | |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1207 | int cmd_remove(CmdArgs *a) { |
35
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
1208 | if(a->argc != 1) { |
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
1209 | // 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
|
1210 | 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
|
1211 | 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
|
1212 | return -1; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1213 | } |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1214 | |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1215 | char *url = a->argv[0]; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1216 | 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
|
1217 | Repository *repo = url2repo(url, &path); |
8e5856182668
auth input for dav get, put, mkdir and remove commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
1218 | DavSession *sn = connect_to_repo(repo, a); |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1219 | |
45
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
1220 | if(set_session_config(sn, a)) { |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
1221 | return -1; |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
1222 | } |
210
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
1223 | set_session_lock(sn, a); |
45
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
1224 | |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1225 | DavResource *res = dav_resource_new(sn, path); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1226 | if(!res) { |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1227 | fprintf(stderr, "error\n"); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1228 | return -1; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1229 | } |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1230 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1231 | if(dav_delete(res)) { |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1232 | print_resource_error(sn, res->path); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1233 | fprintf(stderr, "Cannot delete resource.\n"); |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1234 | return -1; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1235 | } |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1236 | |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
1237 | free(path); |
15
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1238 | return 0; |
182af08b4813
added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
1239 | } |
16
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1240 | |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1241 | int cmd_mkdir(CmdArgs *a) { |
35
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
1242 | if(a->argc != 1) { |
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
1243 | // 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
|
1244 | 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
|
1245 | 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
|
1246 | return -1; |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1247 | } |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1248 | |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1249 | char *url = a->argv[0]; |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1250 | 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
|
1251 | Repository *repo = url2repo(url, &path); |
8e5856182668
auth input for dav get, put, mkdir and remove commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
1252 | DavSession *sn = connect_to_repo(repo, a); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1253 | |
45
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
1254 | if(set_session_config(sn, a)) { |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
1255 | return -1; |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1256 | } |
210
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
1257 | set_session_lock(sn, a); |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1258 | |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1259 | // override the session key if the -k option is specified |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1260 | char *keyname = cmd_getoption(a, "key"); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1261 | if(keyname) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1262 | DavKey *key = dav_context_get_key(ctx, keyname); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1263 | if(key) { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1264 | sn->key = key; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1265 | } else { |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1266 | fprintf(stderr, "Key %s not found!\nAbort.\n", keyname); |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1267 | // TODO: free |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1268 | return -1; |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1269 | } |
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1270 | } |
16
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1271 | |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1272 | DavResource *res = dav_resource_new(sn, path); |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1273 | if(!res) { |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1274 | fprintf(stderr, "error\n"); |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1275 | return -1; |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1276 | } |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1277 | res->iscollection = 1; |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1278 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1279 | if(dav_create(res)) { |
16
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1280 | print_resource_error(sn, res->path); |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1281 | fprintf(stderr, "Cannot create collection.\n"); |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1282 | return -1; |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1283 | } |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1284 | |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
1285 | free(path); |
16
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1286 | return 0; |
5dbef9e07376
added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
1287 | } |
29
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1288 | |
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1289 | int cmd_move(CmdArgs *a, int cp) { |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1290 | if(a->argc != 2) { |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1291 | // 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
|
1292 | 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
|
1293 | fprintf(stderr, "Usage: dav %s\n", find_usage_str(cp ? "copy" : "move")); |
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1294 | return -1; |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1295 | } |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1296 | |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1297 | char *url1 = a->argv[0]; |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1298 | char *path1 = NULL; |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1299 | Repository *repo1 = url2repo(url1, &path1); |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1300 | |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1301 | char *url2 = a->argv[1]; |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1302 | char *path2 = NULL; |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1303 | Repository *repo2 = url2repo(url2, &path2); |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1304 | |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
1305 | DavSession *sn = connect_to_repo(repo1, a); |
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1306 | if(set_session_config(sn, a)) { |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1307 | return -1; |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1308 | } |
236
6b4ce32d0c4e
copy/move with lock tokens works now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
1309 | set_session_lock(sn, a); |
210
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
1310 | |
182
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1311 | 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
|
1312 | |
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1313 | if(repo1 == repo2) { |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1314 | DavResource *res = dav_resource_new(sn, path1); |
182
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1315 | int err = cp ? dav_copy_o(res, path2, override) |
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
1316 | : dav_move_o(res, path2, override); |
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1317 | if(err) { |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1318 | print_resource_error(sn, res->path); |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1319 | fprintf(stderr, "Cannot %s resource.\n", cp ? "copy" : "move"); |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1320 | return -1; |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1321 | } |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1322 | } else { |
186
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1323 | char *server1 = util_url_base(repo1->url); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1324 | char *server2 = util_url_base(repo2->url); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1325 | if(!strcmp(server1, server2)) { |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
1326 | DavSession *sn2 = connect_to_repo(repo2, a); |
186
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1327 | if(set_session_config(sn2, a)) { |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1328 | return -1; |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1329 | } |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1330 | DavResource *dest = dav_resource_new(sn2, path2); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1331 | char *desthref = dav_resource_get_href(dest); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1332 | char *desturl = util_get_url(sn2, desthref); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1333 | |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1334 | DavResource *res = dav_resource_new(sn, path1); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1335 | int err = cp ? dav_copyto(res, desturl, override) |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1336 | : dav_moveto(res, desturl, override); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1337 | |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1338 | free(desturl); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1339 | dav_session_destroy(sn2); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1340 | |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1341 | if(err) { |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1342 | print_resource_error(sn, res->path); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1343 | fprintf(stderr, "Cannot %s resource.\n", cp ? "copy" : "move"); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1344 | return -1; |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1345 | } |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1346 | } else { |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1347 | fprintf(stderr, "Copy or Move not supported for different hosts.\n"); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1348 | return -1; |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1349 | } |
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1350 | } |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1351 | |
186
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1352 | dav_session_destroy(sn); |
05d11fbcaeb3
improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1353 | |
181
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1354 | return 0; |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1355 | } |
a8f8cdbf85df
implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
1356 | |
29
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1357 | |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1358 | 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
|
1359 | char **date_str = (char**)data; |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1360 | |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1361 | //printf("header: %.*s\n", s*n, header); |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1362 | sstr_t h = sstrn(header, s*n); |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1363 | if(sstrprefix(h, S("Date:"))) { |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1364 | sstr_t v = sstrsubs(h, 5); |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1365 | v = sstrdup(sstrtrim(v)); |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1366 | *date_str = v.ptr; |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1367 | } |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1368 | return s*n; |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1369 | } |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1370 | |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1371 | int cmd_date(CmdArgs *a) { |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1372 | if(a->argc < 1) { |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1373 | time_t now = time(NULL); |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1374 | struct tm *date = gmtime(&now); |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1375 | char str[32]; |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1376 | putenv("LC_TIME=C"); |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1377 | 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
|
1378 | fwrite(str, 1, len, stdout); |
35
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
1379 | } else if (a->argc == 1) { |
29
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1380 | char *url = a->argv[0]; |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1381 | char *path = NULL; |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
1382 | DavSession *sn = connect_to_repo(url2repo(url, &path), a); |
29
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1383 | |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1384 | DavResource *res = dav_resource_new(sn, path); |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1385 | char *date = NULL; |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1386 | 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
|
1387 | curl_easy_setopt(sn->handle, CURLOPT_WRITEHEADER, &date); |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1388 | if(dav_exists(res) && date) { |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1389 | printf("%s\n", date); |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1390 | } else { |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1391 | return -1; |
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1392 | } |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
1393 | free(path); |
35
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
1394 | return 0; |
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
1395 | } else { |
ad0c9dacd7e3
errors on too many arguments
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
1396 | 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
|
1397 | 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
|
1398 | return -1; |
29
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1399 | } |
43
03076907b58a
added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
40
diff
changeset
|
1400 | return 0; |
29
938957a4eea7
added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
28
diff
changeset
|
1401 | } |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
1402 | |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1403 | int cmd_get_property(CmdArgs *a) { |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
1404 | if(a->argc < 2) { |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
1405 | 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
|
1406 | 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
|
1407 | return -1; |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
1408 | } |
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
1409 | |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1410 | char *url = a->argv[0]; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1411 | 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
|
1412 | Repository *repo = url2repo(url, &path); |
571b62700df6
adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1413 | DavSession *sn = connect_to_repo(repo, a); |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1414 | |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1415 | if(set_session_config(sn, a)) { |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1416 | return -1; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1417 | } |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1418 | |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1419 | char *namespace = cmd_getoption(a, "namespace"); |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1420 | char *property = a->argv[1]; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1421 | |
298
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
1422 | DavPropName propname; |
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
1423 | if(namespace) { |
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
1424 | propname.ns = namespace; |
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
1425 | propname.name = property; |
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
1426 | } else { |
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
1427 | 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
|
1428 | if(!propname.ns || !propname.name) { |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
316
diff
changeset
|
1429 | fprintf(stderr, "Error: unknown namespace prefix\n"); |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
316
diff
changeset
|
1430 | return -1; |
7eea57f6d847
adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
316
diff
changeset
|
1431 | } |
298
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
1432 | } |
755b8198b071
dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
1433 | |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1434 | 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
|
1435 | if(dav_load_prop(res, &propname, 1)) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1436 | print_resource_error(sn, res->path); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1437 | return -1; |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1438 | } |
338
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1439 | free(path); |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1440 | |
338
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1441 | 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
|
1442 | if(!x) { |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1443 | 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
|
1444 | return -1; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1445 | } |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1446 | |
338
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1447 | if(cmd_getoption(a, "xml")) { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1448 | // 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
|
1449 | 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
|
1450 | } else { |
338
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1451 | // 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
|
1452 | // 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
|
1453 | if(dav_xml_isstring(x)) { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1454 | 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
|
1455 | } else { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1456 | char *str = xml2str(x); |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1457 | fprintf(stderr, "%s", str); |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1458 | free(str); |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1459 | } |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1460 | } |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1461 | |
338
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1462 | return 0; |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1463 | } |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1464 | |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1465 | int cmd_set_property(CmdArgs *a) { |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1466 | if(a->argc < 2) { |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1467 | 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
|
1468 | 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
|
1469 | return -1; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1470 | } |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1471 | |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1472 | char *url = a->argv[0]; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1473 | 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
|
1474 | Repository *repo = url2repo(url, &path); |
571b62700df6
adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1475 | DavSession *sn = connect_to_repo(repo, a); |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1476 | |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1477 | if(set_session_config(sn, a)) { |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1478 | return -1; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1479 | } |
210
1d19e0ff18d9
added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
1480 | set_session_lock(sn, a); |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1481 | |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1482 | 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
|
1483 | if(!dav_exists(res)) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1484 | print_resource_error(sn, res->path); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1485 | return -1; |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1486 | } |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1487 | |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1488 | char *namespace = cmd_getoption(a, "namespace"); |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1489 | char *property = a->argv[1]; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1490 | 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
|
1491 | |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1492 | if(namespace) { |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
1493 | dav_set_string_property_ns(res, namespace, property, value); |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1494 | } else { |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
1495 | dav_set_string_property(res, property, value); |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1496 | } |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1497 | |
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
|
1498 | int ret = 0; |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1499 | if(dav_store(res)) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1500 | print_resource_error(sn, res->path); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1501 | fprintf(stderr, "Cannot set property.\n"); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1502 | ret = -1; |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1503 | } |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1504 | |
74
da079dc0724c
fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
73
diff
changeset
|
1505 | free(path); |
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
|
1506 | return ret; |
33
0bbbb0341606
some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
1507 | } |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1508 | |
304
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1509 | int cmd_remove_property(CmdArgs *a) { |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1510 | if(a->argc < 2) { |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1511 | 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
|
1512 | 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
|
1513 | return -1; |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1514 | } |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1515 | |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1516 | char *url = a->argv[0]; |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1517 | char *path = NULL; |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1518 | Repository *repo = url2repo(url, &path); |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1519 | DavSession *sn = connect_to_repo(repo, a); |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1520 | |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1521 | if(set_session_config(sn, a)) { |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1522 | return -1; |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1523 | } |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1524 | |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1525 | char *namespace = cmd_getoption(a, "namespace"); |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1526 | char *property = a->argv[1]; |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1527 | |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1528 | DavPropName propname; |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1529 | if(namespace) { |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1530 | propname.ns = namespace; |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1531 | propname.name = property; |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1532 | } else { |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1533 | 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
|
1534 | } |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1535 | |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1536 | int ret = 0; |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1537 | DavResource *res = dav_resource_new(sn, path); |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1538 | 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
|
1539 | |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1540 | if(dav_store(res)) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1541 | print_resource_error(sn, res->path); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1542 | fprintf(stderr, "Cannot set property.\n"); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1543 | ret = -1; |
304
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1544 | } |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1545 | |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1546 | free(path); |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1547 | return ret; |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1548 | } |
a4d3ff32d49c
adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
298
diff
changeset
|
1549 | |
209
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1550 | int cmd_lock(CmdArgs *a) { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1551 | if(a->argc != 1) { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1552 | 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
|
1553 | 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
|
1554 | return -1; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1555 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1556 | |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1557 | char *url = a->argv[0]; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1558 | 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
|
1559 | Repository *repo = url2repo(url, &path); |
571b62700df6
adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1560 | DavSession *sn = connect_to_repo(repo, a); |
230
fdcbde1d7d65
fixed memory leaks in lock and unlock commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
229
diff
changeset
|
1561 | 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
|
1562 | |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1563 | if(set_session_config(sn, a)) { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1564 | return -1; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1565 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1566 | |
315
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
1567 | time_t timeout = 0; |
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
1568 | char *timeoutstr = cmd_getoption(a, "timeout"); |
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
1569 | if(timeoutstr) { |
316
9d0505d80044
adds dav-sync lock timeout config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
1570 | if(!sstrcasecmp(sstr(timeoutstr), S("infinite"))) { |
315
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
1571 | timeout = -1; |
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
1572 | } else { |
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
1573 | timeout = (time_t)atoi(timeoutstr); // TODO: use strtol |
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
1574 | } |
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
1575 | } |
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
1576 | |
209
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1577 | 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
|
1578 | 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
|
1579 | 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
|
1580 | return -1; |
209
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1581 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1582 | |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1583 | 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
|
1584 | if(!lock) { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1585 | // this should really not happen |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1586 | // do some damage control |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1587 | dav_unlock(res); |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1588 | 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
|
1589 | return -1; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1590 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1591 | |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1592 | printf("%s\n", lock->token); |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1593 | |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1594 | dav_session_destroy(sn); |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1595 | return 0; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1596 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1597 | |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1598 | static char* read_line() { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1599 | 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
|
1600 | int c; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1601 | while((c = getchar()) != EOF) { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1602 | if(c == '\n') { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1603 | break; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1604 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1605 | ucx_buffer_putc(buf, c); |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1606 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1607 | char *str = NULL; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1608 | 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
|
1609 | if(line.length != 0) { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1610 | str = sstrdup(line).ptr; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1611 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1612 | ucx_buffer_free(buf); |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1613 | return str; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1614 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1615 | |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1616 | int cmd_unlock(CmdArgs *a) { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1617 | if(a->argc != 1) { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1618 | 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
|
1619 | 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
|
1620 | return -1; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1621 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1622 | |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1623 | char *url = a->argv[0]; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1624 | 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
|
1625 | Repository *repo = url2repo(url, &path); |
209
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1626 | DavSession *sn = connect_to_repo(url2repo(url, &path), a); |
230
fdcbde1d7d65
fixed memory leaks in lock and unlock commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
229
diff
changeset
|
1627 | 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
|
1628 | if(set_session_config(sn, a)) { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1629 | return -1; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1630 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1631 | |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1632 | char *locktoken = cmd_getoption(a, "lock"); |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1633 | if(locktoken) { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1634 | 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
|
1635 | dav_add_collection_lock(sn, "/", lock); |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1636 | } else { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1637 | locktoken = read_line(); |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1638 | if(!locktoken) { |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1639 | 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
|
1640 | return -1; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1641 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1642 | 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
|
1643 | 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
|
1644 | free(locktoken); |
209
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1645 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1646 | |
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
|
1647 | int ret = 0; |
209
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1648 | 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
|
1649 | 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
|
1650 | 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
|
1651 | ret = -1; |
209
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1652 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1653 | |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1654 | 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
|
1655 | return ret; |
209
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1656 | } |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
207
diff
changeset
|
1657 | |
84
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1658 | static int count_children(DavResource *res) { |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1659 | DavResource *child = res->children; |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1660 | int count = 0; |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1661 | while(child) { |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1662 | count++; |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1663 | child = child->next; |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1664 | } |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1665 | return count; |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1666 | } |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1667 | |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1668 | int cmd_info(CmdArgs *a) { |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1669 | if(a->argc < 1) { |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1670 | 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
|
1671 | 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
|
1672 | return -1; |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1673 | } |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1674 | |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1675 | char *url = a->argv[0]; |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1676 | 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
|
1677 | Repository *repo = url2repo(url, &path); |
571b62700df6
adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1678 | DavSession *sn = connect_to_repo(repo, a); |
84
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1679 | |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1680 | if(set_session_config(sn, a)) { |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1681 | return -1; |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1682 | } |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1683 | |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1684 | 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
|
1685 | if(!dav_load(res)) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1686 | printf("name: %s\n", res->name); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1687 | printf("path: %s\n", res->path); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1688 | |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1689 | 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
|
1690 | 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
|
1691 | printf("url: %s\n", url); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1692 | free(url); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1693 | 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
|
1694 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1695 | if(res->iscollection) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1696 | printf("type: collection\n"); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1697 | printf("size: %d\n", count_children(res)); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1698 | } else { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1699 | printf("type: resource\n"); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1700 | char *len = ls_size_str(res); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1701 | printf("size: %s\n", len); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1702 | free(len); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1703 | } |
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
|
1704 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1705 | size_t count = 0; |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1706 | 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
|
1707 | |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1708 | char *last_ns = NULL; |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1709 | for(int i=0;i<count;i++) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1710 | DavPropName p = properties[i]; |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1711 | 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
|
1712 | printf("\nnamespace: %s\n", p.ns); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1713 | 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
|
1714 | } |
571b62700df6
adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1715 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1716 | 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
|
1717 | if(dav_xml_isstring(xval)) { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1718 | 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
|
1719 | 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
|
1720 | } else { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1721 | printf(" %s: $xml\n", p.name); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1722 | } |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1723 | } |
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
|
1724 | |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1725 | dav_session_free(sn, properties); |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1726 | return 0; |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1727 | } else { |
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1728 | print_resource_error(sn, res->path); |
84
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1729 | } |
354
067ea2315a8a
moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
353
diff
changeset
|
1730 | |
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
|
1731 | return -1; |
84
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1732 | } |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1733 | |
7fca3788261d
added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
1734 | |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1735 | char* stdin2str() { |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1736 | 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
|
1737 | 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
|
1738 | if(size == 0) { |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1739 | ucx_buffer_free(buf); |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1740 | return NULL; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1741 | } else { |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1742 | ucx_buffer_putc(buf, '\0'); |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1743 | char *str = buf->space; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1744 | free(buf); |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1745 | return str; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1746 | } |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1747 | } |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1748 | |
338
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1749 | 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
|
1750 | while(node) { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1751 | if(node->type == DAV_XML_ELEMENT) { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1752 | if(node->children) { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1753 | if(dav_xml_isstring(node->children)) { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1754 | 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
|
1755 | ucx_bprintf( |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1756 | buf, |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1757 | "%*s<%s>%.*s</%s>\n", |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1758 | indent, |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1759 | "", |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1760 | node->name, |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1761 | (int)s.length, |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1762 | s.ptr, |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1763 | node->name); |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1764 | } else { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1765 | 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
|
1766 | 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
|
1767 | 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
|
1768 | } |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1769 | } else { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1770 | 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
|
1771 | ucx_buffer_putc(buf, '\n'); |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1772 | } |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1773 | } 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
|
1774 | 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
|
1775 | if(val.length > 0) { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1776 | 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
|
1777 | } |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1778 | } |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1779 | |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1780 | node = node->next; |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1781 | } |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1782 | } |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1783 | |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1784 | char* xml2str(DavXmlNode *node) { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1785 | char *str = malloc(256); |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1786 | 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
|
1787 | 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
|
1788 | ucx_buffer_putc(buf, 0); |
338
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1789 | char *space = buf->space; |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1790 | ucx_buffer_free(buf); |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1791 | return space; |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1792 | } |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1793 | |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1794 | 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
|
1795 | UcxMap *nsmap = ucx_map_new(16); |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1796 | |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1797 | 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
|
1798 | 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
|
1799 | 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
|
1800 | |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
1801 | 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
|
1802 | |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1803 | fprintf(out, "</x0:%s>\n", root); |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
1804 | |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
1805 | // cleanup namespace map |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
1806 | ucx_map_cstr_remove(nsmap, rootns); |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
1807 | ucx_map_free_content(nsmap, free); |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
1808 | ucx_map_free(nsmap); |
338
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1809 | } |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
1810 | |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1811 | |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
107
diff
changeset
|
1812 | /* ---------- config commands ---------- */ |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
107
diff
changeset
|
1813 | |
195
4b7823a58199
fixed add-repository function name
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
194
diff
changeset
|
1814 | int cmd_add_repository(CmdArgs *args) { |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1815 | 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
|
1816 | char *name = assistant_getcfg("name"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1817 | if(!name) { |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1818 | fprintf(stderr, "Abort\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1819 | return -1; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1820 | } |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1821 | if(get_repository(sstr(name))) { |
200
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
1822 | 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
|
1823 | return -1; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
107
diff
changeset
|
1824 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
107
diff
changeset
|
1825 | |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1826 | printf("\nSpecify the repository base url.\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1827 | char *url = assistant_getcfg("url"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1828 | if(!url) { |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1829 | fprintf(stderr, "Abort\n"); |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
107
diff
changeset
|
1830 | return -1; |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
107
diff
changeset
|
1831 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
107
diff
changeset
|
1832 | |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1833 | printf("\nUser for HTTP authentication.\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1834 | char *user = assistant_getoptcfg("user"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1835 | |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1836 | char *password = NULL; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1837 | if(user) { |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1838 | password = assistant_gethiddenoptcfg("password"); |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
107
diff
changeset
|
1839 | } |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1840 | printf("\n"); |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
107
diff
changeset
|
1841 | |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1842 | Repository repo; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1843 | memset(&repo, 0, sizeof(Repository)); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1844 | repo.name = name; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1845 | repo.url = url; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1846 | repo.user = user; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1847 | repo.password = password; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1848 | |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1849 | int ret = 0; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1850 | if(add_repository(&repo)) { |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1851 | fprintf(stderr, "Cannot write config.xml\n"); |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1852 | ret = -1; |
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1853 | } else { |
200
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
1854 | 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
|
1855 | } |
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
107
diff
changeset
|
1856 | |
197
79a866256be4
added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
1857 | free(name); |
79a866256be4
added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
1858 | free(url); |
79a866256be4
added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
1859 | if(user) { |
79a866256be4
added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
1860 | free(user); |
79a866256be4
added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
1861 | } |
79a866256be4
added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
1862 | if(password) { |
79a866256be4
added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
1863 | free(password); |
79a866256be4
added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
1864 | } |
79a866256be4
added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
196
diff
changeset
|
1865 | |
194
1950f483d3c4
added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1866 | return ret; |
119
451607eeff05
added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
107
diff
changeset
|
1867 | } |