dav/main.c

Sun, 31 Jan 2016 20:39:29 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 31 Jan 2016 20:39:29 +0100
changeset 188
753c8fcde12f
parent 187
38295f2fa231
child 191
0e45b04236a7
permissions
-rw-r--r--

added version info

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
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
34 #include <unistd.h>
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
35 #include <time.h>
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
36 #include <sys/types.h>
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
37 #include <ucx/string.h>
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
38 #include <ucx/utils.h>
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
39 #include <dirent.h>
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
40
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
41 #include <libidav/utils.h>
40
a95ee94b9204 supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 38
diff changeset
42 #include <libidav/crypto.h>
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
43 #include <libidav/session.h>
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
44 #include "config.h"
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
45 #include "main.h"
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
46
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
47 static DavContext *ctx;
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
48
142
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
49 static int printxmlerror = 1;
46
0542668d0f26 added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 45
diff changeset
50 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
51 if(printxmlerror) {
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
52 va_list ap;
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
53 va_start(ap, msg);
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
54 vfprintf(stderr, msg, ap);
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
55 va_end(ap);
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
56 }
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
57 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
58
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
59 //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
60 #include <libidav/davqlparser.h>
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 119
diff changeset
61 #include <libidav/davqlexec.h>
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
62 void test() {
123
806c4dccf2ae added where clause compiler prototype
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 119
diff changeset
63
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
64 }
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
65
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
66 int main(int argc, char **argv) {
8
4503498deb22 creates a .dav dir if it doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 5
diff changeset
67 xmlGenericErrorFunc fnc = xmlerrorfnc;
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
68 initGenericErrorDefaultFunc(&fnc);
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
69 ctx = dav_context_new();
147
458a8dc68048 added password based keys and fixed crash when keys are missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 146
diff changeset
70 ctx->key_input = util_key_input;
40
a95ee94b9204 supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 38
diff changeset
71 load_config(ctx);
142
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
72 printxmlerror = 0;
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
73 #ifdef DO_THE_TEST
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
74 test();
107
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 105
diff changeset
75 return 0;
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
76 #endif
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
77
36
c8755c87ce7f added proxy config
Mike Becker <universe@uap-core.de>
parents: 35
diff changeset
78 memcpy(ctx->http_proxy, get_http_proxy(), sizeof(Proxy));
c8755c87ce7f added proxy config
Mike Becker <universe@uap-core.de>
parents: 35
diff changeset
79 memcpy(ctx->https_proxy, get_https_proxy(), sizeof(Proxy));
c8755c87ce7f added proxy config
Mike Becker <universe@uap-core.de>
parents: 35
diff changeset
80
34
1b87b3b1921e removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 33
diff changeset
81 if(argc < 2) {
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
82 fprintf(stderr, "Missing command\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
83 print_usage(argv[0]);
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
84 return -1;
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
85 }
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
86
34
1b87b3b1921e removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 33
diff changeset
87 char *cmd = argv[1];
1b87b3b1921e removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 33
diff changeset
88 CmdArgs *args = cmd_parse_args(argc - 2, argv + 2);
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
89 if(!args) {
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
90 print_usage(argv[0]);
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
91 cmd_args_free(args);
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
92 return -1;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
93 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
94
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
95 int ret = -1;
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
96 if(!strcasecmp(cmd, "list") || !strcasecmp(cmd, "ls")) {
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
97 ret = cmd_list(args);
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
98 } else if(!strcasecmp(cmd, "get")) {
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
99 ret = cmd_get(args);
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
100 } else if(!strcasecmp(cmd, "put")) {
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
101 ret = cmd_put(args);
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
102 } else if(
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
103 !strcasecmp(cmd, "remove") ||
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
104 !strcasecmp(cmd, "rm") ||
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
105 !strcasecmp(cmd, "delete"))
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
106 {
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
107 ret = cmd_remove(args);
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
108 } else if(!strcasecmp(cmd, "mkdir") || !strcasecmp(cmd, "mkcol")) {
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
109 ret = cmd_mkdir(args);
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
110 } else if(!strcasecmp(cmd, "copy") || !strcasecmp(cmd, "cp")) {
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
111 ret = cmd_move(args, true);
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
112 } else if(!strcasecmp(cmd, "move") || !strcasecmp(cmd, "mv")) {
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
113 ret = cmd_move(args, false);
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
114 } else if(!strcasecmp(cmd, "date")) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
115 ret = cmd_date(args);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
116 } else if(!strcasecmp(cmd, "set-property")) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
117 ret = cmd_set_property(args);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
118 } else if(!strcasecmp(cmd, "get-property")) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
119 ret = cmd_get_property(args);
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
120 } else if(!strcasecmp(cmd, "info")) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
121 ret = cmd_info(args);
188
753c8fcde12f added version info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
122 } else if(!strcasecmp(cmd, "version") || !strcasecmp(cmd, "-version") || !strcasecmp(cmd, "--version")) {
753c8fcde12f added version info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
123 #ifdef DEBUG
753c8fcde12f added version info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
124 fprintf(stderr, "dav %s unstable\n", DAV_VERSION);
753c8fcde12f added version info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
125 #else
753c8fcde12f added version info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
126 fprintf(stderr, "dav %s\n", DAV_VERSION);
753c8fcde12f added version info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
127 #endif
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
128 } else {
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
129 print_usage(argv[0]);
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
130 }
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
131
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
132 dav_context_destroy(ctx);
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
133 cmd_args_free(args);
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
134 free_config();
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
135 xmlCleanupParser();
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
136 curl_global_cleanup();
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
137
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
138 return ret;
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
139 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
140
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
141 void print_usage(char *cmd) {
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
142 fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd);
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
143 fprintf(stderr, "Commands:\n");
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
144 fprintf(stderr, " list [-altpcR] [-u <date>] <url>\n");
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
145 fprintf(
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
146 stderr,
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
147 " get [-pcR] [-o <file>] [-u <date>] <url>\n");
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
148 fprintf(stderr, " put [-pcR] [-k <key>] <url> <file>\n");
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
149 fprintf(stderr, " mkdir [-pc] [-k <key>] <url>\n");
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
150 fprintf(stderr, " remove [-pc] <url>\n");
188
753c8fcde12f added version info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
151 fprintf(stderr, " copy [-pcO] <url> <url>\n");
753c8fcde12f added version info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
152 fprintf(stderr, " move [-pcO] <url> <url>\n");
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
153 fprintf(
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
154 stderr,
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
155 " get-property [-pc] [-n <uri>] <url> <property>\n");
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
156 fprintf(
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
157 stderr,
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
158 " set-property [-pc] [-n <uri>] <url> <property> [value]\n");
100
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
159 fprintf(stderr, " info [-pc] <url>\n");
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
160 fprintf(stderr, " date [url]\n");
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
161 fprintf(stderr, "\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
162 fprintf(stderr, "Options:\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
163 fprintf(stderr,
100
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
164 " -k <key> Key to use for encryption\n");
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
165 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
166 fprintf(stderr, " -c Enable full encryption\n");
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
167 fprintf(stderr,
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
168 " -R "
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
169 "Recursively do the operation for all children\n");
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
170 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
171 fprintf(
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
172 stderr,
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
173 " -u <date> "
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
174 "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
175 fprintf(stderr, " -a show all files\n");
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
176 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
177 fprintf(stderr, " -t print content type\n");
182
ca07f14f7bfe added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 181
diff changeset
178 fprintf(stderr, " -O override resources\n");
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
179 fprintf(stderr, " -n <uri> specify namespace uri\n");
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
180 fprintf(stderr, " -v verbose output\n");
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
181 fprintf(stderr, "\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
182 fprintf(stderr,
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
183 "Instead of an url you can pass a repository name "
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
184 "with an optional path:\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
185 fprintf(stderr, " <repository>/path/\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
186 fprintf(stderr, "\n");
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
187 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
188
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
189 int request_auth(Repository *repo, DavSession *sn) {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
190 static int login = 0;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
191 if(login) {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
192 return 0;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
193 }
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
194
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
195 char *user = NULL;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
196 char ubuf[256];
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
197 if(repo->user) {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
198 user = repo->user;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
199 } else {
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 147
diff changeset
200 fprintf(stderr, "User: ");
146
e48048334602 hidden password input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 144
diff changeset
201 fflush(stderr);
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
202 user = fgets(ubuf, 256, stdin);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
203 }
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
204
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 147
diff changeset
205 char *password = util_password_input("Password: ");
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
206
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
207 size_t ulen = strlen(user);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
208 if(user[ulen-1] == '\n') {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
209 user[ulen-1] = '\0';
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
210 }
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
211
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
212 dav_session_set_auth(sn, user, password);
146
e48048334602 hidden password input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 144
diff changeset
213 free(password);
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
214 login = 1;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
215 return 1;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
216 }
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
217
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
218 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
219 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
220 *path = NULL;
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
221
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
222 int s;
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
223 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
224 s = 7;
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
225 } 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
226 s = 8;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
227 } else {
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
228 s = 1;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
229 }
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
230
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
231 sstr_t r = sstr(url);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
232 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
233 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
234 char c = url[i];
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
235 if(c == '/') {
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
236 r = sstrn(url, i);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
237 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
238 if(p.length == 0) {
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
239 p = sstrn("/", 1);
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
240 }
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
241 break;
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
242 }
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
243 }
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
244
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
245 Repository *repo = get_repository(r);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
246 if(repo) {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
247 *path = sstrdup(p).ptr;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
248 } else {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
249 repo = calloc(1, sizeof(Repository));
70
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
250 repo->name = strdup("");
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
251 repo->decrypt_content = true;
187
38295f2fa231 added missing repo authmethods initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 186
diff changeset
252 repo->authmethods = CURLAUTH_BASIC;
70
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
253 if(url[ulen-1] == '/') {
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
254 repo->url = strdup(url);
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
255 *path = strdup("/");
100
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
256 } else if (strchr(url, '/')) {
70
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
257 repo->url = util_parent_path(url);
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
258 // TODO: check/fix
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
259 *path = strdup(util_resource_name(url)-1);
100
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
260 } else {
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
261 repo->url = strdup(url);
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
262 *path = strdup("/");
70
88092b88ec00 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 68
diff changeset
263 }
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
264 }
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 return repo;
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
267 }
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
268
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
269 void print_resource_error(DavSession *sn, char *path) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
270 char *res_url = util_concat_path(sn->base_url, path);
13
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
271 switch(sn->error) {
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
272 default: {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
273 fprintf(stderr, "Operation failed for resource %s.\n", res_url);
100
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
274 if(sn->errorstr) {
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
275 fprintf(stderr, "%s\n", sn->errorstr);
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
276 }
13
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
277 break;
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
278 }
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
279 case DAV_NOT_FOUND: {
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
280 fprintf(stderr, "Resource %s not found.\n", res_url);
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
281 break;
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
282 }
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
283 case DAV_UNAUTHORIZED: {
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
284 fprintf(stderr, "Authentication required.\n");
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
285 break;
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
286 }
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
287 case DAV_FORBIDDEN: {
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
288 fprintf(stderr, "Access forbidden.\n");
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
289 break;
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
290 }
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
291 case DAV_METHOD_NOT_ALLOWED: {
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
292 fprintf(stderr, "Method not allowed.\n");
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
293 }
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
294 case DAV_CONFLICT: {
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
295 fprintf(
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
296 stderr,
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
297 "Missing intermediate collections for resource %s.\n",
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
298 res_url);
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
299 }
100
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
300 case DAV_UNSUPPORTED_PROTOCOL: {
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
301 fprintf(stderr, "Unsupported protocol.\n");
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
302 if(sn->errorstr) {
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
303 fprintf(stderr, "%s\n", sn->errorstr);
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
304 }
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
305 break;
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
306 }
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
307 case DAV_COULDNT_RESOLVE_PROXY: {
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
308 fprintf(stderr, "Cannot resolve proxy host.\n");
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
309 break;
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
310 }
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
311 case DAV_COULDNT_RESOLVE_HOST: {
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
312 fprintf(stderr, "Cannot resolve host name.\n");
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
313 break;
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
314 }
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
315 case DAV_COULDNT_CONNECT: {
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
316 fprintf(stderr, "Cannot connect to host.\n");
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
317 break;
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
318 }
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
319 case DAV_TIMEOUT: {
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
320 fprintf(stderr, "Operation timed out.\n");
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
321 break;
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
322 }
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
323 case DAV_SSL_ERROR: {
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
324 fprintf(stderr, "SSL error.\n");
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
325 if(sn->errorstr) {
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
326 fprintf(stderr, "%s\n", sn->errorstr);
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
327 }
f4127c4d1018 improved error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
328 }
13
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
329 }
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
330 free(res_url);
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
331 }
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
332
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
333 int set_session_config(DavSession *sn, CmdArgs *a) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
334 char *plain = cmd_getoption(a, "plain");
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
335 char *crypt = cmd_getoption(a, "crypt");
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 if(plain && crypt) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
338 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
339 return 1;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
340 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
341
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
342 if (plain) {
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
343 sn->flags &= ~DAV_SESSION_FULL_ENCRYPTION;
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
344 } else if(crypt) {
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
345 sn->flags |= DAV_SESSION_FULL_ENCRYPTION;
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
346 }
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
347
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
348 if (cmd_getoption(a, "verbose")) {
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
349 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
350 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
351 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
352
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
353 return 0;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
354 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
355
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
356 static DavSession* connect_to_repo(Repository *repo) {
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
357 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
358 sn->flags = get_repository_flags(repo);
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
359 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
360 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
361 curl_easy_setopt(sn->handle, CURLOPT_SSLVERSION, repo->ssl_version);
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
362 return sn;
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
363 }
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
364
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
365 int cmd_list(CmdArgs *a) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
366 if(a->argc != 1) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
367 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
368 return -1;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
369 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
370
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
371 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
372 char *path = NULL;
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
373 Repository *repo = url2repo(url, &path);
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
374 DavSession *sn = connect_to_repo(repo);
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
375
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
376 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
377 return -1;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
378 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
379
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
380 char *update = cmd_getoption(a, "update");
136
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
381 time_t t = -1;
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
382 if(update) {
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
383 t = util_parse_lastmodified(update);
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
384 }
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
385
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
386 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
387 int ret = -1;
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
388 DavResource *ls;
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
389 while(ret != 0) {
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
390 ls = dav_query(
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
391 sn,
139
c6424aebcf5e implemented davql order by
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 138
diff changeset
392 "select `idav:crypto-name`,`idav:crypto-key` from %s with depth = %d where lastmodified > %t order by iscollection desc, name",
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
393 path,
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
394 depth,
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
395 t);
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
396
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
397 if(!ls) {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
398 if(sn->error == DAV_UNAUTHORIZED) {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
399 if(request_auth(repo, sn)) {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
400 continue;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
401 }
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
402 }
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
403 print_resource_error(sn, path);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
404 break;
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
405 }
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
406
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
407 // parameters
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
408 void (*print_func)(DavResource*, CmdArgs *);
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
409 if(cmd_getoption(a, "list")) {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
410 print_func = ls_print_list_elm;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
411 } else {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
412 print_func = ls_print_elm;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
413 }
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
414
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
415 DavResource *child = ls->children;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
416 while(child) {
138
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
417 print_func(child, a);
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
418 child = child->next;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
419 }
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
420
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
421 // leave loop
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
422 ret = 0;
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
423 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
424
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
425 free(path);
40
a95ee94b9204 supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 38
diff changeset
426 //free(base);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
427
144
c2c02c9b3be4 dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 143
diff changeset
428 dav_session_destroy(sn);
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
429
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
430 return ret;
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
431 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
432
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
433 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
434 struct tm t;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
435 struct tm n;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
436 time_t now = time(NULL);
32
c9d37bb97ea8 mingw support
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
437 #ifdef _WIN32
c9d37bb97ea8 mingw support
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
438 memcpy(&t, localtime(&tm), sizeof(struct tm));
c9d37bb97ea8 mingw support
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
439 memcpy(&n, localtime(&now), sizeof(struct tm));
c9d37bb97ea8 mingw support
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
440 #else
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
441 localtime_r(&tm, &t);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
442 localtime_r(&now, &n);
32
c9d37bb97ea8 mingw support
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
443 #endif /* _WIN32 */
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
444 char *str = malloc(16);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
445 if(t.tm_year == n.tm_year) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
446 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
447 } else {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
448 strftime(str, 16, "%b %d %Y", &t);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
449 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
450 return str;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
451 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
452
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
453 static char* ls_size_str(DavResource *res) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
454 char *str = malloc(16);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
455 uint64_t size = res->contentlength;
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
456
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
457 if(res->iscollection) {
165
b66bed169fc3 fixed zero-length format string in ls_size_str
Mike Becker <universe@uap-core.de>
parents: 154
diff changeset
458 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
459 } else if(size < 0x400) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
460 snprintf(str, 16, "%" PRIu64 " bytes", size);
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
461 } else if(size < 0x100000) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
462 float s = (float)size/0x400;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
463 int diff = (s*100 - (int)s*100);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
464 if(diff > 90) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
465 diff = 0;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
466 s += 0.10f;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
467 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
468 if(size < 0x2800 && diff != 0) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
469 // size < 10 KiB
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
470 snprintf(str, 16, "%.1f KiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
471 } else {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
472 snprintf(str, 16, "%.0f KiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
473 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
474 } else if(size < 0x40000000) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
475 float s = (float)size/0x100000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
476 int diff = (s*100 - (int)s*100);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
477 if(diff > 90) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
478 diff = 0;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
479 s += 0.10f;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
480 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
481 if(size < 0xa00000 && diff != 0) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
482 // size < 10 MiB
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
483 snprintf(str, 16, "%.1f MiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
484 } else {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
485 size /= 0x100000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
486 snprintf(str, 16, "%.0f MiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
487 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
488 } else if(size < 0x1000000000ULL) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
489 float s = (float)size/0x40000000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
490 int diff = (s*100 - (int)s*100);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
491 if(diff > 90) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
492 diff = 0;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
493 s += 0.10f;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
494 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
495 if(size < 0x280000000 && diff != 0) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
496 // size < 10 GiB
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
497 snprintf(str, 16, "%.1f GiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
498 } else {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
499 size /= 0x40000000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
500 snprintf(str, 16, "%.0f GiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
501 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
502 } else {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
503 size /= 1024;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
504 float s = (float)size/0x40000000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
505 int diff = (s*100 - (int)s*100);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
506 if(diff > 90) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
507 diff = 0;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
508 s += 0.10f;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
509 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
510 if(size < 0x280000000 && diff != 0) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
511 // size < 10 TiB
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
512 snprintf(str, 16, "%.1f TiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
513 } else {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
514 size /= 0x40000000;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
515 snprintf(str, 16, "%.0f TiB", s);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
516 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
517 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
518 return str;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
519 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
520
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
521 void ls_print_list_elm(DavResource *res, CmdArgs *a) {
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
522 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
523 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
524 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
525 return;
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
526 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
527
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
528 char flags[16];
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
529 memset(flags, '-', 15);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
530 flags[2] = '\0';
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
531
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
532 int type_width = 0;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
533 char *type = res->contenttype;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
534
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
535 if(res->iscollection) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
536 flags[0] = 'd';
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
537 type = "";
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
538 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
539 char *keyprop = dav_get_property_ns(
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
540 res,
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
541 DAV_NS,
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
542 "crypto-key");
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
543 if(keyprop) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
544 flags[1] = 'c';
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
545 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
546
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
547 if(cmd_getoption(a, "type")) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
548 type_width = 20;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
549 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
550 if(type == NULL || type_width == 0) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
551 type = "";
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
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
554 char *date = ls_date_str(res->lastmodified);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
555 char *size = ls_size_str(res);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
556 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
557 printf(
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
558 "%s %*s %10s %12s %s\n",
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
559 flags,
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
560 type_width, type,
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
561 size,
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
562 date,
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
563 name);
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
564 free(date);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
565 free(size);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
566
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
567 if(recursive) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
568 DavResource *child = res->children;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
569 while(child) {
138
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
570 //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
571 if(child->name[0] != '.' || show_all) {
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
572 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
573 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
574 child = child->next;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
575 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
576 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
577 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
578
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
579 void ls_print_elm(DavResource *res, CmdArgs *a) {
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
580 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
581 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
582 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
583 return;
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
584 }
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
585
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
586 char *name = recursive ? res->path+1 : res->name;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
587 printf("%s\n", name);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
588 if(recursive) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
589 DavResource *child = res->children;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
590 while(child) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
591 ls_print_elm(child, a);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
592 child = child->next;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
593 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
594 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
595 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
596
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
597 int cmd_get(CmdArgs *a) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
598 if(a->argc != 1) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
599 // 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
600 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
601 return -1;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
602 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
603
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
604 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
605 char *path = NULL;
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
606 Repository *repo = url2repo(url, &path);
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
607 DavSession *sn = connect_to_repo(repo);
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
608
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
609 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
610 return -1;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
611 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
612
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
613 char *update = cmd_getoption(a, "update");
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
614 time_t t = -1;
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
615 if(update) {
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
616 t = util_parse_lastmodified(update);
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
617 }
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
618
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
619 int recursive = cmd_getoption(a, "recursive") ? 1 : 0;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
620 DavResource *res;
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
621
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
622 int depth = recursive ? -1 : 1;
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
623 res = dav_query(
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
624 sn,
143
d8b01bed3d83 fixed get command and davql exec
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
625 "select - from %s with depth = %d where lastmodified > %t",
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
626 path,
143
d8b01bed3d83 fixed get command and davql exec
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
627 depth,
d8b01bed3d83 fixed get command and davql exec
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
628 t);
150
37fb12574acd added checksums for encrypted resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 147
diff changeset
629
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
630 if(!res) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
631 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
632 return -1;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
633 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
634 if(!recursive && res->iscollection) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
635 char *res_url = util_concat_path(sn->base_url, path);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
636 fprintf(stderr, "Resource %s is a collection.\n", res_url);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
637 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
638 free(res_url);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
639 return -1;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
640 }
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
641
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
642 /*
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
643 * determine the output file
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
644 * 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
645 */
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
646 char *outfile = cmd_getoption(a, "output");
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
647 if(!outfile) {
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
648 if(res->iscollection) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
649 outfile = "";
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
650 } else {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
651 outfile = res->name;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
652 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
653 } else if(res->iscollection && !strcmp(outfile, "-")) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
654 fprintf(
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
655 stderr,
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
656 "Cannot write output to stdout "
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
657 "if the requested resource is a collection.\n");
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
658 return -1;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
659 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
660
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
661 int ret = get_resource(repo, res, a, outfile);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
662
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
663 free(path);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
664 return ret;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
665 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
666
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
667 int get_resource(Repository *repo, DavResource *res, CmdArgs *a, char *out) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
668 size_t outlen = strlen(out);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
669 // print some status message in recursive mode
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
670 if(cmd_getoption(a, "recursive")) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
671 char *res_url = util_concat_path(res->session->base_url, res->path);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
672 printf("get: %s\n", res_url);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
673 free(res_url);
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
674 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
675
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
676 if(res->iscollection) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
677 // create directory
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
678 if(outlen != 0) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
679 mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
32
c9d37bb97ea8 mingw support
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
680 int ret = util_mkdir(out, mode);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
681 if(ret != 0 && errno != EEXIST) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
682 return 1;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
683 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
684 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
685
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
686 DavResource *child = res->children;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
687 while(child) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
688 char *newout = outlen > 0 ?
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
689 util_concat_path(out, child->name) : child->name;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
690 int ret = get_resource(repo, child, a, newout);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
691 if(outlen > 0) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
692 free(newout);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
693 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
694 if(ret) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
695 return 1;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
696 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
697 child = child->next;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
698 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
699
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
700 return 0;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
701 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
702
72
aac29f2e8030 dav now opens files in binary mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 70
diff changeset
703 FILE *fout = !strcmp(out, "-") ? stdout : fopen(out, "wb");
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
704 if(!fout) {
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
705 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
706 return -1;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
707 }
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
708
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
709 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
710 fclose(fout);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
711 if(ret && strcmp(out, "-")) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
712 unlink(out);
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
713 }
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
714
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
715 return 0;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
716 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
717
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
718 int cmd_put(CmdArgs *a) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
719 if(a->argc != 2) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
720 // 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
721 fprintf(stderr, "Too %s arguments\n", a->argc < 2 ? "few":"many");
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
722 return -1;
3
323689ada09d disabled ssl cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1
diff changeset
723 }
323689ada09d disabled ssl cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1
diff changeset
724
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
725 char *url = a->argv[0];
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
726 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
727 char *path = NULL;
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
728 Repository *repo = url2repo(url, &path);
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
729 DavSession *sn = connect_to_repo(repo);
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
730
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
731 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
732 return -1;
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
733 }
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
734
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
735 // 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
736 char *keyname = cmd_getoption(a, "key");
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
737 if(keyname) {
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
738 DavKey *key = dav_context_get_key(ctx, keyname);
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
739 if(key) {
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
740 sn->key = key;
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
741 } else {
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
742 fprintf(stderr, "Key %s not found!\nAbort.\n", keyname);
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
743 // TODO: free
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
744 return -1;
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
745 }
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
746 }
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
747
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
748 int ret;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
749 if(!strcmp(file, "-")) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
750 FILE *in = stdin;
178
e137883e620f using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
751 ret = put_file(repo, a, sn, path, "stdin", in, 0);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
752 } else {
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
753 ret = put_entry(repo, a, sn, path, file);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
754 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
755
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
756 free(path);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
757 return ret;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
758 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
759
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
760 int put_entry(Repository *repo, CmdArgs *a, DavSession *sn, char *path, char *file) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
761 int recursive = cmd_getoption(a, "recursive") ? 1 : 0;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
762 if(recursive) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
763 printf("put: %s\n", file);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
764 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
765 struct stat s;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
766 if(stat(file, &s)) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
767 perror("stat");
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
768 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
769 return -1;
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
770 }
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
771
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
772 int ret = 0;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
773 if(S_ISDIR(s.st_mode)) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
774 if(!recursive) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
775 return 1;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
776 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
777 DIR *dir = opendir(file);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
778 if(!dir) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
779 // error
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
780 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
781 struct dirent *entry;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
782 while((entry = readdir(dir)) != NULL) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
783 if(!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
784 continue;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
785 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
786 char *entry_file = util_concat_path(file, entry->d_name);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
787 char *entry_path = util_concat_path(path, entry->d_name);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
788 int r = put_entry(repo, a, sn, entry_path, entry_file);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
789 free(entry_path);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
790 free(entry_file);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
791 if(r) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
792 ret = 1;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
793 break;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
794 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
795 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
796 closedir(dir);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
797 } else if(S_ISREG(s.st_mode)) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
798 /*
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
799 * use stdin if the input file is -
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
800 */
72
aac29f2e8030 dav now opens files in binary mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 70
diff changeset
801 FILE *in = fopen(file, "rb");
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
802 if(!in) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
803 fprintf(stderr, "cannot open input file\n");
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
804 return -1;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
805 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
806 char *filename = util_resource_name(file);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
807 //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
808 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
809 //free(path);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
810 fclose(in);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
811 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
812
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
813 return ret;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
814 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
815
178
e137883e620f using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
816 int put_file(Repository *repo, CmdArgs *a, DavSession *sn, char *path, char *name, FILE *in, off_t len) {
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
817 DavResource *res = dav_query(sn, "select - from %s", path);
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
818 if(!res) {
24
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
819 if(sn->error == DAV_NOT_FOUND) {
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
820 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
821 if(dav_create(res)) {
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
822 fprintf(stderr, "Cannot create resource.\n");
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
823 return -1;
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
824 }
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
825 } else {
22
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
826 if(sn->errorstr) {
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
827 fprintf(stderr, "Error: %s\n", sn->errorstr);
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
828 } else {
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
829 fprintf(stderr, "Error\n");
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
830 }
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
831 return -1;
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
832 }
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
833 } else if(res->iscollection) {
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
834 // TODO: free res
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
835 char *newpath = util_concat_path(path, name);
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
836 path = newpath;
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
837 res = dav_resource_new(sn, path);
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
838 free(newpath);
178
e137883e620f using content-length header in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 165
diff changeset
839 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
840 // TODO: free res
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
841 return ret;
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
842 }
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
843
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
844 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
845 if(len > 0 && len < 0x7d000000) {
179
802b48ae791d enable sharepoint put fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 178
diff changeset
846 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
847 }
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
848
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
849 if(dav_store(res)) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
850 print_resource_error(sn, res->path);
13
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
851 fprintf(stderr, "Cannot upload file.\n");
22
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
852 if(sn->errorstr) {
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
853 fprintf(stderr, "%s\n", sn->errorstr);
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
854 }
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
855 return -1;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
856 }
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
857 return 0;
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
858 }
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
859
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
860
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
861 int cmd_remove(CmdArgs *a) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
862 if(a->argc != 1) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
863 // 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
864 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
865 return -1;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
866 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
867
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
868 char *url = a->argv[0];
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
869 char *path = NULL;
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
870 DavSession *sn = connect_to_repo(url2repo(url, &path));
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
871
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
872 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
873 return -1;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
874 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
875
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
876 DavResource *res = dav_resource_new(sn, path);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
877 if(!res) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
878 fprintf(stderr, "error\n");
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
879 return -1;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
880 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
881
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
882 if(dav_delete(res)) {
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
883 print_resource_error(sn, res->path);
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
884 fprintf(stderr, "Cannot delete resource.\n");
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
885 return -1;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
886 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
887
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
888 free(path);
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
889 return 0;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
890 }
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
891
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
892 int cmd_mkdir(CmdArgs *a) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
893 if(a->argc != 1) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
894 // 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
895 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
896 return -1;
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
897 }
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
898
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
899 char *url = a->argv[0];
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
900 char *path = NULL;
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
901 DavSession *sn = connect_to_repo(url2repo(url, &path));
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
902
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
903 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
904 return -1;
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
905 }
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
906
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
907 // 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
908 char *keyname = cmd_getoption(a, "key");
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
909 if(keyname) {
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
910 DavKey *key = dav_context_get_key(ctx, keyname);
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
911 if(key) {
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
912 sn->key = key;
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
913 } else {
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
914 fprintf(stderr, "Key %s not found!\nAbort.\n", keyname);
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
915 // TODO: free
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
916 return -1;
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
917 }
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
918 }
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
919
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
920 DavResource *res = dav_resource_new(sn, path);
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
921 if(!res) {
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
922 fprintf(stderr, "error\n");
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
923 return -1;
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
924 }
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
925 res->iscollection = 1;
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
926
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
927 if(dav_create(res)) {
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
928 print_resource_error(sn, res->path);
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
929 fprintf(stderr, "Cannot create collection.\n");
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
930 return -1;
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
931 }
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
932
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
933 free(path);
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
934 return 0;
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
935 }
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
936
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
937 int cmd_move(CmdArgs *a, int cp) {
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
938 if(a->argc != 2) {
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
939 // 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
940 fprintf(stderr, "Too %s arguments\n", a->argc < 2 ? "few":"many");
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
941 return -1;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
942 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
943
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
944 char *url1 = a->argv[0];
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
945 char *path1 = NULL;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
946 Repository *repo1 = url2repo(url1, &path1);
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
947
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
948 char *url2 = a->argv[1];
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
949 char *path2 = NULL;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
950 Repository *repo2 = url2repo(url2, &path2);
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
951
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
952 DavSession *sn = connect_to_repo(repo1);
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
953 if(set_session_config(sn, a)) {
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
954 return -1;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
955 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
956
182
ca07f14f7bfe added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 181
diff changeset
957 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
958
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
959 if(repo1 == repo2) {
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
960 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
961 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
962 : dav_move_o(res, path2, override);
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
963 if(err) {
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
964 print_resource_error(sn, res->path);
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
965 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
966 return -1;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
967 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
968 } else {
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
969 char *server1 = util_url_base(repo1->url);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
970 char *server2 = util_url_base(repo2->url);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
971 if(!strcmp(server1, server2)) {
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
972 DavSession *sn2 = connect_to_repo(repo2);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
973 if(set_session_config(sn2, a)) {
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
974 return -1;
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
975 }
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
976 DavResource *dest = dav_resource_new(sn2, path2);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
977 char *desthref = dav_resource_get_href(dest);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
978 char *desturl = util_get_url(sn2, desthref);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
979
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
980 DavResource *res = dav_resource_new(sn, path1);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
981 int err = cp ? dav_copyto(res, desturl, override)
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
982 : dav_moveto(res, desturl, override);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
983
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
984 free(desturl);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
985 dav_session_destroy(sn2);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
986
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
987 if(err) {
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
988 print_resource_error(sn, res->path);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
989 fprintf(stderr, "Cannot %s resource.\n", cp ? "copy" : "move");
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
990 return -1;
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
991 }
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
992 } else {
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
993 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
994 return -1;
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
995 }
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
996 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
997
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
998 dav_session_destroy(sn);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
999
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1000 return 0;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1001 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1002
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1003
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1004 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
1005 char **date_str = (char**)data;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1006
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1007 //printf("header: %.*s\n", s*n, header);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1008 sstr_t h = sstrn(header, s*n);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1009 if(sstrprefix(h, S("Date:"))) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1010 sstr_t v = sstrsubs(h, 5);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1011 v = sstrdup(sstrtrim(v));
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1012 *date_str = v.ptr;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1013 }
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1014 return s*n;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1015 }
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1016
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1017 int cmd_date(CmdArgs *a) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1018 if(a->argc < 1) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1019 time_t now = time(NULL);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1020 struct tm *date = gmtime(&now);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1021 char str[32];
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1022 putenv("LC_TIME=C");
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1023 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
1024 fwrite(str, 1, len, stdout);
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1025 } else if (a->argc == 1) {
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1026 char *url = a->argv[0];
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1027 char *path = NULL;
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
1028 DavSession *sn = connect_to_repo(url2repo(url, &path));
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1029
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1030 DavResource *res = dav_resource_new(sn, path);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1031 char *date = NULL;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1032 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
1033 curl_easy_setopt(sn->handle, CURLOPT_WRITEHEADER, &date);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1034 if(dav_exists(res) && date) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1035 printf("%s\n", date);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1036 } else {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1037 return -1;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1038 }
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1039 free(path);
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1040 return 0;
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1041 } else {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1042 fprintf(stderr, "Too many arguments\n");
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1043 return -1;
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1044 }
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1045 return 0;
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1046 }
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1047
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1048 int cmd_get_property(CmdArgs *a) {
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1049 if(a->argc < 2) {
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1050 fprintf(stderr, "Too few arguments\n");
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1051 return -1;
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1052 }
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1053
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1054 char *url = a->argv[0];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1055 char *path = NULL;
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
1056 DavSession *sn = connect_to_repo(url2repo(url, &path));
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1057
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1058 if(set_session_config(sn, a)) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1059 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1060 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1061
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1062 char *namespace = cmd_getoption(a, "namespace");
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1063 char *property = a->argv[1];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1064
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1065 DavResource *res = dav_resource_new(sn, path);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1066 if(dav_load(res)) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1067 print_resource_error(sn, res->path);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1068 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1069 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1070
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1071 char *value = namespace ?
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1072 dav_get_property_ns(res, namespace, property) :
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1073 dav_get_property(res, property);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1074 if(!value) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1075 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
1076 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1077 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1078
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1079 int ret = 0;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1080 if(value) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1081 printf("%s\n", value);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1082 } else {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1083 // TODO: correct error message
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1084 fprintf(stderr, "Error: property not found.\n");
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1085 ret = -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1086 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1087
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1088 free(path);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1089 return ret;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1090 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1091
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1092 int cmd_set_property(CmdArgs *a) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1093 if(a->argc < 2) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1094 fprintf(stderr, "Too few arguments\n");
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1095 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1096 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1097
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1098 char *url = a->argv[0];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1099 char *path = NULL;
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
1100 DavSession *sn = connect_to_repo(url2repo(url, &path));
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1101
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1102 if(set_session_config(sn, a)) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1103 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1104 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1105
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1106 DavResource *res = dav_resource_new(sn, path);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1107 if(!dav_exists(res)) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1108 print_resource_error(sn, res->path);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1109 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1110 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1111
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1112 char *namespace = cmd_getoption(a, "namespace");
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1113 char *property = a->argv[1];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1114 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
1115
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1116 if(namespace) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1117 dav_set_property_ns(res, namespace, property, value);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1118 } else {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1119 dav_set_property(res, property, value);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1120 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1121
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1122 if(dav_store(res)) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1123 print_resource_error(sn, res->path);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1124 fprintf(stderr, "Cannot set property.\n");
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1125 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1126 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1127
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1128 free(path);
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1129 return 0;
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1130 }
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1131
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1132 static int count_children(DavResource *res) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1133 DavResource *child = res->children;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1134 int count = 0;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1135 while(child) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1136 count++;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1137 child = child->next;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1138 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1139 return count;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1140 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1141
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1142 int cmd_info(CmdArgs *a) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1143 if(a->argc < 1) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1144 fprintf(stderr, "Too few arguments\n");
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1145 return -1;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1146 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1147
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1148 char *url = a->argv[0];
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1149 char *path = NULL;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1150 DavSession *sn = connect_to_repo(url2repo(url, &path));
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1151
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1152 if(set_session_config(sn, a)) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1153 return -1;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1154 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1155
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1156 DavResource *res = dav_resource_new(sn, path);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1157 if(!dav_load(res)) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1158 printf("name: %s\n", res->name);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1159 printf("path: %s\n", res->path);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1160
151
a316613205dc fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 150
diff changeset
1161 char *server = util_url_base(sn->base_url);
a316613205dc fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 150
diff changeset
1162 char *url = util_concat_path(server, res->href);
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1163 printf("url: %s\n", url);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1164 free(url);
151
a316613205dc fixed some memory leaks, content verification and dav info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 150
diff changeset
1165 free(server);
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1166
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1167 if(res->iscollection) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1168 printf("type: collection\n");
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1169 printf("size: %d\n", count_children(res));
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1170 } else {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1171 printf("type: resource\n");
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1172 char *len = ls_size_str(res);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1173 printf("size: %s\n", len);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1174 free(len);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1175 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1176
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1177 size_t count = 0;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1178 DavPropName *properties = dav_get_property_names(res, &count);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1179
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1180 char *last_ns = NULL;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1181 for(int i=0;i<count;i++) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1182 DavPropName p = properties[i];
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1183 if(!last_ns || strcmp(last_ns, p.ns)) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1184 printf("\nnamespace: %s\n", p.ns);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1185 last_ns = p.ns;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1186 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1187
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1188 sstr_t value = sstr(dav_get_property_ns(res, p.ns, p.name));
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1189 value = sstrtrim(value);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1190 printf(" %s: %.*s\n", p.name, (int)value.length, value.ptr);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1191 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1192
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1193 dav_session_free(sn, properties);
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
1194 return 0;
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1195 } else {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1196 print_resource_error(sn, res->path);
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1197 return -1;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1198 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1199 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1200
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
1201
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1202 char* stdin2str() {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1203 UcxBuffer *buf = ucx_buffer_new(NULL, 1024, UCX_BUFFER_AUTOEXTEND);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1204 size_t size = ucx_stream_hcopy(stdin, buf, fread, ucx_buffer_write);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1205 if(size == 0) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1206 ucx_buffer_free(buf);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1207 return NULL;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1208 } else {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1209 ucx_buffer_putc(buf, '\0');
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1210 char *str = buf->space;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1211 free(buf);
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1212 return str;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1213 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1214 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1215
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1216 /* ---------- config commands ---------- */
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1217
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1218 static int getkeyvalue(char *arg, char **key, char **value) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1219 // splits a key=value arg
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1220
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1221 *key = NULL;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1222 *value = NULL;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1223 if(!arg && !key && !value) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1224 return -1;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1225 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1226
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1227 int haskey = 0;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1228 size_t len = strlen(arg);
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1229
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1230 if(len < 3) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1231 return -1;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1232 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1233
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1234 int i;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1235 for(i=0;i<len;i++) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1236 if(arg[i] == '=') {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1237 haskey = 1;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1238 break;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1239 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1240 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1241
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1242 if(haskey) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1243 sstr_t k = sstrn(arg, i);
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1244 sstr_t v = sstrn(arg+i + 1, len - i - 1);
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1245 if(k.length > 0 && v.length > 0) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1246 *key = sstrdup(k).ptr;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1247 *value = sstrdup(v).ptr;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1248 return 0;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1249 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1250 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1251
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1252 return -1;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1253 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1254
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1255 void repository_assistent(Repository *repo, int mode) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1256 char *name = NULL;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1257 sstr_t line;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1258
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1259 // name
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1260 while(!name) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1261 if(repo->name) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1262 printf("repository name [%s]: ", repo->name);
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1263 } else {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1264 printf("repository name: ");
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1265 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1266 fflush(stdout);
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1267
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1268 line = util_readline(stdin);
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1269 if(line.length == 0 && repo->name) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1270 break;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1271 } else {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1272 name = line.ptr;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1273 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1274 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1275 if(name) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1276 if(repo->name) {
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1277 free(repo->name);
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1278 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1279 repo->name = name;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1280 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1281
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1282 // TODO
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1283
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1284 return;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
1285 }

mercurial