Sun, 19 Mar 2023 15:12:42 +0100
fix crash if the server sends a response with elements without namespaces
11 | 1 | /* |
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | |
3 | * | |
364
3769ba002fd1
updates copyright date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
355
diff
changeset
|
4 | * Copyright 2018 Olaf Wintermann. All rights reserved. |
11 | 5 | * |
6 | * Redistribution and use in source and binary forms, with or without | |
7 | * modification, are permitted provided that the following conditions are met: | |
8 | * | |
9 | * 1. Redistributions of source code must retain the above copyright | |
10 | * notice, this list of conditions and the following disclaimer. | |
11 | * | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | |
15 | * | |
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | |
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | |
28 | ||
29 | #include <stdio.h> | |
30 | #include <stdlib.h> | |
31 | #include <string.h> | |
32 | ||
33 | #include "optparser.h" | |
375
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
34 | #include "sopt.h" |
11 | 35 | |
36 | void cmd_args_free(CmdArgs *args) { | |
219
9792cfe63b80
added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
37 | if(args) { |
9792cfe63b80
added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
38 | ucx_map_free(args->options); |
684
a4b4257c1a5f
improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
517
diff
changeset
|
39 | if(args->argv) { |
a4b4257c1a5f
improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
517
diff
changeset
|
40 | free(args->argv); |
a4b4257c1a5f
improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
517
diff
changeset
|
41 | } |
219
9792cfe63b80
added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
42 | free(args); |
9792cfe63b80
added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
43 | } |
11 | 44 | } |
45 | ||
46 | CmdArgs* cmd_parse_args(int argc, char **argv) { | |
47 | CmdArgs *a = malloc(sizeof(CmdArgs)); | |
48 | a->options = ucx_map_new(16); | |
684
a4b4257c1a5f
improve shell completion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
517
diff
changeset
|
49 | a->argv = argc > 0 ? calloc(argc, sizeof(char*)) : NULL; |
11 | 50 | a->argc = 0; |
51 | ||
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
52 | const char *NOARG = ""; |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
53 | |
11 | 54 | char *option = NULL; |
55 | char optchar = 0; | |
721
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
56 | int optterminated = 0; |
11 | 57 | for(int i=0;i<argc;i++) { |
58 | char *arg = argv[i]; | |
59 | size_t len = strlen(arg); | |
721
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
60 | if(len == 2 && arg[0] == '-' && arg[1] == '-') { |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
61 | optterminated = 1; |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
62 | } else if(!optterminated && len > 1 && arg[0] == '-') { |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
63 | // argument is in next arg but starts with a dash |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
64 | // we assume this is not intended and consider this an error |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
65 | if(option) { |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
66 | fprintf(stderr, |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
67 | "Missing argument for option -%c\n\n", optchar); |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
68 | cmd_args_free(a); |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
69 | return NULL; |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
70 | } |
11 | 71 | for(int c=1;c<len;c++) { |
721
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
72 | // argument is in the same arg |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
73 | if(option) { |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
74 | ucx_map_cstr_put(a->options, option, &arg[c]); |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
75 | option = NULL; |
c401f4af44b1
adds support for option terminator '--'
Mike Becker <universe@uap-core.de>
parents:
684
diff
changeset
|
76 | break; |
375
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
77 | } |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
78 | |
11 | 79 | switch(arg[c]) { |
80 | default: { | |
219
9792cfe63b80
added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
81 | fprintf(stderr, "Unknown option -%c\n\n", arg[c]); |
11 | 82 | cmd_args_free(a); |
83 | return NULL; | |
84 | } | |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
85 | case 'v': { |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
86 | ucx_map_cstr_put(a->options, "verbose", NOARG); |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
87 | break; |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
88 | } |
11 | 89 | case 'k': { |
375
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
90 | option = "key"; |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
91 | optchar = 'k'; |
11 | 92 | break; |
93 | } | |
94 | case 'p': { | |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
95 | ucx_map_cstr_put(a->options, "plain", NOARG); |
11 | 96 | break; |
97 | } | |
45
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
98 | case 'c': { |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
99 | ucx_map_cstr_put(a->options, "crypt", NOARG); |
45
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
100 | break; |
e3839719b079
added crypt command line option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
101 | } |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
102 | case 'a': { |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
103 | ucx_map_cstr_put(a->options, "all", NOARG); |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
104 | break; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
105 | } |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
106 | case 'l': { |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
107 | ucx_map_cstr_put(a->options, "list", NOARG); |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
108 | break; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
109 | } |
297
3cbe57eeaed1
adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
110 | case 'd': { |
3cbe57eeaed1
adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
111 | ucx_map_cstr_put(a->options, "date", NOARG); |
3cbe57eeaed1
adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
112 | break; |
3cbe57eeaed1
adds option to sort dav list by lastmodified date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
113 | } |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
114 | case 't': { |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
115 | ucx_map_cstr_put(a->options, "type", NOARG); |
14
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
116 | break; |
d1a43035d3a2
added some options to list command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
11
diff
changeset
|
117 | } |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
118 | case 'R': { |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
62
diff
changeset
|
119 | ucx_map_cstr_put(a->options, "recursive", NOARG); |
18
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
120 | break; |
651989681053
recursive list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
121 | } |
182
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
122 | case 'O': { |
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
123 | ucx_map_cstr_put(a->options, "override", NOARG); |
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
124 | break; |
ca07f14f7bfe
added override option for copy/move
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
125 | } |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
126 | case 'i': { |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
127 | ucx_map_cstr_put(a->options, "insecure", NOARG); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
128 | break; |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
186
diff
changeset
|
129 | } |
213
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
130 | case 'N': { |
212
01e80c7cfe96
added noinput option to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
131 | ucx_map_cstr_put(a->options, "noinput", NOARG); |
01e80c7cfe96
added noinput option to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
132 | break; |
01e80c7cfe96
added noinput option to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
133 | } |
213
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
134 | case 'e': { |
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
135 | ucx_map_cstr_put(a->options, "extended", NOARG); |
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
136 | break; |
cd870d5f8659
added options for extended list flags and changed version output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
137 | } |
338
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
138 | case 'x': { |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
139 | ucx_map_cstr_put(a->options, "xml", NOARG); |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
140 | break; |
c7f3fe4abdb2
dav get-property supports xml property output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
334
diff
changeset
|
141 | } |
517
8531b63accae
adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
476
diff
changeset
|
142 | case 'F': { |
8531b63accae
adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
476
diff
changeset
|
143 | option = "finfo"; |
8531b63accae
adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
476
diff
changeset
|
144 | optchar = 'F'; |
8531b63accae
adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
476
diff
changeset
|
145 | break; |
8531b63accae
adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
476
diff
changeset
|
146 | } |
309
8a474d2ad209
adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
147 | case 'S': { |
8a474d2ad209
adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
148 | // undocumented hidden feature |
8a474d2ad209
adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
149 | ucx_map_cstr_put(a->options, "structure", NOARG); |
8a474d2ad209
adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
150 | break; |
8a474d2ad209
adds option to dav get for downloading only the directory structure
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
297
diff
changeset
|
151 | } |
330
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
152 | case 'K': { |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
153 | ucx_map_cstr_put(a->options, "keep", NOARG); |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
154 | break; |
54819e984a19
adds dav get option to keep existing files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
315
diff
changeset
|
155 | } |
11 | 156 | case 'o': { |
375
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
157 | option = "output"; |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
158 | optchar = 'o'; |
11 | 159 | break; |
160 | } | |
30
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
161 | case 'u': { |
375
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
162 | option = "update"; |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
163 | optchar = 'u'; |
30
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
164 | break; |
9a5a7a513a96
added update option for list and get
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
18
diff
changeset
|
165 | } |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
166 | case 'n': { |
375
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
167 | option = "namespace"; |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
168 | optchar = 'n'; |
62
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
169 | break; |
3b813c57c106
added property-set and property-get command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
45
diff
changeset
|
170 | } |
209
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
171 | case 'L': { |
375
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
172 | option = "lock"; |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
173 | optchar = 'L'; |
209
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
174 | break; |
d24761f1e07c
added lock and unlock commands to dav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
175 | } |
315
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
176 | case 'T': { |
375
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
177 | option = "timeout"; |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
178 | optchar = 'T'; |
315
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
179 | break; |
7db4dbf4e6f9
adds lock timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
309
diff
changeset
|
180 | } |
517
8531b63accae
adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
476
diff
changeset
|
181 | /* |
8531b63accae
adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
476
diff
changeset
|
182 | case 'P': { |
375
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
183 | option = "progressfile"; |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
184 | optchar = 'F'; |
355
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
185 | break; |
5da2cf15eb44
adds primitive progress indicator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
186 | } |
517
8531b63accae
adds option to store a file info property
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
476
diff
changeset
|
187 | */ |
476
b4e3453e2b49
adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
376
diff
changeset
|
188 | case 'V': { |
b4e3453e2b49
adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
376
diff
changeset
|
189 | option = "version"; |
b4e3453e2b49
adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
376
diff
changeset
|
190 | optchar = 'V'; |
b4e3453e2b49
adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
376
diff
changeset
|
191 | break; |
b4e3453e2b49
adds -V option to get, get-property and info commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
376
diff
changeset
|
192 | } |
11 | 193 | } |
194 | } | |
195 | } else if(option) { | |
196 | ucx_map_cstr_put(a->options, option, arg); | |
197 | option = NULL; | |
198 | } else { | |
199 | a->argv[a->argc++] = arg; | |
200 | } | |
201 | } | |
375
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
202 | if(option) { |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
203 | fprintf(stderr, |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
204 | "Missing argument for option -%c\n\n", optchar); |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
205 | cmd_args_free(a); |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
206 | return NULL; |
39fd327f81da
fixes options parser to correctly report missing arguments
Mike Becker <universe@uap-core.de>
parents:
364
diff
changeset
|
207 | } |
11 | 208 | |
209 | return a; | |
210 | } | |
211 | ||
212 | char* cmd_getoption(CmdArgs *arg, char *name) { | |
213 | return ucx_map_cstr_get(arg->options, name); | |
214 | } |