dav/main.c

Fri, 19 Dec 2025 17:53:18 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Fri, 19 Dec 2025 17:53:18 +0100
branch
dav-2
changeset 891
4d58cbcc9efa
parent 889
42cdbf9bbd49
permissions
-rw-r--r--

update ucx

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 *
611
a7c48e0dca88 implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 609
diff changeset
4 * Copyright 2019 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
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
29 #include <assert.h>
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30 #include <stdio.h>
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
31 #include <stdlib.h>
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
32 #include <string.h>
182
ca07f14f7bfe added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 181
diff changeset
33 #include <stdbool.h>
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
34 #include <errno.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>
715
f4da6141e233 removes win32 support for dav edit
Mike Becker <universe@uap-core.de>
parents: 712
diff changeset
37 #ifndef _WIN32
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
38 #include <sys/wait.h>
789
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
39 #include <unistd.h>
715
f4da6141e233 removes win32 support for dav edit
Mike Becker <universe@uap-core.de>
parents: 712
diff changeset
40 #endif
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
41 #include <cx/string.h>
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
42 #include <cx/printf.h>
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
43 #include <cx/hash_map.h>
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
44 #include <cx/linked_list.h>
886
da79af4baec8 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 883
diff changeset
45 #include <cx/streams.h>
789
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
46
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
47
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
48 #include <libidav/utils.h>
40
a95ee94b9204 supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 38
diff changeset
49 #include <libidav/crypto.h>
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
50 #include <libidav/session.h>
361
b6f2462ee055 adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 355
diff changeset
51 #include <libidav/xml.h>
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
52 #include "config.h"
191
0e45b04236a7 more specific error messages in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
53 #include "error.h"
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
54 #include "assistant.h"
410
0b9bea2d7283 adds file io abstraction functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
55 #include "system.h"
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
56 #include "finfo.h"
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
57 #include "main.h"
833
8aa2dc02d9b7 fix build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 827
diff changeset
58 #include "connect.h"
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
59
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
60 static DavContext *ctx;
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
61
142
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
62 static int printxmlerror = 1;
46
0542668d0f26 added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 45
diff changeset
63 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
64 if(printxmlerror) {
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
65 va_list ap;
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
66 va_start(ap, msg);
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
67 vfprintf(stderr, msg, ap);
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
68 va_end(ap);
0c0ccb7f71ba startup doesn't override broken config.xml anymore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 139
diff changeset
69 }
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
70 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
71
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
72 //define DO_THE_TEST
363
e9ed8e130ccf adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 361
diff changeset
73 //include <libidav/davqlparser.h>
e9ed8e130ccf adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 361
diff changeset
74 //include <libidav/davqlexec.h>
e9ed8e130ccf adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 361
diff changeset
75 //include "tags.h"
587
3c917df041b8 add func for creating the content of crypto-prop properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 540
diff changeset
76 //include <libidav/resource.h>
363
e9ed8e130ccf adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 361
diff changeset
77
728
35a421f441d5 add stream API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
78 void test(CmdArgs *a) {
363
e9ed8e130ccf adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 361
diff changeset
79
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
80 }
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
81
687
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
82 int dav_main(int argc, char **argv);
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
83
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
84 #ifdef _WIN32
789
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
85
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
86 #define strcasecmp _stricmp
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
87
687
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
88 static char* wchar2utf8(const wchar_t *wstr, size_t wlen) {
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
89 size_t maxlen = wlen * 4;
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
90 char *ret = malloc(maxlen + 1);
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
91 int ret_len = WideCharToMultiByte(
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
92 CP_UTF8,
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
93 0,
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
94 wstr,
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
95 wlen,
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
96 ret,
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
97 maxlen,
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
98 NULL,
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
99 NULL);
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
100 ret[ret_len] = 0;
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
101 return ret;
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
102 }
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
103
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
104 int wmain(int argc, wchar_t **argv) {
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
105 char **argv_utf8 = calloc(argc, sizeof(char*));
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
106 for(int i=0;i<argc;i++) {
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
107 argv_utf8[i] = wchar2utf8(argv[i], wcslen(argv[i]));
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
108 }
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
109
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
110 int ret = dav_main(argc, argv_utf8);
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
111
728
35a421f441d5 add stream API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
112
687
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
113 for(int i=0;i<argc;i++) {
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
114 free(argv_utf8[i]);
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
115 }
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
116 free(argv_utf8);
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
117
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
118 return ret;
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
119 }
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
120 #else
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
121 int main(int argc, char **argv) {
687
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
122 return dav_main(argc, argv);
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
123 }
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
124 #endif
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
125
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
126
9922a349a61a add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 684
diff changeset
127 int dav_main(int argc, char **argv) {
34
1b87b3b1921e removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 33
diff changeset
128 if(argc < 2) {
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
129 fprintf(stderr, "Missing command\n");
889
42cdbf9bbd49 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 886
diff changeset
130 print_usage(argv[0]);
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
131 return -1;
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
132 }
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
133
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
134 putenv("LC_TIME=C");
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
135
34
1b87b3b1921e removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 33
diff changeset
136 char *cmd = argv[1];
1b87b3b1921e removed debug code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 33
diff changeset
137 CmdArgs *args = cmd_parse_args(argc - 2, argv + 2);
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
138 if(!args) {
889
42cdbf9bbd49 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 886
diff changeset
139 print_usage(argv[0]);
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
140 return -1;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
141 }
833
8aa2dc02d9b7 fix build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 827
diff changeset
142 if(cmd_getoption(args, "noinput")) {
8aa2dc02d9b7 fix build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 827
diff changeset
143 pwdstore_set_pwinput_func(NULL, NULL);
8aa2dc02d9b7 fix build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 827
diff changeset
144 }
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
145
611
a7c48e0dca88 implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 609
diff changeset
146 sys_init();
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
147 xmlGenericErrorFunc fnc = xmlerrorfnc;
856
0f1349ffa719 remove usage of deprecated libxml2 and curl functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
148 //initGenericErrorDefaultFunc(&fnc);
0f1349ffa719 remove usage of deprecated libxml2 and curl functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 852
diff changeset
149 xmlSetGenericErrorFunc(NULL, fnc);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
150 ctx = dav_context_new();
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
151 dav_add_namespace(ctx, "apache", "http://apache.org/dav/props/");
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
152 int cfgret = load_config(ctx);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
153 int ret = EXIT_FAILURE;
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
154 printxmlerror = 0;
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
155 #ifdef DO_THE_TEST
728
35a421f441d5 add stream API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 726
diff changeset
156 test(args);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
157 return 0;
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
158 #endif
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
159 if(!strcmp(cmd, "check") || !strcmp(cmd, "check-config")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
160 if(!cfgret) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
161 fprintf(stdout, "Configuration OK.\n");
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
162 ret = EXIT_SUCCESS;
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
163 } else {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
164 /* no output, the warnings are written by load_config */
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
165 ret = EXIT_FAILURE;
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
166 }
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
167 } else if(!cfgret) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
168 if(!strcasecmp(cmd, "list") || !strcasecmp(cmd, "ls")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
169 ret = cmd_list(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
170 } else if(!strcasecmp(cmd, "get")) {
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
171 ret = cmd_get(args, FALSE);
511
59a216f8d4e8 adds command alias 'cat' for 'get -o -'
Mike Becker <universe@uap-core.de>
parents: 510
diff changeset
172 } else if(!strcasecmp(cmd, "cat")) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
173 cxMapPut(args->options, cx_hash_key_str("output"), "-");
511
59a216f8d4e8 adds command alias 'cat' for 'get -o -'
Mike Becker <universe@uap-core.de>
parents: 510
diff changeset
174 ret = cmd_get(args, FALSE);
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
175 } else if(!strcasecmp(cmd, "edit")) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
176 ret = cmd_edit(args);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
177 } else if(!strcasecmp(cmd, "put")) {
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
178 ret = cmd_put(args, FALSE);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
179 } else if(
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
180 !strcasecmp(cmd, "remove") ||
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
181 !strcasecmp(cmd, "rm") ||
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
182 !strcasecmp(cmd, "delete"))
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
183 {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
184 ret = cmd_remove(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
185 } else if(!strcasecmp(cmd, "mkdir") || !strcasecmp(cmd, "mkcol")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
186 ret = cmd_mkdir(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
187 } else if(!strcasecmp(cmd, "copy") || !strcasecmp(cmd, "cp")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
188 ret = cmd_move(args, true);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
189 } else if(!strcasecmp(cmd, "move") || !strcasecmp(cmd, "mv")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
190 ret = cmd_move(args, false);
498
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
191 } else if(!strcasecmp(cmd, "rename")) {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
192 ret = cmd_rename(args);
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
193 } else if(!strcasecmp(cmd, "export")) {
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
194 ret = cmd_get(args, TRUE);
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
195 } else if(!strcasecmp(cmd, "import")) {
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
196 ret = cmd_put(args, TRUE);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
197 } else if(!strcasecmp(cmd, "date")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
198 ret = cmd_date(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
199 } else if(!strcasecmp(cmd, "set-property")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
200 ret = cmd_set_property(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
201 } else if(!strcasecmp(cmd, "get-property")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
202 ret = cmd_get_property(args);
304
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
203 } else if(!strcasecmp(cmd, "remove-property")) {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
204 ret = cmd_remove_property(args);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
205 } else if(!strcasecmp(cmd, "lock")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
206 ret = cmd_lock(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
207 } else if(!strcasecmp(cmd, "unlock")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
208 ret = cmd_unlock(args);
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
209 } else if(!strcasecmp(cmd, "info")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
210 ret = cmd_info(args);
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
211 } else if(!strcasecmp(cmd, "checkout")) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
212 ret = cmd_checkout(args);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
213 } else if(!strcasecmp(cmd, "checkin")) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
214 ret = cmd_checkin(args);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
215 } else if(!strcasecmp(cmd, "uncheckout")) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
216 ret = cmd_uncheckout(args);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
217 } else if(!strcasecmp(cmd, "versioncontrol")) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
218 ret = cmd_versioncontrol(args);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
219 } else if(!strcasecmp(cmd, "list-versions") || !strcasecmp(cmd, "lsv")) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
220 ret = cmd_list_versions(args);
256
54433cb371df implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents: 252
diff changeset
221 } else if(!strcasecmp(cmd, "add-repository")
54433cb371df implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents: 252
diff changeset
222 || !strcasecmp(cmd, "add-repo")) {
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
223 ret = cmd_add_repository(args);
398
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
224 } else if(!strcasecmp(cmd, "remove-repository")
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
225 || !strcasecmp(cmd, "remove-repo")
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
226 || !strcasecmp(cmd, "rm-repo")) {
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
227 ret = cmd_remove_repository(args);
256
54433cb371df implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents: 252
diff changeset
228 } else if(!strcasecmp(cmd, "list-repositories")
54433cb371df implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents: 252
diff changeset
229 || !strcasecmp(cmd, "list-repos")) {
798
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
230 ret = cmd_list_repositories();
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
231 } else if(!strcasecmp(cmd, "repository-url")
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
232 || !strcasecmp(cmd, "repo-url")) {
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
233 ret = cmd_repository_url(args);
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
234 } else if(!strcasecmp(cmd, "add-user")) {
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
235 ret = cmd_add_user(args);
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
236 } else if(!strcasecmp(cmd, "list-users")) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
237 ret = cmd_list_users(args);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
238 } else if(!strcasecmp(cmd, "remove-user")) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
239 ret = cmd_remove_user(args);
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
240 } else if(!strcasecmp(cmd, "edit-user")) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
241 ret = cmd_edit_user(args);
733
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
242 } else if(!strcasecmp(cmd, "set-master-password") || !strcasecmp(cmd, "set-master-pw")) {
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
243 ret = cmd_set_master_password(args);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
244 } else if(!strcasecmp(cmd, "version") || !strcasecmp(cmd, "-version")
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
245 || !strcasecmp(cmd, "--version")) {
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
246 fprintf(stderr, "dav %s\n", DAV_VERSION);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
247 } else if(!strcasecmp(cmd, "complete")) {
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
248 ret = cmd_complete(args);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
249 } else {
889
42cdbf9bbd49 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 886
diff changeset
250 print_usage(argv[0]);
252
6b8e287269fc improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents: 241
diff changeset
251 }
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
252 }
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
253
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
254 dav_context_destroy(ctx);
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
255 cmd_args_free(args);
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
256 free_config();
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
257 xmlCleanupParser();
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
258 curl_global_cleanup();
611
a7c48e0dca88 implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 609
diff changeset
259 sys_uninit();
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
260
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
261 return ret;
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
262 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
263
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
264 static char *cmdusageinfo[] = {
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
265 "list [-altdepcR] [-u <date>] <url>",
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
266 "get [-pcRK] [-o <file>] [-u <date>] [-V <version>] <url>",
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
267 "put [-pcR] [-k <key>] [-L <lock>] <url> <file...>",
720
2b8a65ed6f4c adds support for -L option in dav edit
Mike Becker <universe@uap-core.de>
parents: 719
diff changeset
268 "edit [-pc] [-k <key>] [-V <version>] [-L <lock>] <url>",
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
269 "mkdir [-pc] [-k <key>] [-L <lock>] <url> [file...]",
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
270 "remove [-pc] [-L <lock>] <url> [file...]",
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
271 "copy [-pcO] [-L <lock>] <url> <url>",
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
272 "move [-pcO] [-L <lock>] <url> <url>",
498
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
273 "rename [-pcO] [-L <lock>] <url> <name>",
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
274 "export [-pc] [-o <file>] [-u <date>] <url>",
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
275 "import [-pc] [-k <key>] [-L <lock>] <url> <file>",
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
276 "get-property [-pcx] [-V <version>] [-n <uri>] <url> <property>",
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
277 "set-property [-pcx] [-L <lock>] [-n <uri>] <url> <property> [value]",
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
278 "remove-property [-pc] [-n <uri>] <url> <property>",
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
279 "lock [-pc] [-T timeout] <url>",
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
280 "unlock [-pc] [-L <lock>] <url>",
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
281 "info [-pc] [-V <version>] <url>",
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
282 "date [url]",
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
283 NULL
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
284 };
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
285
384
8bfde5687890 fixes definite chance of a memory leak in cmd_unlock() + marks a further possible source of memory leaks
Mike Becker <universe@uap-core.de>
parents: 383
diff changeset
286 char* find_usage_str(const char *cmd) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
287 cxstring c = cx_str(cmd);
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
288 for(int i=0;;i++) {
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
289 char *str = cmdusageinfo[i];
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
290 if(!str) {
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
291 break;
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
292 }
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
293 cxstring u = cx_str(str);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
294 if(cx_strprefix(u, c)) {
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
295 return str;
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
296 }
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
297 }
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
298 return NULL;
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
299 }
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
300
889
42cdbf9bbd49 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 886
diff changeset
301 void print_usage(char *cmd) {
380
8a0c727aa409 adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 376
diff changeset
302 fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd);
8a0c727aa409 adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 376
diff changeset
303
8a0c727aa409 adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 376
diff changeset
304 fprintf(stderr, "Commands:\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
305 for(int i=0;;i++) {
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
306 char *str = cmdusageinfo[i];
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
307 if(!str) {
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
308 break;
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
309 }
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
310 fprintf(stderr, " %s\n", str);
511
59a216f8d4e8 adds command alias 'cat' for 'get -o -'
Mike Becker <universe@uap-core.de>
parents: 510
diff changeset
311 }
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
312 fprintf(stderr, "Options:\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
313 fprintf(stderr,
703
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
314 " -k <key> Key to use for encryption\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
315 fprintf(stderr, " -p Don't encrypt or decrypt files\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
316 fprintf(stderr, " -c Enable full encryption\n");
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
317 fprintf(stderr,
703
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
318 " -R "
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
319 "Recursively do the operation for all children\n");
703
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
320 fprintf(stderr, " -K Keep already present files\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
321 fprintf(stderr, " -o <file> Write output to file (use '-' for stdout)\n");
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
322 fprintf(
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
323 stderr,
703
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
324 " -u <date> "
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
325 "Get resources which are modified since the specified date\n");
703
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
326 fprintf(stderr, " -V <version> Download a specific version of a resource\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
327 fprintf(stderr, " -a show all files\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
328 fprintf(stderr, " -l print resources in long list format\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
329 fprintf(stderr, " -t print content type\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
330 fprintf(stderr, " -d order by last modified date\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
331 fprintf(stderr, " -e show extended flags\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
332 fprintf(stderr, " -O override resources\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
333 fprintf(stderr, " -L <lock> specificy lock token\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
334 fprintf(stderr, " -T <sec> timeout in seconds\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
335 fprintf(stderr, " -n <uri> specify namespace uri\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
336 fprintf(stderr, " -x xml property content\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
337 fprintf(stderr, " -N disable authentication prompt (all commands)\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
338 fprintf(stderr, " -i disable cert verification (all commands)\n");
2e3a24b9896a update man pages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 687
diff changeset
339 fprintf(stderr, " -v verbose output (all commands)\n");
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
340 fprintf(stderr, "\n");
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
341 fprintf(stderr, "Advanced commands:\n");
507
dea7d1b4eea0 nicer dav usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 500
diff changeset
342 fprintf(stderr, " versioncontrol list-versions checkout checkin uncheckout\n\n");
198
44054c452de1 added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 197
diff changeset
343 fprintf(stderr, "Config commands:\n");
507
dea7d1b4eea0 nicer dav usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 500
diff changeset
344 fprintf(stderr, " add-repository remove-repository list-repositories repository-url\n");
733
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
345 fprintf(stderr, " add-user remove-user edit-user list-users set-master-password\n");
256
54433cb371df implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents: 252
diff changeset
346 fprintf(stderr, " check-config\n");
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
347 fprintf(stderr, "\n");
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
348 fprintf(stderr,
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
349 "Instead of an url you can pass a repository name "
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
350 "with an optional path:\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
351 fprintf(stderr, " <repository>/path/\n");
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
352 fprintf(stderr, "\n");
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
353 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
354
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
355
673
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
356
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
357 static int set_session_config(DavSession *sn, CmdArgs *a) {
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
358 char *plain = cmd_getoption(a, "plain");
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
359 char *crypt = cmd_getoption(a, "crypt");
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
360
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
361 if(plain && crypt) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
362 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
363 return 1;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
364 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
365
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
366 if (plain) {
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
367 sn->flags &= ~DAV_SESSION_FULL_ENCRYPTION;
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
368 } else if(crypt) {
68
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
369 sn->flags |= DAV_SESSION_FULL_ENCRYPTION;
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
370 }
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
371
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
372 if (cmd_getoption(a, "verbose")) {
f6d3db6113d3 added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
373 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
374 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr);
788
9b9420041d8e add request/response body to verbose output / add DavSession logfunc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 775
diff changeset
375 sn->logfunc = dav_verbose_log;
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
376 }
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
377
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
378 return 0;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
379 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
380
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
381 static void set_session_lock(DavSession *sn, CmdArgs *a) {
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
382 char *locktoken = cmd_getoption(a, "lock");
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
383 if(locktoken) {
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
384 DavLock *lock = dav_create_lock(sn, locktoken, NULL);
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
385 dav_add_collection_lock(sn, "/", lock);
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
386 }
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
387 }
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
388
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
389
355
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
390 int update_progress(DavResource *res, int64_t total, int64_t now, Progress *p) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
391 int ret = 0;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
392 if(res != p->last_resource) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
393 p->cur += p->last_res_total - p->last_res_cur;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
394 ret = 1;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
395 } else {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
396 p->cur += now - p->last_res_cur;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
397 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
398
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
399 p->last_resource = res;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
400 p->last_res_cur = now;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
401 p->last_res_total = total;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
402
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
403 return ret;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
404 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
405
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
406 void download_progress(DavResource *res, int64_t total, int64_t now, void *data) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
407 Progress *p = data;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
408 int newres = update_progress(res, total, now, p);
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
409
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
410 time_t newts = time(NULL);
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
411 if((p->ts != newts)) {
355
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
412 fprintf(p->out, "[%s]: %" PRId64 "k/%" PRId64 "k total: %" PRId64 "M/%" PRId64 "M\n", res->name, now/1024, total/1024, p->cur/(1024*1024), p->total/(1024*1024));
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
413 fflush(p->out);
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
414 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
415 p->ts = newts;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
416 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
417
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
418
297
3cbe57eeaed1 adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 271
diff changeset
419 #define LIST_QUERY_ORDER_BY_NAME "select `idav:crypto-name`,`idav:crypto-key`,D:lockdiscovery,apache:executable from %s with depth = %d where lastmodified > %t order by iscollection desc, name"
3cbe57eeaed1 adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 271
diff changeset
420 #define LIST_QUERY_ORDER_BY_DATE "select `idav:crypto-name`,`idav:crypto-key`,D:lockdiscovery,apache:executable from %s with depth = %d where lastmodified > %t order by iscollection desc, lastmodified desc"
3cbe57eeaed1 adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 271
diff changeset
421
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
422 int cmd_list(CmdArgs *a) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
423 if(a->argc != 1) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
424 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
425 fprintf(stderr, "Usage: dav %s\n", find_usage_str("list"));
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
426 return -1;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
427 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
428
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
429 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
430 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
431 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
432 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
433
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
434 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
435 return -1;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
436 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
437
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
438 char *update = cmd_getoption(a, "update");
297
3cbe57eeaed1 adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 271
diff changeset
439 char *date = cmd_getoption(a, "date");
136
59058927b885 empty field results will no longer be added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 135
diff changeset
440 time_t t = -1;
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
441 if(update) {
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
442 t = util_parse_lastmodified(update);
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
443 }
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
444
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
445 int depth = cmd_getoption(a, "recursive") ? -1 : 1;
425
ae4d89c3477c fixes dav list return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 421
diff changeset
446 int ret = 0;
806
673a803d2203 fix session dup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 798
diff changeset
447
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
448 DavResource *ls = dav_query(
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
449 sn,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
450 date ? LIST_QUERY_ORDER_BY_DATE : LIST_QUERY_ORDER_BY_NAME,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
451 path,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
452 depth,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
453 t);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
454 if(ls) {
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
455 // parameters
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
456 void (*print_func)(DavResource*, char *, CmdArgs *);
213
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
457 if(cmd_getoption(a, "list") || cmd_getoption(a, "extended")) {
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
458 print_func = ls_print_list_elm;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
459 } else {
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
460 print_func = ls_print_elm;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
461 }
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
462
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
463 DavResource *child = ls->children;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
464 while(child) {
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
465 print_func(child, path, a);
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
466 child = child->next;
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
467 }
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
468 } else {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
469 print_resource_error(sn, path);
425
ae4d89c3477c fixes dav list return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 421
diff changeset
470 ret = -1;
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
471 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
472
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
473 free(path);
40
a95ee94b9204 supports whitespace in paths
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 38
diff changeset
474 //free(base);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
475
144
c2c02c9b3be4 dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 143
diff changeset
476 dav_session_destroy(sn);
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
477
38
b855f76e965b code cleanup + experimental login prompt
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
478 return ret;
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
479 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
480
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
481 static char* ls_name(char *parent, char *path, int *len) {
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
482 if(parent) {
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
483 path += strlen(parent);
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
484 }
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
485 if(path[0] == '/') {
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
486 path++;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
487 }
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
488 int pathlen = strlen(path);
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
489 if(path[pathlen-1] == '/') {
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
490 pathlen--;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
491 }
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
492 *len = pathlen;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
493 return path;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
494 }
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
495
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
496 void ls_print_list_elm(DavResource *res, char *parent, CmdArgs *a) {
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
497 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
498 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
499 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
500 return;
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
501 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
502
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
503 char flags[16];
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
504 memset(flags, '-', 15);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
505
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
506 int type_width = 0;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
507 char *type = res->contenttype;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
508
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
509 if(res->iscollection) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
510 flags[0] = 'd';
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
511 type = "";
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
512 }
331
9ca1e4706acc adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
513 char *keyprop = dav_get_string_property_ns(
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
514 res,
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
515 DAV_NS,
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
516 "crypto-key");
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
517 if(keyprop) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
518 flags[1] = 'c';
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
519 }
213
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
520
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
521 if(cmd_getoption(a, "extended")) {
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
522 flags[6] = '\0';
331
9ca1e4706acc adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
523 if(dav_get_string_property(res, "D:lockdiscovery")) {
213
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
524 flags[2] = 'l';
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
525 }
331
9ca1e4706acc adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 330
diff changeset
526 char *executable = dav_get_string_property_ns(
213
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
527 res,
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
528 "http://apache.org/dav/props/",
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
529 "executable");
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
530 if(executable && util_getboolean(executable)) {
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
531 flags[3] = 'x';
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
532 }
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
533 } else {
cd870d5f8659 added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 212
diff changeset
534 flags[2] = '\0';
211
3d12817414e9 dav list indicates locks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 210
diff changeset
535 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
536
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
537 if(cmd_getoption(a, "type")) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
538 type_width = 20;
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
539 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
540 if(type == NULL || type_width == 0) {
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
541 type = "";
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
542 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
543
723
5ca174b3247a add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
544 char *date = util_date_str(res->lastmodified);
5ca174b3247a add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
545 char *size = util_size_str(res->iscollection, res->contentlength);
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
546 int namelen = strlen(res->name);
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
547 char *name = recursive ? ls_name(parent, res->path, &namelen) : res->name;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
548
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
549 //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
550 printf(
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
551 "%s %*s %10s %12s %.*s\n",
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
552 flags,
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
553 type_width, type,
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
554 size,
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
555 date,
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
556 namelen,
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
557 name);
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
558 free(date);
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
559 free(size);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
560
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
561 if(recursive) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
562 DavResource *child = res->children;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
563 while(child) {
138
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
564 //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
565 if(child->name[0] != '.' || show_all) {
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
566 ls_print_list_elm(child, parent, a);
138
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
567 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
568 child = child->next;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
569 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
570 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
571 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
572
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
573 void ls_print_elm(DavResource *res, char *parent, CmdArgs *a) {
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
574 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
575 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
576 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
577 return;
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
578 }
6a3248e22d58 -a option wasn't working correctly in recursive mode
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 136
diff changeset
579
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
580 int namelen = strlen(res->name);
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
581 char *name = recursive ? ls_name(parent, res->path, &namelen) : res->name;
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
582 printf("%.*s\n", namelen, name);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
583 if(recursive) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
584 DavResource *child = res->children;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
585 while(child) {
270
0edfb4c0e7f8 fixes dav list -R output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
586 ls_print_elm(child, parent, a);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
587 child = child->next;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
588 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
589 }
14
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
590 }
d1a43035d3a2 added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 13
diff changeset
591
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
592 static void free_getres(void *r) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
593 GetResource *getres = r;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
594 free(getres->path);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
595 free(getres);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
596 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
597
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
598 int cmd_get(CmdArgs *a, DavBool export) {
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
599 if(a->argc != 1) {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
600 // 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
601 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
602 fprintf(stderr, "Usage: dav %s\n", find_usage_str("get"));
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
603 return -1;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
604 }
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
605 if(export) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
606 cxMapPut(a->options, cx_hash_key_str("recursive"), "");
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
607 }
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
608
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
609 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
610 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
611 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
612 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
613
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
614 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
615 return -1;
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
616 }
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
617
355
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
618 char *progressfile = cmd_getoption(a, "progressfile");
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
619 Progress pdata;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
620 memset(&pdata, 0, sizeof(Progress));
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
621 if(progressfile) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
622 if(!strcmp(progressfile, "-")) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
623 pdata.out = stdout;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
624 pdata.isstdout = 1;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
625 } else {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
626 pdata.out = fopen(progressfile, "w");
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
627 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
628 if(pdata.out) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
629 dav_session_set_progresscallback(sn, download_progress, NULL, &pdata);
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
630 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
631 }
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
632
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
633 char *update = cmd_getoption(a, "update");
135
664aeaec8d25 replaced old davql (still buggy)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 126
diff changeset
634 time_t t = -1;
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
635 if(update) {
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
636 t = util_parse_lastmodified(update);
329
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
637 if (t == 0) {
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
638 fprintf(stderr,
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
639 "Invalid date format. Possible formats are:\n"
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
640 " RFC-1123 - example: Thu, 29 Nov 2012 21:35:35 GMT\n"
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
641 " RFC-3339 - example: 2012-11-29T21:35:35Z\n");
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
642 return -1;
2dc61cc5a8ac adds error message to dav, when an invalid date format is specified for the -u option
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
643 }
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
644 }
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
645
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
646 int recursive = cmd_getoption(a, "recursive") ? 1 : 0;
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
647 char *version = cmd_getoption(a, "version");
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
648
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
649 if(recursive && version) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
650 fprintf(stderr, "-V option can only be used without -R option\n");
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
651 return -1;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
652 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
653
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
654 DavResource *res;
30
9a5a7a513a96 added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 29
diff changeset
655
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
656 int depth = recursive ? -1 : 1;
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
657 res = dav_query(
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
658 sn,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
659 "select - from %s with depth = %d where iscollection or lastmodified > %t",
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
660 path,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
661 depth,
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
662 t);
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
663 if(!res) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
664 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
665 return -1;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
666 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
667 if(!recursive && res->iscollection) {
235
0468df02e18f fixed dav get with -u option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 230
diff changeset
668 fprintf(stderr, "Resource %s is a collection.\n", res->path);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
669 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
670 return -1;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
671 }
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
672
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
673 if(version) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
674 DavResource *vres = find_version(res, version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
675 if(!vres) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
676 fprintf(stderr, "Cannot find version '%s' for resource.\n", version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
677 return -1;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
678 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
679 dav_resource_free_all(res);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
680 res = vres;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
681 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
682
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
683 /*
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
684 * determine the output file
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
685 * 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
686 */
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
687 char *outfile = cmd_getoption(a, "output");
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
688 char *basepath = outfile;
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
689 if(!outfile) {
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
690 if(res->iscollection) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
691 basepath = "";
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
692 } else {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
693 basepath = res->name;
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
694 }
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
695 if(export) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
696 outfile = "-";
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
697 }
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
698 } else if(export) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
699 basepath = "";
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
700 } else if(res->iscollection && !strcmp(outfile, "-")) {
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
701 fprintf(
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
702 stderr,
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
703 "Cannot write output to stdout "
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
704 "if the requested resource is a collection.\n");
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
705 return -1;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
706 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
707
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
708 // get list of resources
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
709 CxList *reslist = cxLinkedListCreate(NULL, CX_STORE_POINTERS);
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
710 cxSetDestructor(reslist, free_getres);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
711 uint64_t totalsize = 0;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
712 uint64_t rescount = 0;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
713
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
714 GetResource *getres = malloc(sizeof(GetResource));
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
715 getres->res = res;
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
716 getres->path = strdup(basepath);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
717
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
718 char *structure = cmd_getoption(a, "structure");
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
719
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
720 // iterate over resource tree
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
721 CxList *stack = cxLinkedListCreate(NULL, CX_STORE_POINTERS);
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
722 cxListInsert(stack, 0, getres);
816
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
723 while(cxListSize(stack) > 0) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
724 GetResource *g = cxListAt(stack, 0);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
725 cxListRemove(stack, 0);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
726
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
727 if(g->res->iscollection) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
728 DavResource *child = g->res->children;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
729 while(child) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
730 // add resource to stack
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
731 size_t pathlen = strlen(g->path);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
732 GetResource *newres = malloc(sizeof(GetResource));
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
733 newres->res = child;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
734 newres->path = pathlen > 0 ?
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
735 util_concat_path(g->path, child->name) : strdup(child->name);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
736
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
737 cxListInsert(stack, 0, newres);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
738
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
739 child = child->next;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
740 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
741 } else {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
742 if(structure) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
743 // download only directory structure
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
744 // this is a hidden feature and will be replaced in the future
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
745 continue; // skip non-collection resource
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
746 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
747 totalsize += g->res->contentlength;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
748 rescount++;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
749 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
750
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
751 if(strlen(g->path) == 0) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
752 free_getres(g);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
753 } else {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
754 cxListAdd(reslist, g);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
755 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
756 }
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 849
diff changeset
757 cxListFree(stack);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
758
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
759 // download resources
355
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
760 pdata.total = totalsize;
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
761
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
762 int ret;
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
763 getfunc get;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
764 TarOutputStream *tout = NULL;
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
765 if(export) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
766 get = (getfunc)resource2tar;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
767 FILE *tarfile = strcmp(outfile, "-") ? fopen(outfile, "wb") : stdout;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
768 if(!tarfile) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
769 perror("Cannot open tar output file");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
770 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
771 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
772 tout = tar_open(tarfile);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
773 } else {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
774 get = get_resource;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
775 }
816
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
776 CxIterator iter = cxListIterator(reslist);
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
777 cx_foreach(GetResource *, res_item, iter) {
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
778 ret = get(repo, res_item, a, tout);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
779 if(ret) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
780 break;
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
781 }
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
782 }
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
783 if(export) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
784 // close tar stream
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
785 if(tar_close(tout)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
786 fprintf(stderr, "tar stream broken\n");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
787 ret = -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
788 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
789 }
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
790
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 849
diff changeset
791 cxListFree(reslist);
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
792 free(path);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
793
355
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
794 if(pdata.out && !pdata.isstdout) {
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
795 fclose(pdata.out);
5da2cf15eb44 adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
796 }
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
797 return ret;
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
798 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
799
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
800 static int file_seek(FILE *f, curl_off_t offset, int origin) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
801 int ret = fseek(f, offset, origin);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
802 return ret == 0 ? CURL_SEEKFUNC_OK : CURL_SEEKFUNC_CANTSEEK;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
803 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
804
711
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
805 static int check_encryption_key(CmdArgs *a, DavSession *sn) {
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
806 // override the session key if the -k option is specified
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
807 char *keyname = cmd_getoption(a, "key");
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
808 if(keyname) {
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
809 DavKey *key = dav_context_get_key(ctx, keyname);
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
810 if(key) {
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
811 sn->key = key;
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
812 } else {
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
813 fprintf(stderr, "Key %s not found!\nAbort.\n", keyname);
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
814 return 1;
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
815 }
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
816
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
817 /*
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
818 * If a key is explicitly specified, we can safely assume that the user
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
819 * wants to encrypt. For security reasons we report an error, if no
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
820 * encryption is enabled.
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
821 */
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
822 if(!DAV_IS_ENCRYPTED(sn)) {
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
823 fprintf(stderr, "A key has been explicitly specified, but no "
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
824 "encryption is requested.\n"
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
825 "You have the following options:\n"
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
826 " - pass '-c' as command line argument to request encryption\n"
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
827 " - activate encryption in the config.xml\n"
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
828 " - don't use '-k <key>' "
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
829 "(warning: encryption will NOT happen)\n");
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
830 return 1;
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
831 }
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
832 }
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
833
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
834 // if encryption is requested, but we still don't know the key, report error
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
835 if(DAV_IS_ENCRYPTED(sn) && !(sn->key)) {
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
836 fprintf(stderr, "Encryption has been requested, "
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
837 "but no default key is configured.\n"
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
838 "You may specify a custom key with the '-k' option.\n");
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
839 return 1;
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
840 }
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
841
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
842 return 0;
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
843 }
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
844
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
845 int cmd_edit(CmdArgs *a) {
715
f4da6141e233 removes win32 support for dav edit
Mike Becker <universe@uap-core.de>
parents: 712
diff changeset
846 #ifdef _WIN32
f4da6141e233 removes win32 support for dav edit
Mike Becker <universe@uap-core.de>
parents: 712
diff changeset
847 fprintf(stderr, "This feature is not supported on your platform.\n");
f4da6141e233 removes win32 support for dav edit
Mike Becker <universe@uap-core.de>
parents: 712
diff changeset
848 return -1;
f4da6141e233 removes win32 support for dav edit
Mike Becker <universe@uap-core.de>
parents: 712
diff changeset
849 #else
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
850 if(a->argc != 1) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
851 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
852 fprintf(stderr, "Usage: dav %s\n", find_usage_str("edit"));
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
853 return -1;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
854 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
855
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
856 char *url = a->argv[0];
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
857 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
858 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
859 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
860
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
861 if(set_session_config(sn, a)) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
862 return -1;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
863 }
720
2b8a65ed6f4c adds support for -L option in dav edit
Mike Becker <universe@uap-core.de>
parents: 719
diff changeset
864 set_session_lock(sn, a);
711
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
865
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
866 if(check_encryption_key(a, sn)) {
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
867 return -1;
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
868 }
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
869
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
870 char *version = cmd_getoption(a, "version");
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
871 DavResource *res;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
872
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
873 res = dav_resource_new(sn, path);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
874 int fresh_resource = !dav_exists(res);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
875 if(fresh_resource) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
876 // create the resource to check if the resource can be created
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
877 // we don't want the user to invest time in editing and fail afterwards
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
878 if(dav_create(res)) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
879 fprintf(stderr, "Resource does not exist and cannot be created.\n");
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
880 return -1;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
881 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
882 } else {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
883 if(!res) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
884 print_resource_error(sn, path);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
885 return -1;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
886 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
887 if(res->iscollection) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
888 fprintf(stderr, "Resource %s is a collection "
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
889 "and cannot be opened in an editor.\n", res->path);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
890 return -1;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
891 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
892
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
893 if(version) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
894 DavResource *vres = find_version(res, version);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
895 if(!vres) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
896 fprintf(stderr, "Cannot find version '%s' for resource.\n", version);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
897 return -1;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
898 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
899 dav_resource_free_all(res);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
900 res = vres;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
901 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
902 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
903
717
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
904 // get temp dir
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
905 char* envtmp = getenv("TMPDIR");
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
906 char* outfile;
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
907 if(envtmp) {
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
908 size_t len = strlen(envtmp);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
909 outfile = malloc(len+24);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
910 memcpy(outfile, envtmp, len+1);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
911 if(outfile[len-1] != '/') {
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
912 outfile[len] = '/';
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
913 outfile[len+1] = 0;
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
914 }
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
915 } else {
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
916 outfile = malloc(24);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
917 strncpy(outfile, "/tmp/", 24);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
918 }
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
919
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
920 // check temp dir and fall back to $HOME
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
921 if(access(outfile, W_OK)) {
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
922 char* home = getenv("HOME");
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
923 if(home) {
718
e71ffa69d3fe cmd_edit. fixes wrong variable in second strlen() call
Mike Becker <universe@uap-core.de>
parents: 717
diff changeset
924 size_t len = strlen(home);
717
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
925 outfile = malloc(len+24);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
926 memcpy(outfile, home, len+1);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
927 if(outfile[len-1] != '/') {
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
928 outfile[len] = '/';
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
929 outfile[len+1] = 0;
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
930 }
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
931 } else {
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
932 // fallback did not work, report last error from access()
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
933 perror("Cannot write to temporary location");
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
934 free(outfile);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
935 return -1;
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
936 }
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
937 }
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
938
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
939 // create temp file and open it
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
940 outfile = strncat(outfile, ".dav-edit-XXXXXX", 23);
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
941 int tmp_fd = mkstemp(outfile);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
942 if(tmp_fd < 0) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
943 perror("Cannot open temporary file");
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
944 return -1;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
945 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
946
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
947 // get resource
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
948 if(!fresh_resource) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
949 FILE* tmp_stream = sys_fopen(outfile, "wb");
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
950 if(!tmp_stream) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
951 perror("Cannot open temporary file");
717
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
952 free(outfile);
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
953 close(tmp_fd);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
954 return -1;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
955 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
956 if(dav_get_content(res, tmp_stream, (dav_write_func)fwrite)) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
957 print_resource_error(sn, path);
717
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
958 free(outfile);
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
959 close(tmp_fd);
716
5c2e4da00b04 cmd_edit: replaces unlink() with sys_unlink() + keep tmp file on resource error
Mike Becker <universe@uap-core.de>
parents: 715
diff changeset
960 sys_unlink(outfile);
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
961 return -1;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
962 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
963 fclose(tmp_stream);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
964 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
965
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
966 // remember time s.t. we can later check if the file has changed
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
967 SYS_STAT tmp_stat;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
968 if(sys_stat(outfile, &tmp_stat)) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
969 perror("Cannot stat temporary file");
717
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
970 free(outfile);
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
971 close(tmp_fd);
716
5c2e4da00b04 cmd_edit: replaces unlink() with sys_unlink() + keep tmp file on resource error
Mike Becker <universe@uap-core.de>
parents: 715
diff changeset
972 sys_unlink(outfile);
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
973 return -1;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
974 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
975 time_t dl_mtime = tmp_stat.st_mtime;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
976
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
977 // open in editor
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
978 char* default_editor = "vi";
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
979 char* editor = getenv("EDITOR");
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
980 if(!editor) editor = default_editor;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
981 char* viargs[3] = {editor, outfile, NULL};
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
982
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
983 int ret = 0;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
984 pid_t pid = fork();
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
985 if(pid < 0) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
986 perror("Cannot create process for editor");
717
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
987 ret = -1;
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
988 } else if(pid == 0) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
989 if(execvp(viargs[0], viargs)) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
990 perror("Opening the editor failed");
717
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
991 return -1;
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
992 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
993 } else {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
994 int status = -1;
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
995 ret = waitpid(pid, &status, 0);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
996 if(ret < 0) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
997 perror("Error waiting for editor");
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
998 } else if(WEXITSTATUS(status)) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
999 fprintf(stderr,
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1000 "Editor closed abnormally - file will not be uploaded.\n");
717
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1001 ret = -1;
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1002 } else {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1003 // check if the file has changed
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1004 if (sys_stat(outfile, &tmp_stat)) {
716
5c2e4da00b04 cmd_edit: replaces unlink() with sys_unlink() + keep tmp file on resource error
Mike Becker <universe@uap-core.de>
parents: 715
diff changeset
1005 // very rare case when someone concurrently changes permissions
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1006 perror("Cannot stat temporary file");
717
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1007 ret = -1;
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1008 } else if (dl_mtime < tmp_stat.st_mtime) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1009 // upload changed file
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1010 FILE* tmp_stream = sys_fopen(outfile, "rb");
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1011 if(!tmp_stream) {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1012 perror("Cannot open temporary file");
717
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1013 ret = -1;
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1014 } else {
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1015 dav_set_content(res, tmp_stream,
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1016 (dav_read_func)fread,
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1017 (dav_seek_func)file_seek);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1018 dav_set_content_length(res, tmp_stat.st_size);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1019 ret = dav_store(res);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1020 fclose(tmp_stream);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1021 if(ret) {
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1022 print_resource_error(sn, path);
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1023 }
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1024 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1025 } else {
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1026 printf("No changes by user - file will not be uploaded.\n");
719
be012dd45b4b cmd_edit: fixes wrong return code if the user did not change the file
Mike Becker <universe@uap-core.de>
parents: 718
diff changeset
1027 ret = 0;
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1028 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1029 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1030 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1031
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1032 close(tmp_fd);
716
5c2e4da00b04 cmd_edit: replaces unlink() with sys_unlink() + keep tmp file on resource error
Mike Becker <universe@uap-core.de>
parents: 715
diff changeset
1033 if(ret) {
5c2e4da00b04 cmd_edit: replaces unlink() with sys_unlink() + keep tmp file on resource error
Mike Becker <universe@uap-core.de>
parents: 715
diff changeset
1034 // if someone went wrong, we are most likely unable to unlink anyway
5c2e4da00b04 cmd_edit: replaces unlink() with sys_unlink() + keep tmp file on resource error
Mike Becker <universe@uap-core.de>
parents: 715
diff changeset
1035 fprintf(stderr, "File location: %s\n", outfile);
5c2e4da00b04 cmd_edit: replaces unlink() with sys_unlink() + keep tmp file on resource error
Mike Becker <universe@uap-core.de>
parents: 715
diff changeset
1036 } else {
5c2e4da00b04 cmd_edit: replaces unlink() with sys_unlink() + keep tmp file on resource error
Mike Becker <universe@uap-core.de>
parents: 715
diff changeset
1037 sys_unlink(outfile);
5c2e4da00b04 cmd_edit: replaces unlink() with sys_unlink() + keep tmp file on resource error
Mike Becker <universe@uap-core.de>
parents: 715
diff changeset
1038 }
717
764e9fac530d look up temp location + coherent return codes
Mike Becker <universe@uap-core.de>
parents: 716
diff changeset
1039 free(outfile);
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1040 free(path);
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1041
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1042 return ret;
715
f4da6141e233 removes win32 support for dav edit
Mike Becker <universe@uap-core.de>
parents: 712
diff changeset
1043 #endif
709
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1044 }
857330e1e3f4 first draft for dav edit command
Mike Becker <universe@uap-core.de>
parents: 703
diff changeset
1045
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1046 int get_resource(DavCfgRepository *repo, GetResource *getres, CmdArgs *a, void *unused) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1047 DavResource *res = getres->res;
350
5fc457fb2cb1 fixes wrong output path in dav get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 346
diff changeset
1048 char *out = getres->path;
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1049
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1050 if(res->iscollection) {
309
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1051 printf("get: %s\n", res->path);
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1052
412
dc74f736aea1 adds more fs abstraction
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
1053 int ret = sys_mkdir(out);
333
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1054 if(ret != 0 && errno != EEXIST) {
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1055 fprintf(stderr, "Cannot create directory '%s': ", out);
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1056 perror("");
000cdd124115 refactores cmd_get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 332
diff changeset
1057 return 1;
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1058 }
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1059
309
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1060 return 0;
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1061 }
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1062
330
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1063 int isstdout = !strcmp(out, "-");
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1064 if(cmd_getoption(a, "keep") && !isstdout) {
410
0b9bea2d7283 adds file io abstraction functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
1065 SYS_STAT s;
0b9bea2d7283 adds file io abstraction functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
1066 if(sys_stat(out, &s)) {
330
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1067 if(errno != ENOENT) {
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1068 perror("stat");
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1069 }
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1070 } else {
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1071 if(cmd_getoption(a, "recursive")) {
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1072 printf("skip: %s\n", res->path);
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1073 }
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1074 return 0;
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1075 }
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1076 }
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1077
309
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1078 // print some status message in recursive mode
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1079 if(cmd_getoption(a, "recursive")) {
8a474d2ad209 adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 305
diff changeset
1080 printf("get: %s\n", res->path);
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1081 }
330
54819e984a19 adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 329
diff changeset
1082
410
0b9bea2d7283 adds file io abstraction functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
1083 FILE *fout = isstdout ? stdout : sys_fopen(out, "wb");
18
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1084 if(!fout) {
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1085 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
1086 return -1;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1087 }
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1088
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1089 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
1090 fclose(fout);
651989681053 recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
1091 if(ret && strcmp(out, "-")) {
207
de23f8881e9f fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 204
diff changeset
1092 print_resource_error(res->session, res->path);
de23f8881e9f fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 204
diff changeset
1093 //if(strcmp(out, "-")) {
de23f8881e9f fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 204
diff changeset
1094 // unlink(out);
de23f8881e9f fixed hash verification and head requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 204
diff changeset
1095 //}
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1096 }
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1097
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1098 return 0;
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1099 }
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1100
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1101 #define DEFAULT_DIR_MODE T_IRUSR | T_IWUSR | T_IXUSR | T_IRGRP | T_IXGRP | T_IROTH | T_IXOTH
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1102 #define DEFAULT_FILE_MODE T_IRUSR | T_IWUSR | T_IRGRP | T_IROTH
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1103
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1104 int resource2tar(DavCfgRepository *repo, GetResource *res, CmdArgs *a, TarOutputStream *tar) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1105 DavResource *d = res->res;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1106
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1107 if(d->iscollection) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1108 fprintf(stderr, "add d: %s\n", res->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1109 return tar_add_dir(tar, res->path, DEFAULT_DIR_MODE, d->lastmodified);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1110 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1111
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1112 fprintf(stderr, "add f: %s\n", res->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1113
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1114 // add tar file header
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1115 if(tar_begin_file(tar, res->path, DEFAULT_FILE_MODE, d->contentlength, d->lastmodified)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1116 fprintf(stderr, "TAR Error: %s\n", tar_error2str(tar->error));
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1117 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1118 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1119
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1120 if(dav_get_content(d, tar, (dav_write_func)tar_fwrite)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1121 print_resource_error(d->session, d->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1122 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1123 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1124
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1125 // download content
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1126
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1127 return tar_end_file(tar);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1128 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1129
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
1130 int cmd_put(CmdArgs *a, DavBool import) {
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1131 if(a->argc < 2) {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1132 fprintf(stderr, "Too few arguments\n");
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1133 fprintf(stderr,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1134 "Usage: dav %s\n",
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1135 find_usage_str(import ? "import" : "put"));
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
1136 return -1;
3
323689ada09d disabled ssl cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1
diff changeset
1137 }
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1138 DavBool use_stdin = FALSE;
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1139 for(int i=1;i<a->argc;i++) {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1140 if(!strcmp(a->argv[i], "-")) {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1141 if(use_stdin) {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1142 fprintf(stderr, "Error: stdin can only occur once in input list\n");
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1143 return -1;
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1144 } else {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1145 use_stdin = TRUE;
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1146 }
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1147 }
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1148 }
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1149
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
1150 if(import) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
1151 cxMapPut(a->options, cx_hash_key_str("resursive"), "");
376
222997d48ae1 moving tar option from get/put to new export/import commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 375
diff changeset
1152 }
3
323689ada09d disabled ssl cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1
diff changeset
1153
11
5db6178d8b58 added usage info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
1154 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
1155 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1156 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
1157 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1158
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1159 if(set_session_config(sn, a)) {
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1160 return -1;
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1161 }
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
1162 set_session_lock(sn, a);
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1163
494
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1164 if(check_encryption_key(a, sn)) {
3aed354185eb fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
Mike Becker <universe@uap-core.de>
parents: 489
diff changeset
1165 // TODO: free
352
76bd29a11cc9 fixes a segfault when full encryption is requested during a put without specifying the key
Mike Becker <universe@uap-core.de>
parents: 350
diff changeset
1166 return -1;
711
8d40b5ccc43e adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
Mike Becker <universe@uap-core.de>
parents: 710
diff changeset
1167 }
352
76bd29a11cc9 fixes a segfault when full encryption is requested during a put without specifying the key
Mike Becker <universe@uap-core.de>
parents: 350
diff changeset
1168
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1169 DavBool printfile = FALSE;
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1170 DavBool ignoredirerr = FALSE;
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1171 if(a->argc > 2) {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1172 printfile = TRUE;
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1173 ignoredirerr = TRUE;
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
1174 } else if(cmd_getoption(a, "recursive")) {
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1175 printfile = TRUE;
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1176 }
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1177
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1178 char *finfo_str = cmd_getoption(a, "finfo");
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1179 uint32_t finfo = 0;
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1180 if(finfo_str) {
526
e3c0440bd599 adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 522
diff changeset
1181 finfo = parse_finfo_settings(finfo_str, NULL);
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1182 }
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1183
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1184 int ret;
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1185 for(int i=1;i<a->argc;i++) {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1186 char *file = a->argv[i];
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1187 if(!import) {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1188 if(!strcmp(file, "-")) {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1189 FILE *in = stdin;
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1190 ret = put_file(repo, a, sn, path, "stdin", 0, NULL, in, 0);
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1191 } else {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1192 ret = put_entry(
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1193 repo,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1194 a,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1195 sn,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1196 path,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1197 file,
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1198 finfo,
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1199 TRUE,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1200 printfile,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1201 ignoredirerr);
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1202 }
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1203 } else {
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1204 ret = put_tar(repo, a, sn, file, path);
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1205 }
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1206 if(ret) {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1207 break;
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1208 }
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1209 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1210
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1211 free(path);
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1212 dav_session_destroy(sn);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1213 return ret;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1214 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1215
789
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1216 #if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1217 #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1218 #endif
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1219
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1220 #ifdef _WIN32
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1221 #ifndef S_ISDIR
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1222 #define S_ISDIR(mode) ((mode) & _S_IFMT) == _S_IFDIR
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1223 #define S_ISREG(mode) ((mode) & _S_IFMT) == _S_IFREG
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1224 #endif
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1225 #endif
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1226
378b5ab86f77 add new build system for windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 788
diff changeset
1227
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1228 int put_entry(
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1229 DavCfgRepository *repo,
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1230 CmdArgs *a,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1231 DavSession *sn,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1232 char *path,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1233 char *file,
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1234 uint32_t finfo,
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1235 DavBool root,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1236 DavBool printfile,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1237 DavBool ignoredirerr)
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1238 {
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1239 int recursive = cmd_getoption(a, "recursive") ? 1 : 0;
739
bba6a6e221b4 use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 734
diff changeset
1240 SYS_STAT s;
bba6a6e221b4 use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 734
diff changeset
1241 if(sys_stat(file, &s)) {
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1242 perror("stat");
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1243 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
1244 return -1;
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
1245 }
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
1246
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1247 int ret = 0;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1248 if(S_ISDIR(s.st_mode)) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1249 if(!recursive) {
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1250 if(ignoredirerr) {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1251 printf("skip: %s\n", file);
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1252 } else {
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1253 fprintf(
241
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1254 stderr,
318
7e0694423838 dav-sync bugfix: files that are not in the db but on the server should not be pushed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 317
diff changeset
1255 "%s is a directory.\nUse the -R option to upload directories.\n",
241
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1256 file);
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1257 return 1;
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1258 }
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1259 }
271
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1260
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1261 if(!root) {
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1262 printf("mkcol: %s\n", file);
744
f0d7178043c1 force mkcol for every directory in the dav put command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 739
diff changeset
1263 DavResource *res = dav_resource_new(sn, path);
f0d7178043c1 force mkcol for every directory in the dav put command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 739
diff changeset
1264 res->iscollection = TRUE;
f0d7178043c1 force mkcol for every directory in the dav put command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 739
diff changeset
1265 if(!dav_exists(res)) {
f0d7178043c1 force mkcol for every directory in the dav put command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 739
diff changeset
1266 if(dav_create(res)) {
f0d7178043c1 force mkcol for every directory in the dav put command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 739
diff changeset
1267 fprintf(stderr, "Cannot create collection %s\n", path);
f0d7178043c1 force mkcol for every directory in the dav put command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 739
diff changeset
1268 print_resource_error(sn, res->path);
f0d7178043c1 force mkcol for every directory in the dav put command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 739
diff changeset
1269 dav_resource_free(res);
f0d7178043c1 force mkcol for every directory in the dav put command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 739
diff changeset
1270 return 1;
f0d7178043c1 force mkcol for every directory in the dav put command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 739
diff changeset
1271 }
f0d7178043c1 force mkcol for every directory in the dav put command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 739
diff changeset
1272 }
f0d7178043c1 force mkcol for every directory in the dav put command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 739
diff changeset
1273 dav_resource_free(res);
271
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1274 }
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1275
739
bba6a6e221b4 use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 734
diff changeset
1276 SYS_DIR dir = sys_opendir(file);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1277 if(!dir) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1278 // error
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1279 }
739
bba6a6e221b4 use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 734
diff changeset
1280 SysDirEnt *entry;
241
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1281 int nument = 0;
739
bba6a6e221b4 use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 734
diff changeset
1282 while((entry = sys_readdir(dir)) != NULL) {
bba6a6e221b4 use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 734
diff changeset
1283 if(!strcmp(entry->name, ".") || !strcmp(entry->name, "..")) {
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1284 continue;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1285 }
241
da7ace67deab improved dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 236
diff changeset
1286 nument++;
739
bba6a6e221b4 use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 734
diff changeset
1287 char *entry_file = util_concat_path(file, entry->name);
bba6a6e221b4 use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 734
diff changeset
1288 char *entry_path = util_concat_path(path, entry->name);
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1289 int r = put_entry(
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1290 repo,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1291 a,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1292 sn,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1293 entry_path,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1294 entry_file,
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1295 finfo,
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1296 FALSE,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1297 printfile,
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1298 ignoredirerr);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1299 free(entry_path);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1300 free(entry_file);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1301 if(r) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1302 ret = 1;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1303 break;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1304 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1305 }
739
bba6a6e221b4 use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 734
diff changeset
1306 sys_closedir(dir);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1307 } else if(S_ISREG(s.st_mode)) {
500
0fe1514667e6 adds support for multiple file arguments for dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 498
diff changeset
1308 if(printfile) {
271
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1309 printf("put: %s\n", file);
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1310 }
7b1ca53f3897 fixes dav put output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
1311
739
bba6a6e221b4 use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 734
diff changeset
1312 FILE *in = sys_fopen(file, "rb");
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1313 if(!in) {
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1314 fprintf(stderr, "cannot open input file\n");
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1315 return -1;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1316 }
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
1317 const char *filename = util_resource_name(file);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1318 //path = util_concat_path(path, filename);
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1319 ret = put_file(repo, a, sn, path, filename, finfo, file, in, s.st_size);
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1320 //free(path);
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1321 fclose(in);
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1322 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1323
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1324 return ret;
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1325 }
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1326
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1327 int put_tar(DavCfgRepository *repo, CmdArgs *a, DavSession *sn, char *tarfile, char *path) {
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1328 int isstdin = !strcmp(tarfile, "-");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1329 FILE *in = isstdin ? stdin : fopen(tarfile, "rb");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1330 if(!in) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1331 perror("Cannot open tar file");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1332 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1333 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1334
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1335 DavResource *col = dav_query(sn, "select - from %s", path);
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1336 if(!col) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1337 if(sn->error == DAV_NOT_FOUND) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1338 col = dav_resource_new(sn, path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1339 col->iscollection = TRUE;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1340 if(dav_create(col)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1341 print_resource_error(sn, path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1342 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1343 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1344 } else {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1345 print_resource_error(sn, path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1346 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1347 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1348 } else if(!col->iscollection) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1349 fprintf(stderr, "%s is not a collection\n", col->href);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1350 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1351 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1352
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1353
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1354 int ret = 0;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1355 TarInputStream *tar = tar_inputstream_open(in);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1356 TarEntry *e = NULL;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1357 while((e = tar_read_entry(tar)) != NULL) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1358 char *newpath = util_concat_path(path, e->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1359 if(e->type == TAR_TYPE_FILE) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1360 fprintf(stderr, "put: %s\n", e->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1361 DavResource *res = dav_resource_new(sn, newpath);
478
baa63fef5c5c fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 476
diff changeset
1362 dav_set_content(res, tar, (dav_read_func)tar_fread, (dav_seek_func)tar_seek);
334
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1363 dav_set_content_length(res, (size_t)e->size);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1364
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1365 if(dav_store(res)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1366 print_resource_error(sn, res->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1367 fprintf(stderr, "Cannot upload file.\n");
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1368 if(sn->errorstr) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1369 fprintf(stderr, "%s\n", sn->errorstr);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1370 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1371 return -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1372 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1373
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1374 } else if(e->type == TAR_TYPE_DIRECTORY) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1375 printf("mkcol: %s\n", e->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1376 DavResource *res = dav_resource_new(sn, newpath);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1377 res->iscollection = TRUE;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1378 if(!dav_exists(res)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1379 if(dav_create(res)) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1380 fprintf(stderr, "Cannot create collection %s\n", newpath);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1381 print_resource_error(sn, res->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1382 ret = 1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1383 free(newpath);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1384 break;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1385 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1386 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1387 } else {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1388 fprintf(stderr, "skip: %s\n", e->path);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1389 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1390 free(newpath);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1391 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1392 if(tar->error != TAR_OK) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1393 ret = -1;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1394 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1395
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1396 if(!isstdin) {
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1397 fclose(in);
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1398 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1399
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1400 return ret;
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1401 }
5f80c5d0e87f adds tar import/export
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 333
diff changeset
1402
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1403 int put_file(
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1404 DavCfgRepository *repo,
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1405 CmdArgs *a,
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1406 DavSession *sn,
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
1407 const char *path,
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
1408 const char *name,
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1409 uint32_t finfo,
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1410 const char *fpath,
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1411 FILE *in,
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1412 off_t len)
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1413 {
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1414 DavResource *res = dav_query(sn, "select - from %s", path);
201
8e5856182668 auth input for dav get, put, mkdir and remove commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 200
diff changeset
1415
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1416 if(!res) {
24
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
1417 if(sn->error == DAV_NOT_FOUND) {
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1418 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
1419 if(dav_create(res)) {
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
1420 fprintf(stderr, "Cannot create resource.\n");
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
1421 return -1;
a317202ae787 implemented dav_create for non-collection resources
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 22
diff changeset
1422 }
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1423 } else {
198
44054c452de1 added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 197
diff changeset
1424 print_resource_error(sn, path);
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1425 return -1;
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1426 }
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1427 } else if(res->iscollection) {
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1428 // TODO: free res
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1429 char *newpath = util_concat_path(path, name);
353
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1430
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1431 if (!strcmp(path, newpath)) {
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1432 // TODO: free res
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1433 fprintf(stderr, "Cannot put file, because a collection with "
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1434 "that name already exists.\n");
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1435 free(newpath);
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1436 return -1;
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1437 }
e554f3d72d9e fixes infinite loop when trying to overwrite a collection with a regular file
Mike Becker <universe@uap-core.de>
parents: 352
diff changeset
1438
21
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1439 path = newpath;
78935b45e2ce fixed put bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 18
diff changeset
1440 res = dav_resource_new(sn, path);
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1441 int ret = put_file(repo, a, sn, res->path, NULL, finfo, fpath, in, len);
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1442 // TODO: free res
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1443 free(newpath);
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1444 return ret;
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1445 }
517
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1446
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1447 if(resource_set_finfo(fpath, res, finfo)) {
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1448 fprintf(stderr, "Cannot set finfo: %s.\n", strerror(errno));
8531b63accae adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 512
diff changeset
1449 }
539
8deb52292c99 fixes more if statements and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 526
diff changeset
1450 if((finfo & FINFO_XATTR) == FINFO_XATTR) {
618
4b34d12cf211 exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 611
diff changeset
1451 XAttributes *xattr = file_get_attributes(fpath, NULL, NULL);
520
da2b0cc44e4f adds xml attribute support and xattr property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 517
diff changeset
1452 if(xattr) {
da2b0cc44e4f adds xml attribute support and xattr property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 517
diff changeset
1453 resource_set_xattr(res, xattr);
da2b0cc44e4f adds xml attribute support and xattr property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 517
diff changeset
1454 }
da2b0cc44e4f adds xml attribute support and xattr property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 517
diff changeset
1455 }
12
493128ef1b12 added some options to put and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 11
diff changeset
1456
478
baa63fef5c5c fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 476
diff changeset
1457 dav_set_content(res, in, (dav_read_func)fread, (dav_seek_func)file_seek);
180
5b58389ab9dd fixed large file support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
1458 if(len > 0 && len < 0x7d000000) {
179
802b48ae791d enable sharepoint put fix
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 178
diff changeset
1459 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
1460 }
4
ae5a98f0545c added put method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 3
diff changeset
1461
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1462 if(dav_store(res)) {
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1463 print_resource_error(sn, res->path);
13
8a0cc4d90de7 added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 12
diff changeset
1464 fprintf(stderr, "Cannot upload file.\n");
22
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
1465 if(sn->errorstr) {
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
1466 fprintf(stderr, "%s\n", sn->errorstr);
e593f7e41be0 added more error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
1467 }
5
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1468 return -1;
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1469 }
88625853ae74 new webdav api + repository and key configuration + aes encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 4
diff changeset
1470 return 0;
1
1bcaac272cdf added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1471 }
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1472
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1473 static int dav_create_col(DavResource *res) {
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1474 res->iscollection = 1;
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1475 return dav_create(res);
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1476 }
28
4e46c65711ef added recursive put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 27
diff changeset
1477
628
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1478 static void print_cannoterr(DavSession *sn, const char *message) {
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1479 switch(sn->error) {
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1480 case DAV_UNSUPPORTED_PROTOCOL:
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1481 case DAV_COULDNT_RESOLVE_PROXY:
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1482 case DAV_COULDNT_RESOLVE_HOST:
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1483 case DAV_COULDNT_CONNECT:
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1484 case DAV_TIMEOUT:
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1485 case DAV_SSL_ERROR: break;
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1486 default: fprintf(stderr, "Cannot %s.\n", message);
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1487 }
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1488 }
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1489
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1490 static int cmd_operation_on_resources(CmdArgs* a,
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1491 int(*operation)(DavResource*),
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1492 const char* command,
683
53bcb5e47220 fix -c option for dav rm command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 674
diff changeset
1493 const char* message,
53bcb5e47220 fix -c option for dav rm command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 674
diff changeset
1494 DavBool check_key)
53bcb5e47220 fix -c option for dav rm command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 674
diff changeset
1495 {
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1496 if(a->argc < 1) {
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1497 fprintf(stderr, "Too few arguments\n");
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1498 fprintf(stderr, "Usage: dav %s\n", find_usage_str(command));
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1499 return -1;
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1500 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1501
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1502 char *url = a->argv[0];
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1503 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1504 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
1505 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1506
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1507 int exit_code = -1;
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1508 assert(!!path && !!sn);
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1509
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1510 if(set_session_config(sn, a)) {
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1511 goto cmd_oponres_exit;
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1512 }
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1513
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
1514 set_session_lock(sn, a);
45
e3839719b079 added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 43
diff changeset
1515
683
53bcb5e47220 fix -c option for dav rm command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 674
diff changeset
1516 if(check_key && check_encryption_key(a, sn)) {
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1517 goto cmd_oponres_exit;
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1518 }
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1519
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1520 DavResource *res = dav_resource_new(sn, path);
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1521 assert(!!res);
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1522 res->iscollection = 1;
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1523
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1524 if(a->argc == 1) {
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1525 if(operation(res)) {
628
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1526 print_cannoterr(sn, message);
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1527 print_resource_error(sn, res->path);
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1528 goto cmd_oponres_exit;
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1529 }
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1530 } else {
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1531 for(int i = 1 ; i < a->argc ;++i) {
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1532 DavResource *child = dav_resource_new_child(sn, res, a->argv[i]);
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1533 assert(!!child);
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1534 child->iscollection = 1;
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1535 if(operation(child)) {
628
1f76d9624db8 fix url2repo not creating a string dup in case a repo doesn't exist
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 618
diff changeset
1536 print_cannoterr(sn, message);
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1537 print_resource_error(sn, child->path);
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1538 goto cmd_oponres_exit;
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1539 }
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1540 }
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1541 }
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1542
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1543 exit_code = 0;
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1544 cmd_oponres_exit:
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1545 free(path);
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1546 dav_session_destroy(sn);
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1547 return exit_code;
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1548 }
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1549
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1550 int cmd_remove(CmdArgs *a) {
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1551 return cmd_operation_on_resources(a, dav_delete,
683
53bcb5e47220 fix -c option for dav rm command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 674
diff changeset
1552 "remove", "delete resource", FALSE);
15
182af08b4813 added remove command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
1553 }
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1554
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1555 int cmd_mkdir(CmdArgs *a) {
540
d18f92483945 adds multiple file support for mkdir and remove
Mike Becker <universe@uap-core.de>
parents: 539
diff changeset
1556 return cmd_operation_on_resources(a, dav_create_col,
683
53bcb5e47220 fix -c option for dav rm command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 674
diff changeset
1557 "mkdir", "create collection", TRUE);
16
5dbef9e07376 added mkdir command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
1558 }
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1559
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1560 int cmd_move(CmdArgs *a, int cp) {
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1561 const char* actionstr = cp ? "copy" : "move";
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1562
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1563 if(a->argc != 2) {
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1564 // 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
1565 fprintf(stderr, "Too %s arguments\n", a->argc < 2 ? "few":"many");
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1566 fprintf(stderr, "Usage: dav %s\n", find_usage_str(actionstr));
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1567 return -1;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1568 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1569
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1570 char *srcurl = a->argv[0];
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1571 char *srcpath = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1572 DavCfgRepository *srcrepo = dav_config_url2repo(get_config(), srcurl, &srcpath);
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1573
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
1574 DavSession *srcsn = connect_to_repo(ctx, srcrepo, srcpath, request_auth, a);
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1575 if(set_session_config(srcsn, a)) {
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1576 return -1;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1577 }
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1578 set_session_lock(srcsn, a);
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
1579
182
ca07f14f7bfe added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 181
diff changeset
1580 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
1581
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1582 char *desturl = a->argv[1];
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1583 char *destpath = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1584 DavCfgRepository *destrepo = dav_config_url2repo(get_config(), desturl, &destpath);
382
1ce7211a1021 fixes memory leak in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 380
diff changeset
1585
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1586 if(srcrepo == destrepo) {
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1587 DavResource *res = dav_resource_new(srcsn, srcpath);
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1588 int err = cp ? dav_copy_o(res, destpath, override)
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1589 : dav_move_o(res, destpath, override);
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1590 if(err) {
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1591 print_resource_error(srcsn, res->path);
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1592 fprintf(stderr, "Cannot %s resource.\n", actionstr);
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1593 return -1;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1594 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1595 } else {
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1596 char *srchost = util_url_base(srcrepo->url.value.ptr);
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1597 char *desthost = util_url_base(destrepo->url.value.ptr);
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1598 if(!strcmp(srchost, desthost)) {
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
1599 DavSession *destsn = connect_to_repo(ctx, destrepo, destpath, request_auth, a);
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1600 if(set_session_config(destsn, a)) {
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1601 return -1;
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1602 }
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1603 DavResource *dest = dav_resource_new(destsn, destpath);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1604 char *desthref = dav_resource_get_href(dest);
816
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
1605 desturl = util_get_url(destsn, desthref);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1606
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1607 DavResource *res = dav_resource_new(srcsn, srcpath);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1608 int err = cp ? dav_copyto(res, desturl, override)
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1609 : dav_moveto(res, desturl, override);
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1610
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1611 free(desturl);
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1612 dav_session_destroy(destsn);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1613
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1614 if(err) {
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1615 print_resource_error(srcsn, res->path);
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1616 fprintf(stderr, "Cannot %s resource.\n", actionstr);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1617 return -1;
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1618 }
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1619 } else {
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1620 fprintf(stderr, "Cannot %s between different hosts.\n", actionstr);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1621 return -1;
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1622 }
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1623 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1624
383
bc215bdaf9bc improves variable names in cmd_move()
Mike Becker <universe@uap-core.de>
parents: 382
diff changeset
1625 dav_session_destroy(srcsn);
186
05d11fbcaeb3 improved copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 185
diff changeset
1626
181
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1627 return 0;
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1628 }
a8f8cdbf85df implemented webdav copy and move method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
1629
498
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1630 int cmd_rename(CmdArgs *a) {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1631 if(a->argc != 2) {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1632 // TODO: change, when creation of multiple dirs is supported
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1633 fprintf(stderr, "Too %s arguments\n", a->argc < 2 ? "few":"many");
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1634 fprintf(stderr, "Usage: dav %s\n", find_usage_str("rename"));
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1635 return -1;
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1636 }
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1637
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1638 char *name = a->argv[1];
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1639 size_t namelen = strlen(name);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1640 for(size_t i=0;i<namelen;i++) {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1641 char c = name[i];
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1642 if(c == '/') {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1643 fprintf(stderr, "Illegal character in name: '/'\n");
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1644 return 1;
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1645 }
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1646 }
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1647
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1648 char *url = a->argv[0];
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1649 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1650 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
1651 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
498
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1652
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1653 if(set_session_config(sn, a)) {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1654 return -1;
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1655 }
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1656 set_session_lock(sn, a);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1657
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1658 int ret = 0;
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1659 DavResource *res = dav_get(sn, path, NULL);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1660 if(res) {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1661 char *cryptoname = dav_get_string_property_ns(res, DAV_NS, "crypto-name");
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1662 char *cryptokey = dav_get_string_property_ns(res, DAV_NS, "crypto-key");
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1663 if(cryptoname && cryptokey) {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1664 // encrypted resource with an encrypted name
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1665 // renaming is done by simply setting the crypto-name property
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1666
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1667 DavKey *key = dav_context_get_key(ctx, cryptokey);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1668 if(key) {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1669 // check if a resource with this name already exists
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1670 char *parent = util_parent_path(res->path);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1671 char *newpath = util_concat_path(parent, name);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1672 DavResource *testres = dav_resource_new(sn, newpath);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1673 if(dav_exists(testres)) {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1674 fprintf(stderr, "A resource with this name already exists.\nAbort.\n");
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1675 ret = 1;
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1676 } else {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1677 char *crname = aes_encrypt(name, namelen, key);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1678 dav_set_string_property_ns(res, DAV_NS, "crypto-name", crname);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1679 free(crname);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1680 if(dav_store(res)) {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1681 print_resource_error(sn, res->path);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1682 fprintf(stderr, "Cannot store crypto-name property.\n");
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1683 ret = 1;
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1684 }
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1685 }
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1686 free(parent);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1687 free(newpath);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1688 } else {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1689 fprintf(stderr, "Key %s not found.\n", cryptokey);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1690 }
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1691 } else {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1692 // rename the resource by changing the url mapping with MOVE
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1693
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1694 char *parent = util_parent_path(res->href);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1695 char *new_href = util_concat_path(parent, name);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1696 char *dest = util_get_url(sn, new_href);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1697 free(parent);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1698 free(new_href);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1699 if(dav_moveto(res, dest, false)) {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1700 print_resource_error(sn, path);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1701 fprintf(stderr, "Cannot rename resource.\n");
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1702 ret = 1;
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1703 }
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1704 free(dest);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1705 }
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1706 } else {
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1707 print_resource_error(sn, path);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1708 fprintf(stderr, "Cannot rename resource.\n");
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1709 ret = 1;
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1710 }
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1711
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1712
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1713 dav_session_destroy(sn);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1714 free(path);
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1715 return ret;
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1716 }
37af2eac3e6a adds rename command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
1717
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1718
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1719 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
1720 char **date_str = (char**)data;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1721
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1722 //printf("header: %.*s\n", s*n, header);
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
1723 cxstring h = cx_strn(header, s*n);
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
1724 if(cx_strprefix(h, cx_str("Date:"))) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
1725 cxstring v = cx_strsubs(h, 5);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
1726 *date_str = cx_strdup(cx_strtrim(v)).ptr;
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1727 }
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1728 return s*n;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1729 }
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1730
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1731 int cmd_date(CmdArgs *a) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1732 if(a->argc < 1) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1733 time_t now = time(NULL);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1734 struct tm *date = gmtime(&now);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1735 char str[32];
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1736 putenv("LC_TIME=C");
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1737 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
1738 fwrite(str, 1, len, stdout);
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1739 } else if (a->argc == 1) {
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1740 char *url = a->argv[0];
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1741 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1742 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
1743 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1744
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1745 DavResource *res = dav_resource_new(sn, path);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1746 char *date = NULL;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1747 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
1748 curl_easy_setopt(sn->handle, CURLOPT_WRITEHEADER, &date);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1749 if(dav_exists(res) && date) {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1750 printf("%s\n", date);
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1751 } else {
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1752 return -1;
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1753 }
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1754 free(path);
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1755 return 0;
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1756 } else {
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1757 fprintf(stderr, "Too many arguments\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1758 fprintf(stderr, "Usage: dav %s\n", find_usage_str("date"));
35
ad0c9dacd7e3 errors on too many arguments
Mike Becker <universe@uap-core.de>
parents: 34
diff changeset
1759 return -1;
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1760 }
43
03076907b58a added file name encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 40
diff changeset
1761 return 0;
29
938957a4eea7 added date command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 28
diff changeset
1762 }
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1763
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1764 int cmd_get_property(CmdArgs *a) {
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1765 if(a->argc < 2) {
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1766 fprintf(stderr, "Too few arguments\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1767 fprintf(stderr, "Usage: dav %s\n", find_usage_str("get-property"));
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1768 return -1;
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1769 }
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1770
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1771 char *url = a->argv[0];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1772 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1773 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
1774 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1775
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1776 if(set_session_config(sn, a)) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1777 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1778 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1779
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1780 char *namespace = cmd_getoption(a, "namespace");
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1781 char *property = a->argv[1];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1782
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1783 char *version = cmd_getoption(a, "version");
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1784
298
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1785 DavPropName propname;
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1786 if(namespace) {
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1787 propname.ns = namespace;
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1788 propname.name = property;
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1789 } else {
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1790 dav_get_property_namespace_str(ctx, property, &propname.ns, &propname.name);
317
7eea57f6d847 adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 316
diff changeset
1791 if(!propname.ns || !propname.name) {
7eea57f6d847 adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 316
diff changeset
1792 fprintf(stderr, "Error: unknown namespace prefix\n");
7eea57f6d847 adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 316
diff changeset
1793 return -1;
7eea57f6d847 adds namespace config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 316
diff changeset
1794 }
298
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1795 }
755b8198b071 dav get-property shouldn't send an allprop propfind request
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 297
diff changeset
1796
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1797 DavResource *res = dav_resource_new(sn, path);
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1798 if(version) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1799 DavResource *vres = find_version(res, version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1800 if(!vres) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1801 fprintf(stderr, "Cannot find version '%s' for resource.\n", version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1802 return -1;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1803 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1804 dav_resource_free_all(res);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1805 res = vres;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1806 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
1807
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1808 if(dav_load_prop(res, &propname, 1)) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1809 print_resource_error(sn, res->path);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1810 return -1;
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1811 }
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1812 free(path);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1813
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1814 DavXmlNode *x = dav_get_property_ns(res, propname.ns, propname.name);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1815 if(!x) {
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1816 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
1817 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1818 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1819
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1820 if(cmd_getoption(a, "xml")) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1821 // print a real xml document on stdout
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1822 printxmldoc(stdout, propname.name, propname.ns, x);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1823 } else {
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1824 // in this mode a simple string is printed on stdout
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1825 // or simplified and nicely formatted xml is printed on stderr
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1826 if(dav_xml_isstring(x)) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1827 printf("%s\n", dav_xml_getstring(x));
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1828 } else {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1829 char *str = xml2str(x);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1830 fprintf(stderr, "%s", str);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1831 free(str);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1832 }
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1833 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1834
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
1835 return 0;
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1836 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1837
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1838 int cmd_set_property(CmdArgs *a) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1839 if(a->argc < 2) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1840 fprintf(stderr, "Too few arguments\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1841 fprintf(stderr, "Usage: dav %s\n", find_usage_str("set-property"));
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1842 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1843 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1844
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1845 char *url = a->argv[0];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1846 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1847 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
1848 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1849
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1850 if(set_session_config(sn, a)) {
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1851 return -1;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1852 }
210
1d19e0ff18d9 added lock support to some dav commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 209
diff changeset
1853 set_session_lock(sn, a);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1854
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1855 DavResource *res = dav_resource_new(sn, path);
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1856 if(!dav_exists(res)) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1857 print_resource_error(sn, res->path);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1858 return -1;
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1859 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1860
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1861 char *namespace = cmd_getoption(a, "namespace");
371
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1862 char *xml = cmd_getoption(a, "xml");
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1863
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1864 char *property = a->argv[1];
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1865 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
1866
371
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1867 int ret = 0;
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1868 if(xml) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1869 DavXmlNode *xmlvalue = dav_parse_xml(sn, value, strlen(value));
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1870 if(xmlvalue) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1871 if(namespace) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1872 dav_set_property_ns(res, namespace, property, xmlvalue->children);
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1873 } else {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1874 dav_set_property(res, property, xmlvalue->children);
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1875 }
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1876 } else {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1877 fprintf(stderr, "Error: property content is not valid xml\n");
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1878 ret = 1;
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1879 }
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1880 } else {
371
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1881 if(namespace) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1882 dav_set_string_property_ns(res, namespace, property, value);
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1883 } else {
822
f9e40f5c6daf fix dav_set_string_property crash if an unknown namespace prefix was specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 816
diff changeset
1884 if(dav_set_string_property(res, property, value)) {
f9e40f5c6daf fix dav_set_string_property crash if an unknown namespace prefix was specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 816
diff changeset
1885 fprintf(stderr, "%s\n", res->session->errorstr);
f9e40f5c6daf fix dav_set_string_property crash if an unknown namespace prefix was specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 816
diff changeset
1886 }
371
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1887 }
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1888 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1889
371
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1890 if(ret == 0) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1891 if(dav_store(res)) {
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1892 print_resource_error(sn, res->path);
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1893 fprintf(stderr, "Cannot set property.\n");
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1894 ret = -1;
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1895 }
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1896 } else
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1897
74
da079dc0724c fixed many memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 73
diff changeset
1898 free(path);
371
604e7e335b3b adds support for xml properties in set-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 364
diff changeset
1899 dav_session_destroy(sn);
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
1900 return ret;
33
0bbbb0341606 some code cleanup and bug fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 32
diff changeset
1901 }
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
1902
304
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1903 int cmd_remove_property(CmdArgs *a) {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1904 if(a->argc < 2) {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1905 fprintf(stderr, "Too few arguments\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1906 fprintf(stderr, "Usage: dav %s\n", find_usage_str("remove-property"));
304
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1907 return -1;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1908 }
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1909
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1910 char *url = a->argv[0];
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1911 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1912 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
1913 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
304
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1914
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1915 if(set_session_config(sn, a)) {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1916 return -1;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1917 }
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1918
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1919 char *namespace = cmd_getoption(a, "namespace");
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1920 char *property = a->argv[1];
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1921
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1922 DavPropName propname;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1923 if(namespace) {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1924 propname.ns = namespace;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1925 propname.name = property;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1926 } else {
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1927 dav_get_property_namespace_str(ctx, property, &propname.ns, &propname.name);
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1928 }
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1929
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1930 int ret = 0;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1931 DavResource *res = dav_resource_new(sn, path);
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1932 dav_remove_property_ns(res, propname.ns, propname.name);
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1933
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1934 if(dav_store(res)) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1935 print_resource_error(sn, res->path);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1936 fprintf(stderr, "Cannot set property.\n");
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1937 ret = -1;
304
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1938 }
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1939
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1940 free(path);
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1941 return ret;
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1942 }
a4d3ff32d49c adds dav remove-property command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 298
diff changeset
1943
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1944 int cmd_lock(CmdArgs *a) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1945 if(a->argc != 1) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1946 fprintf(stderr, "Too %s arguments\n", a->argc > 1 ? "many" : "few");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
1947 fprintf(stderr, "Usage: dav %s\n", find_usage_str("lock"));
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1948 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1949 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1950
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1951 char *url = a->argv[0];
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1952 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
1953 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
1954 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
775
e5909dff0dbf update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 747
diff changeset
1955 cxMempoolRegister(sn->mp, path, free);
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1956
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1957 if(set_session_config(sn, a)) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1958 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1959 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1960
315
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1961 time_t timeout = 0;
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1962 char *timeoutstr = cmd_getoption(a, "timeout");
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1963 if(timeoutstr) {
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
1964 if(!cx_strcasecmp(cx_str(timeoutstr), cx_str("infinite"))) {
315
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1965 timeout = -1;
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1966 } else {
509
0576dd6409f3 fixed TODO: use strtol
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 508
diff changeset
1967 uint64_t i;
512
3320a015a3bc fixes signed vs unsigned inaccuracy for the -T option
Mike Becker <universe@uap-core.de>
parents: 511
diff changeset
1968 if(util_strtouint(timeoutstr, &i)) {
509
0576dd6409f3 fixed TODO: use strtol
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 508
diff changeset
1969 timeout = (time_t)i;
0576dd6409f3 fixed TODO: use strtol
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 508
diff changeset
1970 } else {
0576dd6409f3 fixed TODO: use strtol
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 508
diff changeset
1971 fprintf(stderr, "Error: -T option has invalid value\n");
0576dd6409f3 fixed TODO: use strtol
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 508
diff changeset
1972 return -1;
0576dd6409f3 fixed TODO: use strtol
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 508
diff changeset
1973 }
315
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1974 }
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1975 }
7db4dbf4e6f9 adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 309
diff changeset
1976
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1977 DavResource *res = dav_resource_new(sn, path);
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
1978 if(dav_lock_t(res, timeout)) {
264
94c0a938b66c fixes error detection loop in dav lock/unlock/get-property/set-property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 258
diff changeset
1979 print_resource_error(sn, res->path);
94c0a938b66c fixes error detection loop in dav lock/unlock/get-property/set-property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 258
diff changeset
1980 return -1;
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1981 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1982
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1983 DavLock *lock = dav_get_lock(sn, res->path);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1984 if(!lock) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1985 // this should really not happen
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1986 // do some damage control
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1987 dav_unlock(res);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1988 fprintf(stderr, "Error: Cannot find lock token for %s\n", res->path);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1989 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1990 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1991
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1992 printf("%s\n", lock->token);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1993
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1994 dav_session_destroy(sn);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1995 return 0;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1996 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1997
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
1998 static char* read_line() {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
1999 CxBuffer buf;
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
2000 cxBufferInit(&buf, cxDefaultAllocator, NULL, 128, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND);
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2001 int c;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2002 while((c = getchar()) != EOF) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2003 if(c == '\n') {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2004 break;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2005 }
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2006 cxBufferPut(&buf, c);
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2007 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2008 char *str = NULL;
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2009 cxstring line = cx_strtrim(cx_strn(buf.space, buf.size));
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2010 if(line.length != 0) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2011 str = cx_strdup(line).ptr;
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2012 }
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2013 cxBufferDestroy(&buf);
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2014 return str;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2015 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2016
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2017 int cmd_unlock(CmdArgs *a) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2018 if(a->argc != 1) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2019 fprintf(stderr, "Too %s arguments\n", a->argc > 1 ? "many" : "few");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
2020 fprintf(stderr, "Usage: dav %s\n", find_usage_str("unlock"));
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2021 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2022 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2023
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2024 char *url = a->argv[0];
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2025 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2026 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
2027 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
775
e5909dff0dbf update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 747
diff changeset
2028 cxMempoolRegister(sn->mp, path, free);
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2029 if(set_session_config(sn, a)) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2030 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2031 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2032
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2033 char *locktoken = cmd_getoption(a, "lock");
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2034 if(locktoken) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2035 DavLock *lock = dav_create_lock(sn, locktoken, NULL);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2036 dav_add_collection_lock(sn, "/", lock);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2037 } else {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2038 locktoken = read_line();
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2039 if(!locktoken) {
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2040 fprintf(stderr, "No lock token specified.\nAbort.\n");
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2041 return -1;
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2042 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2043 DavLock *lock = dav_create_lock(sn, locktoken, NULL);
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2044 dav_add_collection_lock(sn, "/", lock);
230
fdcbde1d7d65 fixed memory leaks in lock and unlock commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 229
diff changeset
2045 free(locktoken);
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2046 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2047
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2048 int ret = 0;
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2049 DavResource *res = dav_resource_new(sn, path);
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2050 if(dav_unlock(res)) {
264
94c0a938b66c fixes error detection loop in dav lock/unlock/get-property/set-property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 258
diff changeset
2051 print_resource_error(sn, res->path);
94c0a938b66c fixes error detection loop in dav lock/unlock/get-property/set-property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 258
diff changeset
2052 ret = -1;
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2053 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2054
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2055 dav_session_destroy(sn);
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2056 return ret;
209
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2057 }
d24761f1e07c added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 207
diff changeset
2058
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2059 static int count_children(DavResource *res) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2060 DavResource *child = res->children;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2061 int count = 0;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2062 while(child) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2063 count++;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2064 child = child->next;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2065 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2066 return count;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2067 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2068
373
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2069 void print_xml_infostr(DavXmlNode *xml) {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2070 if(xml->children) {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2071 printf("<%s>...</%s>", xml->name, xml->name);
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2072 } else {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2073 printf("<%s/>", xml->name);
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2074 }
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2075 }
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2076
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2077 int cmd_info(CmdArgs *a) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2078 if(a->argc < 1) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2079 fprintf(stderr, "Too few arguments\n");
332
5587282ebe1c dav prints command usage info if argument count is wrong
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 331
diff changeset
2080 fprintf(stderr, "Usage: dav %s\n", find_usage_str("info"));
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2081 return -1;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2082 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2083
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2084 char *url = a->argv[0];
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2085 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2086 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
2087 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2088
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2089 if(set_session_config(sn, a)) {
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2090 return -1;
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2091 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2092
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2093 char *version = cmd_getoption(a, "version");
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2094
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2095 DavResource *res = dav_resource_new(sn, path);
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2096 if(version) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2097 DavResource *vres = find_version(res, version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2098 if(!vres) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2099 fprintf(stderr, "Cannot find version '%s' for resource.\n", version);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2100 return -1;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2101 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2102 dav_resource_free_all(res);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2103 res = vres;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2104 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2105
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2106 if(!dav_load(res)) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2107 printf("name: %s\n", res->name);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2108 printf("path: %s\n", res->path);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2109
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2110 char *server = util_url_base(sn->base_url);
816
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
2111 url = util_concat_path(server, res->href);
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2112 printf("url: %s\n", url);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2113 free(url);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2114 free(server);
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2115
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2116 if(res->iscollection) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2117 printf("type: collection\n");
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2118 printf("size: %d\n", count_children(res));
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2119 } else {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2120 printf("type: resource\n");
723
5ca174b3247a add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 720
diff changeset
2121 char *len = util_size_str(res->iscollection, res->contentlength);
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2122 printf("size: %s\n", len);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2123 free(len);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2124 }
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2125
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2126 size_t count = 0;
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2127 DavPropName *properties = dav_get_property_names(res, &count);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2128
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2129 char *last_ns = NULL;
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2130 for(int i=0;i<count;i++) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2131 DavPropName p = properties[i];
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2132 if(!last_ns || strcmp(last_ns, p.ns)) {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2133 printf("\nnamespace: %s\n", p.ns);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2134 last_ns = p.ns;
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2135 }
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2136
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2137 DavXmlNode *xval = dav_get_property_ns(res, p.ns, p.name);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2138 if(dav_xml_isstring(xval)) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2139 cxstring value = cx_str(dav_xml_getstring(xval));
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2140 printf(" %s: %.*s\n", p.name, (int)value.length, value.ptr);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2141 } else {
373
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2142 // find some xml elements
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2143 printf(" %s: ", p.name);
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2144 DavXmlNode *x = xval->type == DAV_XML_ELEMENT ? xval : dav_xml_nextelm(xval);
816
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
2145 for(int j=0;j<3;j++) {
373
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2146 if(x) {
816
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
2147 if(j == 2) {
373
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2148 printf(" ...");
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2149 break;
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2150 } else {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2151 print_xml_infostr(x);
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2152 }
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2153 } else {
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2154 break;
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2155 }
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2156 x = dav_xml_nextelm(x);
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2157 }
dcc03142eb5f dav info prints simplified xml values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 371
diff changeset
2158 printf("\n");
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2159 }
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2160 }
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2161
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2162 dav_session_free(sn, properties);
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2163 return 0;
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2164 } else {
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2165 print_resource_error(sn, res->path);
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2166 }
354
067ea2315a8a moves auth prompt functionality to libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 353
diff changeset
2167
258
571b62700df6 adds auth prompt to dav get-property, set-property, lock, unlock and info
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
2168 return -1;
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2169 }
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2170
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2171 int cmd_checkout(CmdArgs *a) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2172 if(a->argc < 1) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2173 fprintf(stderr, "Too few arguments\n");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2174 fprintf(stderr, "Usage: dav %s\n", "checkout [-pc] <url>");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2175 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2176 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2177
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2178 char *url = a->argv[0];
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2179 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2180 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
2181 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2182
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2183 if(set_session_config(sn, a)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2184 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2185 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2186 set_session_lock(sn, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2187
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2188 int ret = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2189 DavResource *res = dav_resource_new(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2190 if(dav_checkout(res)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2191 print_resource_error(sn, res->path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2192 ret = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2193 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2194
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2195 return ret;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2196 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2197
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2198 int cmd_checkin(CmdArgs *a) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2199 if(a->argc < 1) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2200 fprintf(stderr, "Too few arguments\n");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2201 fprintf(stderr, "Usage: dav %s\n", "checkin [-pc] <url>");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2202 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2203 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2204
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2205 char *url = a->argv[0];
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2206 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2207 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
2208 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2209
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2210 if(set_session_config(sn, a)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2211 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2212 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2213 set_session_lock(sn, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2214
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2215 int ret = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2216 DavResource *res = dav_resource_new(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2217 if(dav_checkin(res)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2218 print_resource_error(sn, res->path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2219 ret = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2220 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2221
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2222 return ret;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2223 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2224
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2225 int cmd_uncheckout(CmdArgs *a) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2226 if(a->argc < 1) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2227 fprintf(stderr, "Too few arguments\n");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2228 fprintf(stderr, "Usage: dav %s\n", "uncheckout [-pc] <url>");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2229 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2230 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2231
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2232 char *url = a->argv[0];
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2233 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2234 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
2235 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2236
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2237 if(set_session_config(sn, a)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2238 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2239 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2240 set_session_lock(sn, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2241
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2242 int ret = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2243 DavResource *res = dav_resource_new(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2244 if(dav_uncheckout(res)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2245 print_resource_error(sn, res->path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2246 ret = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2247 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2248
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2249 return ret;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2250 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2251 int cmd_versioncontrol(CmdArgs *a) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2252 if(a->argc < 1) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2253 fprintf(stderr, "Too few arguments\n");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2254 fprintf(stderr, "Usage: dav %s\n", "versioncontrol [-pc] <url>");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2255 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2256 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2257
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2258 char *url = a->argv[0];
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2259 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2260 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
2261 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2262
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2263 if(set_session_config(sn, a)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2264 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2265 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2266 set_session_lock(sn, a);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2267
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2268 int ret = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2269 DavResource *res = dav_resource_new(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2270 if(dav_versioncontrol(res)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2271 print_resource_error(sn, res->path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2272 ret = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2273 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2274
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2275 return ret;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2276 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2277
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2278 int cmd_list_versions(CmdArgs *a) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2279 if(a->argc < 1) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2280 fprintf(stderr, "Too few arguments\n");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2281 fprintf(stderr, "Usage: dav %s\n", "list-versions [-pc] <url>");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2282 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2283 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2284
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2285 char *url = a->argv[0];
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2286 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2287 DavCfgRepository *repo = dav_config_url2repo(get_config(), url, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
2288 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, a);
475
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2289
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2290 if(set_session_config(sn, a)) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2291 return -1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2292 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2293
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2294 DavResource *res = dav_resource_new(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2295
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2296 int ret = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2297 DavResource *list = dav_versiontree(res, NULL);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2298 if(list) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2299 char* longlist = cmd_getoption(a, "list");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2300
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2301 DavResource *v = list;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2302 int addnl = 0;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2303 while(v) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2304 char *vname = dav_get_string_property(v, "D:version-name");
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2305
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2306 if(longlist) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2307 if(addnl) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2308 putchar('\n');
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2309 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2310 printf("name: %s\n", vname);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2311 printf("href: %s\n", v->href);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2312 addnl = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2313 } else {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2314 printf("%s\n", vname);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2315 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2316 v = v->next;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2317 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2318 } else if(sn->error != DAV_OK) {
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2319 print_resource_error(sn, path);
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2320 ret = 1;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2321 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2322
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2323 return ret;
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2324 }
52e4171d42ce adds minimal deltav implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 474
diff changeset
2325
476
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2326 DavResource* find_version(DavResource *res, char *version) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2327 DavResource *list = dav_versiontree(res, NULL);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2328 DavResource *ret = NULL;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2329 while(list) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2330 DavResource *next = list->next;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2331 if(!ret) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2332 char *vname = dav_get_string_property(list, "D:version-name");
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2333 if(vname && !strcmp(vname, version)) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2334 ret = list;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2335 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2336 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2337 if(list != ret) {
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2338 dav_resource_free(list);
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2339 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2340 list = next;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2341 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2342 return ret;
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2343 }
b4e3453e2b49 adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 475
diff changeset
2344
84
7fca3788261d added info command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 75
diff changeset
2345
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2346 char* stdin2str() {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2347 CxBuffer buf;
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
2348 cxBufferInit(&buf, cxDefaultAllocator, NULL, 1024, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND);
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2349 size_t size = cx_stream_copy(stdin, &buf, (cx_read_func)fread, (cx_write_func)cxBufferWrite);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2350 if(size == 0) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2351 cxBufferDestroy(&buf);
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2352 return NULL;
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2353 } else {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2354 cxBufferPut(&buf, '\0');
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2355 return buf.space;
62
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2356 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2357 }
3b813c57c106 added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
2358
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2359 static void xml2str_i(DavXmlNode *node, CxBuffer *buf, int indent) {
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2360 while(node) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2361 if(node->type == DAV_XML_ELEMENT) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2362 if(node->children) {
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2363 if(dav_xml_isstring(node->children)) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2364 cxstring s = cx_strtrim(cx_str(dav_xml_getstring(node->children)));
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2365 cx_bprintf(
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2366 buf,
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2367 "%*s<%s>%.*s</%s>\n",
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2368 indent,
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2369 "",
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2370 node->name,
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2371 (int)s.length,
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2372 s.ptr,
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2373 node->name);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2374 } else {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2375 cx_bprintf(buf, "%*s<%s>\n", indent, "", node->name);
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2376 xml2str_i(node->children, buf, indent+2);
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2377 cx_bprintf(buf, "%*s</%s>\n", indent, "", node->name);
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2378 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2379 } else {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2380 cx_bprintf(buf, "%*s<%s />", indent, "", node->name);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2381 cxBufferPut(buf, '\n');
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2382 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2383 } else if(node->type == DAV_XML_TEXT) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2384 cxstring val = cx_strtrim(cx_strn(node->content, node->contentlength));
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2385 if(val.length > 0) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2386 cx_bprintf(buf, "%*.*s", indent, (int)val.length, val.ptr);
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2387 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2388 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2389
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2390 node = node->next;
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2391 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2392 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2393
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2394 char* xml2str(DavXmlNode *node) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2395 CxBuffer buf;
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
2396 cxBufferInit(&buf, cxDefaultAllocator, NULL, 256, CX_BUFFER_AUTO_EXTEND);
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2397 xml2str_i(node, &buf, 0);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2398 cxBufferPut(&buf, 0);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2399 return buf.space;
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2400 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2401
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2402 void printxmldoc(FILE *out, char *root, char *rootns, DavXmlNode *content) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2403 CxMap *nsmap = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16);
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
2404 cxSetDestructor(nsmap, free);
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2405
849
c949c6ab5346 fix crash in printxmldoc, fixes #514
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 841
diff changeset
2406 cxMapPut(nsmap, cx_hash_key_str(rootns), strdup("x0"));
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2407 fprintf(out, "%s", "<?xml version=\"1.0\"?>\n");
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2408 fprintf(out, "<x0:%s xmlns:x0=\"%s\">", root, rootns);
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2409
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2410 dav_print_node(out, (cx_write_func)fwrite, nsmap, content);
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2411
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2412 fprintf(out, "</x0:%s>\n", root);
361
b6f2462ee055 adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 355
diff changeset
2413
b6f2462ee055 adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 355
diff changeset
2414 // cleanup namespace map
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 849
diff changeset
2415 cxMapFree(nsmap);
338
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2416 }
c7f3fe4abdb2 dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 334
diff changeset
2417
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2418
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2419 /* ---------- config commands ---------- */
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2420
195
4b7823a58199 fixed add-repository function name
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 194
diff changeset
2421 int cmd_add_repository(CmdArgs *args) {
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2422 printf("Each repository must have an unique name.\n");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2423 char *name = assistant_getcfg("name");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2424 if(!name) {
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2425 fprintf(stderr, "Abort\n");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2426 return -1;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2427 }
796
81e0f67386a6 remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 795
diff changeset
2428 if(dav_config_get_repository(get_config(), cx_str(name))) {
200
cc474cf2c2f5 added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 199
diff changeset
2429 fprintf(stderr, "Repository %s already exists.\nAbort\n", name);
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2430 return -1;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2431 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2432
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2433 printf("\nSpecify the repository base url.\n");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2434 char *url = assistant_getcfg("url");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2435 if(!url) {
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2436 fprintf(stderr, "Abort\n");
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2437 return -1;
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2438 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2439
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2440 printf("\nUser for HTTP authentication.\n");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2441 char *user = assistant_getoptcfg("user");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2442
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2443 char *password = NULL;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2444 if(user) {
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2445 password = assistant_gethiddenoptcfg("password");
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2446 }
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2447 printf("\n");
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2448
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2449 DavConfig *config = get_config();
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2450 const CxAllocator *a = config->mp->allocator;
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2451 DavCfgRepository *repo = dav_repository_new(config);
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2452
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2453 repo->name.value = cx_strdup_a(a, cx_str(name));
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2454 repo->url.value = cx_strdup_a(a, cx_str(url));
827
d9928f11970f fix load_config stores wrong xml doc pointer in the config object
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 822
diff changeset
2455
d9928f11970f fix load_config stores wrong xml doc pointer in the config object
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 822
diff changeset
2456 cxstring user_s = user ? cx_str(user) : cx_strn(NULL, 0);
d9928f11970f fix load_config stores wrong xml doc pointer in the config object
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 822
diff changeset
2457 cxstring password_s = password ? cx_str(password) : cx_strn(NULL, 0);
d9928f11970f fix load_config stores wrong xml doc pointer in the config object
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 822
diff changeset
2458 dav_repository_set_auth(config, repo, user_s, password_s);
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2459
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2460 dav_config_add_repository(config, repo);
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2461
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2462 int ret = 0;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2463 if(store_config()) {
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2464 fprintf(stderr, "Cannot write config.xml\n");
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2465 ret = -1;
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2466 } else {
200
cc474cf2c2f5 added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 199
diff changeset
2467 printf("\nAdded repository: %s (%s)\n", name, url);
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2468 }
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2469
197
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2470 free(name);
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2471 free(url);
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2472 if(user) {
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2473 free(user);
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2474 }
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2475 if(password) {
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2476 free(password);
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2477 }
79a866256be4 added cleanup code in cmd_add_repository
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 196
diff changeset
2478
194
1950f483d3c4 added add-repository command to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
2479 return ret;
119
451607eeff05 added initial code for config commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 107
diff changeset
2480 }
398
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2481
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2482 int cmd_remove_repository(CmdArgs *args) {
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2483 if(args->argc < 1) {
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2484 fprintf(stderr, "Too few arguments\n");
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2485 fprintf(stderr, "Usage: dav remove-repository <name...>\n");
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2486 return -1;
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2487 }
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2488
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2489 DavConfig *config = get_config();
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2490
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2491 DavBool store = FALSE;
398
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2492 for(int i = 0 ; i < args->argc ; i++) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2493 cxstring reponame = cx_str(args->argv[i]);
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2494 DavCfgRepository* repo = dav_config_get_repository(config, reponame);
398
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2495 if(repo) {
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2496 dav_repository_remove_and_free(config, repo);
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2497 store = TRUE;
398
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2498 } else {
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2499 fprintf(stderr, "Repository %s does not exist - skipped.\n",
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2500 reponame.ptr);
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2501 return -1;
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2502 }
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2503 }
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2504
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2505 if(store) {
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2506 return store_config();
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2507 } else {
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2508 return -1;
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2509 }
398
26fdeed98cd7 adds remove-repository command
Mike Becker <universe@uap-core.de>
parents: 384
diff changeset
2510 }
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2511
798
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
2512 int cmd_list_repositories(void) {
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
2513 DavConfig *config = get_config();
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
2514 if(!config) {
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
2515 return 1;
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
2516 }
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
2517 for(DavCfgRepository *repo=config->repositories;repo;repo=repo->next) {
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
2518 printf("%.*s\n", (int)repo->name.value.length, repo->name.value.ptr);
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
2519 }
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
2520 return 0;
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
2521 }
d7f5067a27ce remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
Mike Becker <universe@uap-core.de>
parents: 796
diff changeset
2522
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2523 int cmd_repository_url(CmdArgs *args) {
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2524 if(args->argc != 1) {
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2525 fprintf(stderr, "Too few arguments\n");
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2526 fprintf(stderr, "Usage: dav repository-url [-p] <name>\n");
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2527 return -1;
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2528 }
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2529
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2530 cxstring reponame = cx_str(args->argv[0]);
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2531 DavCfgRepository* repo = dav_config_get_repository(get_config(), reponame);
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2532 if(repo) {
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2533 cxstring url = cx_strcast(repo->url.value);
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2534 if(repo->user.value.ptr && !cmd_getoption(args, "plain")) {
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2535 int hostindex = 0;
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
2536 if(cx_strprefix(url, cx_str("https://"))) {
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2537 printf("https://");
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2538 hostindex = 8;
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
2539 } else if(cx_strprefix(url, cx_str("http://"))) {
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2540 printf("http://");
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2541 hostindex = 7;
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2542 }
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2543 printf("%.*s", (int)repo->user.value.length, repo->user.value.ptr);
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
2544 if(repo->password.value.ptr) {
811
9385330bdd38 fix dav repo-url command containing the password base64 encoded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 806
diff changeset
2545 cxmutstr pw_decoded = dav_repository_get_decodedpassword(repo);
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2546 CURL *curl = curl_easy_init();
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2547 char *pw = curl_easy_escape(
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2548 curl,
811
9385330bdd38 fix dav repo-url command containing the password base64 encoded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 806
diff changeset
2549 pw_decoded.ptr,
9385330bdd38 fix dav repo-url command containing the password base64 encoded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 806
diff changeset
2550 pw_decoded.length);
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2551 printf(":%s", pw);
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2552 curl_free(pw);
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2553 curl_easy_cleanup(curl);
811
9385330bdd38 fix dav repo-url command containing the password base64 encoded
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 806
diff changeset
2554 free(pw_decoded.ptr);
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2555 }
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2556 putchar('@');
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2557 printf("%.*s", (int)url.length-hostindex, url.ptr+hostindex);
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2558 } else {
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2559 printf("%s", url.ptr);
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2560 }
421
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2561 if(url.ptr[url.length-1] != '/') {
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2562 putchar('/');
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2563 }
178dc32c8c9a adds user+pw to repo-url output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 419
diff changeset
2564 putchar('\n');
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2565 } else {
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2566 fprintf(stderr, "Repository %s does not exist.\n", reponame.ptr);
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2567 return -1;
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2568 }
488
29b979ca8750 adds dav_pw2key commoncrypto implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 478
diff changeset
2569 return 0;
419
0b48f935f8a6 adds repository-url command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 412
diff changeset
2570 }
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2571
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2572
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2573 typedef int(*sscmd_func)(CmdArgs *, PwdStore *, void *userdata);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2574
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2575 static int secretstore_after_decrypt(
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2576 CmdArgs *args,
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2577 PwdStore *secrets,
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2578 sscmd_func cb,
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2579 void *userdata);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2580
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2581
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2582 /*
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2583 * opens the secret store, executes a callback func before and after
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2584 * decryption
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2585 * Aborts if a callback returns 1
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2586 */
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2587 static int secretstore_cmd(
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2588 CmdArgs *args,
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2589 DavBool create,
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2590 sscmd_func beforedecrypt,
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2591 sscmd_func afterdecrypt,
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2592 void *userdata)
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2593 {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2594 PwdStore *secrets = get_pwdstore();
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2595 if(!secrets) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2596 if(create) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2597 secrets = pwdstore_new();
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2598 } else {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2599 return 1;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2600 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2601 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2602
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2603 int ret = 0;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2604 if(beforedecrypt) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2605 ret = beforedecrypt(args, secrets, userdata);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2606 if(ret) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2607 afterdecrypt = NULL; // exit
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2608 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2609 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2610
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2611 if(afterdecrypt) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2612 ret = secretstore_after_decrypt(args, secrets, afterdecrypt, userdata);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2613 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2614
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2615 pwdstore_free(secrets);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2616
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2617 return ret;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2618 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2619
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2620 static int secretstore_after_decrypt(
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2621 CmdArgs *args,
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2622 PwdStore *secrets,
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2623 sscmd_func cb,
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2624 void *userdata)
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2625 {
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2626 char *master_pw = util_password_input("Master password: ");
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2627 if(!master_pw) {
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2628 fprintf(stderr, "Error: master password required.\nAbort.\n");
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2629 return 1;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2630 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2631
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2632 int err = pwdstore_setpassword(secrets, master_pw);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2633 free(master_pw);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2634 if(err) {
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2635 fprintf(stderr, "Error: Cannot generate key from password.\nAbort.\n");
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2636 return 1;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2637 }
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2638
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2639 if(pwdstore_decrypt(secrets)) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2640 fprintf(stderr, "Error: Cannot decrypt secrets store.\nAbort.\n");
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2641 return 1;
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2642 }
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2643
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2644 return cb(args, secrets, userdata);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2645 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2646
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2647 static int cmd_ss_add_user(CmdArgs *Args, PwdStore *secrets, void *userdata) {
472
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
2648 char *id = assistant_getcfg("Credentials identifier");
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2649 if(!id) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2650 fprintf(stderr, "Identifier required.\n");
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2651 return 1;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2652 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2653 if(pwdstore_get(secrets, id)) {
653
f503c272bd70 update secret store format description
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 652
diff changeset
2654 fprintf(stderr, "Credentials with this id already exist.\n");
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2655 return 1;
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2656 }
472
08d2d1263429 new secrets store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 471
diff changeset
2657
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2658 // get user name and password (required)
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2659 char *user = assistant_getcfg("User");
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2660 char *password = util_password_input("Password: ");
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2661
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2662 // optionally, get one or more locations
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2663 char *location = NULL;
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
2664 CxList *locations = cxLinkedListCreate(NULL, CX_STORE_POINTERS);
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
2665 cxSetDestructor(locations, free);
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2666 while((location = assistant_getoptcfg("Location"))) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2667 cxListAdd(locations, location);
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2668 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2669
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2670 int ret = 1;
732
b0eb645cd26e fix error in dav add-user, if .dav dir doesn't exists
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 731
diff changeset
2671 if(user && password) {
489
fb69eae42ef0 credentials can have multiple locations now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 488
diff changeset
2672 pwdstore_put_index(secrets, id, locations);
474
017a4f09e6fa improves secret store file format
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 473
diff changeset
2673 pwdstore_put(secrets, id, user, password);
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2674 ret = pwdstore_save(secrets);
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2675 if(ret) {
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2676 fprintf(stderr, "Error: saving srcrets store failed.\n");
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2677 }
841
21403bdaf54c add pwdstore_clone function and fix some pwdstore bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 833
diff changeset
2678 if(cxListSize(locations) == 0) {
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 849
diff changeset
2679 cxListFree(locations);
841
21403bdaf54c add pwdstore_clone function and fix some pwdstore bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 833
diff changeset
2680 }
21403bdaf54c add pwdstore_clone function and fix some pwdstore bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 833
diff changeset
2681 } else {
852
83fdf679df99 update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 849
diff changeset
2682 cxListFree(locations);
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2683 }
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2684
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2685 if(id) free(id);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2686 if(user) free(user);
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2687 if(password) free(password);
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2688
473
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2689
6740adb5fccd adds support for location credentials
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 472
diff changeset
2690 return ret;
470
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2691 }
6bf798ad3aec adds encrypted password store
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 458
diff changeset
2692
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2693 int cmd_add_user(CmdArgs *args) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2694 return secretstore_cmd(args, TRUE, NULL, cmd_ss_add_user, NULL);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2695 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2696
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2697 /*
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2698 * called before the secret store is decrypted
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2699 */
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2700 static int cmd_ss_list_users_bc(CmdArgs *Args, PwdStore *secrets, int *ret) {
816
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
2701 if(cxMapSize(secrets->index) == 0) {
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2702 return 1; // abort, because the secret store is empty
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2703 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2704 // set ret to 1, because decrypt could fail and this should be an error
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2705 *ret = 1;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2706 return 0;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2707 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2708
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2709 /*
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2710 * called after the secret store is decrypted
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2711 */
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2712 static int cmd_ss_list_users(CmdArgs *args, PwdStore *secrets, int *ret) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2713 *ret = 0;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2714
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2715 CxList *list = secrets->locations;
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2716 for(int i=0;i<2;i++) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2717 if(list) {
816
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
2718 CxIterator iter = cxListIterator(list);
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
2719 cx_foreach(PwdIndexEntry*, index, iter) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2720 PwdEntry *e = cxMapGet(secrets->ids, cx_hash_key_str(index->id));
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2721 if(e) {
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2722 printf("Id: %s\n", e->id);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2723 printf("User: %s\n", e->user);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2724 if(index->locations) {
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2725 CxIterator loc_iter = cxListIterator(index->locations);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2726 cx_foreach(char *, location, loc_iter) {
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2727 printf("Location: %s\n", location);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2728 }
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2729 printf("\n");
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2730 }
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2731 } else {
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2732 // broken index
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2733 fprintf(stderr,
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2734 "Warning: id '%s' not in secret store.\n",
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2735 index->id);
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2736 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2737 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2738 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2739 list = secrets->noloc;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2740 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2741
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2742
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2743 return 0;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2744 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2745
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2746 int cmd_list_users(CmdArgs *args) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2747 int ret = 0;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2748 secretstore_cmd(args, FALSE, (sscmd_func)cmd_ss_list_users_bc, (sscmd_func)cmd_ss_list_users, &ret);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2749 return ret;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2750 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2751
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2752
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2753 static int cmd_ss_remove_user(CmdArgs *args, PwdStore *secrets, void *ud) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2754 char *id = assistant_getcfg("Credentials identifier");
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2755 if(!id) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2756 fprintf(stderr, "Identifier required.\n");
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2757 return 1;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2758 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2759 if(!pwdstore_get(secrets, id)) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2760 fprintf(stderr, "Credentials with this id doesn't exist.\n");
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2761 free(id);
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2762 return 1;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2763 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2764
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2765 pwdstore_remove_entry(secrets, id);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2766
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2767 int ret = pwdstore_save(secrets);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2768 if(ret) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2769 fprintf(stderr, "Error: saving srcrets store failed.\n");
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2770 }
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2771 free(id);
654
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2772 return ret;
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2773 }
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2774
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2775 int cmd_remove_user(CmdArgs *args) {
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2776 return secretstore_cmd(args, FALSE, NULL, cmd_ss_remove_user, NULL);
8f2b8f2a5cde add remove-user and list-users commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 653
diff changeset
2777 }
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
2778
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2779 static void secrets_print_user_info(PwdStore *secrets, const char *id) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2780 PwdEntry *entry = pwdstore_get(secrets, id);
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2781 if(!entry) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2782 return;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2783 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2784
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2785 PwdIndexEntry *index = cxMapGet(secrets->index, cx_hash_key_str(id));
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2786 if(!index) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2787 return;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2788 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2789
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2790 printf("Id: %s\n", entry->id);
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2791 printf("User: %s\n", entry->user);
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2792 if(index->locations) {
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2793 CxIterator loc_iter = cxListIterator(index->locations);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2794 cx_foreach(char *, location, loc_iter) {
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2795 printf("Location: %s\n", location);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2796 }
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2797 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2798 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2799
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2800 static void secrets_remove_location(PwdIndexEntry *index) {
816
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
2801 if(!index->locations || cxListSize(index->locations) == 0) {
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2802 printf("no locations\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2803 return;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2804 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2805
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2806 printf("0: abort\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2807 int i = 1;
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2808 CxIterator loc_iter = cxListIterator(index->locations);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2809 cx_foreach(char *, location, loc_iter) {
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2810 printf("%d: %s\n", i, location);
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2811 i++;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2812 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2813
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2814 char *input = assistant_getcfg("Choose location");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2815 if(!input) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2816 return;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2817 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2818
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2819 int64_t ln = 0;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2820 if(util_strtoint(input, &ln) && (ln >= 0 && ln < i)) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2821 if(ln == 0) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2822 return;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2823 } else {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2824 char *location = cxListAt(index->locations, ln - 1);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2825 if(location) {
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2826 free(location);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2827 cxListRemove(index->locations, ln - 1);
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2828 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2829 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2830 } else {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2831 printf("illegal input, choose 0 - %d\n", i-1);
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2832 secrets_remove_location(index); // try again
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2833 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2834 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2835
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2836 static int cmd_ss_edit_user(CmdArgs *args, PwdStore *secrets, void *ud) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2837 char *id = assistant_getcfg("Credentials identifier");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2838 if(!id) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2839 fprintf(stderr, "Identifier required.\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2840 return 1;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2841 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2842 PwdEntry *entry = pwdstore_get(secrets, id);
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2843 PwdIndexEntry *index = cxMapGet(secrets->index, cx_hash_key_str(id));
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2844 if(!entry || !index) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2845 fprintf(stderr, "Credentials with this id doesn't exist.\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2846 return 1;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2847 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2848
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2849 secrets_print_user_info(secrets, id);
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2850
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2851 int save = 0;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2852 int loop = 1;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2853 while(loop) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2854 printf("\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2855 printf("0: change user name\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2856 printf("1: change password\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2857 printf("2: add location\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2858 printf("3: remove location\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2859 printf("4: list locations\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2860 printf("5: save and exit\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2861 printf("6: exit without saving\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2862
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2863 char *opt = assistant_getcfg("Choose action");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2864 if(!opt) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2865 break;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2866 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2867 int64_t mnu = 0;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2868 if(util_strtoint(opt, &mnu) && (mnu >= 0 && mnu <= 6)) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2869 printf("\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2870 switch(mnu) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2871 case 0: {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2872 // change user name
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2873 char *user = assistant_getcfg("User");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2874 if(user) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2875 if(entry->user) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2876 free(entry->user);
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2877 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2878 entry->user = user;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2879 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2880 break;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2881 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2882 case 1: {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2883 // change password
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2884 char *password = util_password_input("Password: ");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2885 if(password) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2886 if(entry->password) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2887 free(entry->password);
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2888 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2889 entry->password = password;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2890 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2891 break;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2892 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2893 case 2: {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2894 // add location
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2895 char *location = assistant_getoptcfg("Location");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2896 if(location) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2897 cxListAdd(index->locations, location);
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2898 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2899 break;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2900 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2901 case 3: {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2902 // remove location
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2903 secrets_remove_location(index);
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2904 break;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2905 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2906 case 4: {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2907 // list locations
816
839fefbdedc7 compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents: 811
diff changeset
2908 if(!index->locations || cxListSize(index->locations)) {
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2909 printf("no locations\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2910 } else {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2911 CxIterator i = cxListIterator(index->locations);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2912 cx_foreach(char *, location, i) {
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2913 printf("Location: %s\n", location);
655
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2914 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2915 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2916 break;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2917 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2918 case 5: {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2919 // save and exit
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2920 loop = 0;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2921 save = 1;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2922 break;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2923 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2924 case 6: {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2925 // exit without saving
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2926 loop = 0;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2927 break;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2928 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2929 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2930 } else {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2931 printf("illegal input, choose 0 - 5\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2932 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2933 free(opt);
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2934 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2935
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2936 int ret = 0;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2937 if(save) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2938 ret = pwdstore_save(secrets);
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2939 if(ret) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2940 fprintf(stderr, "Error: saving srcrets store failed.\n");
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2941 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2942 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2943 return ret;
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2944 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2945
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2946 int cmd_edit_user(CmdArgs *args) {
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2947 return secretstore_cmd(args, FALSE, NULL, cmd_ss_edit_user, NULL);
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2948 }
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2949
4d33b672c33a add edit-user command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 654
diff changeset
2950
733
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2951 static int cmd_ss_set_master_pw(CmdArgs *args, PwdStore *secrets, void *ud) {
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2952 char *new_master_pw = util_password_input("New master password: ");
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2953 int ret = pwdstore_setpassword(secrets, new_master_pw);
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2954 if(ret) {
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2955 fprintf(stderr, "Error: failed to set new master password\n");
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2956 }
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2957
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2958 ret = pwdstore_save(secrets);
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2959 if(ret) {
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2960 fprintf(stderr, "Error: saving srcrets store failed.\n");
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2961 }
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2962 return ret;
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2963 }
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2964
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2965 int cmd_set_master_password(CmdArgs *args) {
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2966 return secretstore_cmd(args, FALSE, NULL, cmd_ss_set_master_pw, NULL);
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2967 }
a7883961b5f4 add set-master-password command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 732
diff changeset
2968
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2969 static char** read_args_from_stdin(int *argc) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2970 // read stdin into buffer
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
2971 CxBuffer *in = cxBufferCreate(cxDefaultAllocator, NULL, 1024, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND);
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2972 cx_stream_copy(stdin, in, (cx_read_func)fread, (cx_write_func)cxBufferWrite);
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2973
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2974 // split input into lines
859
06d42d62cf79 fix wrong size type used for cx_strsplit_ma
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 856
diff changeset
2975 size_t count = 0;
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2976 cxmutstr *lines;
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
2977 count = cx_strsplit_ma(cxDefaultAllocator, cx_mutstrn(in->space, in->pos), cx_str("\n"), INT_MAX, &lines);
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2978
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2979 char **args = NULL;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2980 if(count > 0) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2981 args = calloc(count, sizeof(char*));
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2982 for(int i=0;i<count;i++) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2983 args[i] = lines[i].ptr;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2984 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2985 free(lines);
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2986
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2987 *argc = count;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2988 } else {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2989 *argc = 0;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2990 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2991
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2992 // cleanup
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
2993 cxBufferFree(in);
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2994
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2995 return args;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2996 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2997
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2998 int cmd_complete(CmdArgs *args) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
2999 if(args->argc != 1) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3000 return 1;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3001 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3002 char *index_str = args->argv[0];
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3003 int64_t index = 0;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3004 if(!util_strtoint(index_str, &index)) {
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3005 return 1;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3006 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3007
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3008 // The completion bash script passes the input words to stdin
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3009 int comp_argc;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3010 char **comp_argv = read_args_from_stdin(&comp_argc);
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3011
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3012 // Try to parse the args
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3013 char *cmd = NULL;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3014 if(comp_argc > 1) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3015 cmd = comp_argv[1];
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3016 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3017 CmdArgs *comp_args = cmd_parse_args(comp_argc - 2, comp_argv + 2);
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3018 if(comp_args) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3019 // check whether the arglist contains options
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3020 if(comp_args->argc + 2 != comp_argc) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3021 // index points to the arg in the raw arglist, however we have to
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3022 // know the index for this item in comp_args->argv
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3023 // any arg that is an option or an option value creates a
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3024 // difference between the two lists
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3025
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3026 // adjust index to comp_args->argv
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3027 int j = 0;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3028 for(int i=0;i<comp_argc-2;i++) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3029 if(index == i-2) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3030 break;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3031 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3032
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3033 if(strcmp(comp_argv[i+2], comp_args->argv[j])) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3034 index--;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3035 } else {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3036 j++;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3037 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3038 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3039 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3040 } else {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3041 comp_args = NULL;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3042 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3043
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3044 // generate output for shell completion
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3045 int ret = 1;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3046 if(comp_args) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3047 ret = shell_completion(cmd, comp_args, index);
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3048 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3049
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3050 // cleanup
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3051 cmd_args_free(comp_args);
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3052 free(comp_argv);
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3053 return ret;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3054
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3055 }
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3056
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3057 int shell_completion(char *cmd, CmdArgs *args, int index) {
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3058 if(index == 1) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3059 cxstring prefix = { NULL, 0 };
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3060 if(cmd) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3061 prefix = cx_str(cmd);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3062 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3063 for(int i=0;;i++) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3064 char *str = cmdusageinfo[i];
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3065 if(!str) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3066 break;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3067 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3068 int len = (int)strlen(str);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3069 int maxlen = len;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3070 for(int w=0;w<len;w++) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3071 if(str[w] == ' ') {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3072 maxlen = w;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3073 break;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3074 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3075 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3076 if(prefix.ptr) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3077 if(!cx_strprefix(cx_strn(str, maxlen), prefix)) {
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3078 continue;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3079 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3080 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3081 printf("%.*s\n", (int)maxlen, str);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3082 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3083 return 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3084 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3085
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3086 if(!strcmp(cmd, "date")) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3087 return 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3088 }
458
295eaa04fc41 fixes url completion segfaulting for empty strings (in case the user hasn't already started typing an URL)
Mike Becker <universe@uap-core.de>
parents: 435
diff changeset
3089
295eaa04fc41 fixes url completion segfaulting for empty strings (in case the user hasn't already started typing an URL)
Mike Becker <universe@uap-core.de>
parents: 435
diff changeset
3090 // get already typed URL or NULL, if the user hasn't started typing yet
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3091 char *url = args->argc > 0 ? args->argv[0] : NULL;
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3092
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3093 //printf("index: {%s}\n", args->argv[0]);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3094 //printf("dav: {%s}\n", args->argv[1]);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3095 //printf("cmd: {%s}\n", cmd);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3096 //printf("url: {%s}\n", url);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3097
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3098 if(index == 2) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3099 // url completion
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3100 return url_completion(args, url);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3101 } else if (index == 3) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3102 if(!strcmp(cmd, "put") || !strcmp(cmd, "import")) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3103 // file completion
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3104 return 12;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3105 } else if(!strcmp(cmd, "copy") || !strcmp(cmd, "cp") || !strcmp(cmd, "move") || !strcmp(cmd, "mv")) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3106 // url completion
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3107 return url_completion(args, url);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3108 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3109 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3110
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3111 return 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3112 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3113
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3114 int url_completion(CmdArgs *args, char *u) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3115 cxstring url;
458
295eaa04fc41 fixes url completion segfaulting for empty strings (in case the user hasn't already started typing an URL)
Mike Becker <universe@uap-core.de>
parents: 435
diff changeset
3116 url.ptr = u;
295eaa04fc41 fixes url completion segfaulting for empty strings (in case the user hasn't already started typing an URL)
Mike Becker <universe@uap-core.de>
parents: 435
diff changeset
3117 url.length = u ? strlen(u) : 0;
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3118
673
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3119 // if the user wants the URL to be quoted, we conform to their wish
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3120 // a null-char is an indicator, that the strings shall not be quoted
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3121 char quote = '\0';
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3122 if(url.length > 0 && (url.ptr[0] == '\'' || url.ptr[0] == '\"' )) {
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3123 quote = url.ptr[0];
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3124
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3125 // for completing the url, we want to proceed without the quote
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3126 url.ptr++;
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3127 url.length--;
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3128
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3129 // the user may have also prepared the ending quote, remove it for now
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3130 if (url.ptr[url.length-1] == quote) {
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3131 url.length--;
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3132 }
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3133 }
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3134
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3135 // repo completion
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3136 int repocomp = 1;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3137 for(int i=0;i<url.length;i++) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3138 if(url.ptr[i] == '/') {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3139 repocomp = 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3140 break;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3141 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3142 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3143 if(repocomp) {
796
81e0f67386a6 remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 795
diff changeset
3144 DavConfig *config = get_config();
81e0f67386a6 remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 795
diff changeset
3145 for(DavCfgRepository *repo=config->repositories; repo; repo=repo->next) {
81e0f67386a6 remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 795
diff changeset
3146 if(cx_strprefix(cx_strcast(repo->name.value), url)) {
673
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3147 if(quote == '\0') {
796
81e0f67386a6 remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 795
diff changeset
3148 printf("%s/\n", repo->name.value.ptr);
673
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3149 } else {
796
81e0f67386a6 remove old config loader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 795
diff changeset
3150 printf("%c%s/%c\n", quote, repo->name.value.ptr, quote);
673
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3151 }
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3152 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3153
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3154 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3155 } else {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3156 // url completion
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3157 cxMapPut(args->options, cx_hash_key_str("noinput"), "");
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3158
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3159 char *path = NULL;
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
3160 DavCfgRepository *repo = dav_config_url2repo(get_config(), url.ptr, &path);
734
b2cd82149116 add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 733
diff changeset
3161 DavSession *sn = connect_to_repo(ctx, repo, path, request_auth, args);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3162 if(!sn) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3163 return 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3164 }
684
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3165 if(set_session_config(sn, args)) {
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3166 return 0;
a4b4257c1a5f improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 683
diff changeset
3167 }
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3168
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3169 size_t plen = strlen(path);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3170
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3171 cxstring filter;
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3172 char *lspath = NULL;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3173 if(path[plen-1] == '/') {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3174 lspath = strdup(path);
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
3175 filter = cx_str("");
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3176 } else {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3177 lspath = util_parent_path(path);
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3178 filter = cx_str(util_resource_name(path));
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3179 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3180
433
7096666628ca fixes url completion output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 432
diff changeset
3181 DavResource *ls = dav_query(sn, "select - from %s order by name", lspath);
435
def0359fb48f adds some error detection to completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 433
diff changeset
3182 DavResource *elm = ls ? ls->children : NULL;
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3183 while(elm) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3184 cxstring name = cx_str(elm->name);
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3185 if(cx_strprefix(name, filter)) {
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3186 int space = 0;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3187 for(int i=0;i<name.length;i++) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3188 if(name.ptr[i] == ' ') {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3189 space = 1;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3190 break;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3191 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3192 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3193
891
4d58cbcc9efa update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 889
diff changeset
3194 CxBuffer *out = cxBufferCreate(cxDefaultAllocator, NULL, 512, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND);
795
05647e862a17 add new config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 789
diff changeset
3195 cxBufferWrite(repo->name.value.ptr, repo->name.value.length, 1, out);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3196 if(space) {
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3197 size_t l = strlen(elm->path);
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3198 for(int i=0;i<l;i++) {
726
8f6ad495f538 adds more characters to escape for shell completion
Mike Becker <universe@uap-core.de>
parents: 723
diff changeset
3199 // only if we do not quote, we have to escape
8f6ad495f538 adds more characters to escape for shell completion
Mike Becker <universe@uap-core.de>
parents: 723
diff changeset
3200 char nextc = elm->path[i];
8f6ad495f538 adds more characters to escape for shell completion
Mike Becker <universe@uap-core.de>
parents: 723
diff changeset
3201 if(quote == '\0' && NULL != strchr(
8f6ad495f538 adds more characters to escape for shell completion
Mike Becker <universe@uap-core.de>
parents: 723
diff changeset
3202 "!\"#$&'()*,;<>?[\\]^`{|}~ ", nextc)) {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3203 cxBufferPut(out, '\\');
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3204 }
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3205 cxBufferPut(out, nextc);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3206 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3207 } else {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3208 cxBufferPutString(out, elm->path);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3209 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3210 if(elm->iscollection) {
433
7096666628ca fixes url completion output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 432
diff changeset
3211 if(out->space[out->pos-1] != '/') {
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3212 cxBufferPut(out, '/');
433
7096666628ca fixes url completion output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 432
diff changeset
3213 }
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3214 }
673
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3215 if (quote == '\0') {
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3216 printf("%.*s\n", (int)out->pos, out->space);
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3217 } else {
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3218 printf("%c%.*s%c\n",
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3219 quote, (int)out->pos, out->space, quote);
8e7e56cfc103 adds support for quotes in dav bash completion
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
3220 }
432
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
3221
747
efbd59642577 ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 744
diff changeset
3222 cxBufferFree(out);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3223 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3224 elm = elm->next;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3225 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3226
432
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
3227 free(lspath);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3228
432
a213ecaf3f4a adjusts completion index, if options are specified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 431
diff changeset
3229 dav_session_destroy(sn);
431
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3230 }
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3231
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3232 return 10;
1e8592657a01 adds semi-functional bash completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 425
diff changeset
3233 }

mercurial