@@ -129,38 +129,53 @@ main(int argc, char *argv[])
129
129
s .listdirs = 0 ;
130
130
131
131
ARGBEGIN {
132
+ case 'd' :
133
+ servedir = EARGF (usage ());
134
+ break ;
135
+ case 'g' :
136
+ group = EARGF (usage ());
137
+ break ;
132
138
case 'h' :
133
139
s .host = EARGF (usage ());
134
140
break ;
135
- case 'p ' :
136
- s .port = EARGF (usage ());
137
- break ;
138
- case 'U' :
139
- udsname = EARGF ( usage ());
141
+ case 'i ' :
142
+ s .docindex = EARGF (usage ());
143
+ if ( strchr ( s . docindex , '/' )) {
144
+ die ( "The document index must not contain '/'" );
145
+ }
140
146
break ;
141
- case 'u ' :
142
- user = EARGF ( usage ()) ;
147
+ case 'l ' :
148
+ s . listdirs = 1 ;
143
149
break ;
144
- case 'g' :
145
- group = EARGF (usage ());
150
+ case 'm' :
151
+ if (!(tok = strdup (EARGF (usage ())))) {
152
+ die ("strdup:" );
153
+ }
154
+ if (!(s .map = reallocarray (s .map , ++ s .map_len ,
155
+ sizeof (struct map )))) {
156
+ die ("reallocarray:" );
157
+ }
158
+ if (!(s .map [s .map_len - 1 ].chost = strtok (tok , " " )) ||
159
+ !(s .map [s .map_len - 1 ].from = strtok (NULL , " " )) ||
160
+ !(s .map [s .map_len - 1 ].to = strtok (NULL , " " )) ||
161
+ strtok (NULL , "" )) {
162
+ usage ();
163
+ }
146
164
break ;
147
165
case 'n' :
148
166
maxnprocs = strtonum (EARGF (usage ()), 1 , INT_MAX , & err );
149
167
if (err ) {
150
168
die ("strtonum '%s': %s" , EARGF (usage ()), err );
151
169
}
152
170
break ;
153
- case 'd ' :
154
- servedir = EARGF (usage ());
171
+ case 'p ' :
172
+ s . port = EARGF (usage ());
155
173
break ;
156
- case 'l ' :
157
- s . listdirs = 1 ;
174
+ case 'U ' :
175
+ udsname = EARGF ( usage ()) ;
158
176
break ;
159
- case 'i' :
160
- s .docindex = EARGF (usage ());
161
- if (strchr (s .docindex , '/' )) {
162
- die ("The document index must not contain '/'" );
163
- }
177
+ case 'u' :
178
+ user = EARGF (usage ());
164
179
break ;
165
180
case 'v' :
166
181
if (!(tok = strdup (EARGF (usage ())))) {
@@ -180,21 +195,6 @@ main(int argc, char *argv[])
180
195
usage ();
181
196
}
182
197
break ;
183
- case 'm' :
184
- if (!(tok = strdup (EARGF (usage ())))) {
185
- die ("strdup:" );
186
- }
187
- if (!(s .map = reallocarray (s .map , ++ s .map_len ,
188
- sizeof (struct map )))) {
189
- die ("reallocarray:" );
190
- }
191
- if (!(s .map [s .map_len - 1 ].chost = strtok (tok , " " )) ||
192
- !(s .map [s .map_len - 1 ].from = strtok (NULL , " " )) ||
193
- !(s .map [s .map_len - 1 ].to = strtok (NULL , " " )) ||
194
- strtok (NULL , "" )) {
195
- usage ();
196
- }
197
- break ;
198
198
default :
199
199
usage ();
200
200
} ARGEND
0 commit comments