1 |
commit: d81fc0710ae12ce026053163370ab3dac5c1b1a5 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 28 03:53:50 2016 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 28 03:53:50 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d81fc071 |
7 |
|
8 |
usage: add an extended text section |
9 |
|
10 |
Many applets now are so complicated that a single line of text isn't |
11 |
sufficient to describe all of its capabilities/nuances. Allow them |
12 |
to pass in an arbitrary string of data to contain examples. |
13 |
|
14 |
main.c | 13 ++++++++----- |
15 |
man/qatom.1 | 4 ++-- |
16 |
man/qcache.1 | 4 ++-- |
17 |
man/qcheck.1 | 4 ++-- |
18 |
man/qdepends.1 | 4 ++-- |
19 |
man/qfile.1 | 4 ++-- |
20 |
man/qgrep.1 | 4 ++-- |
21 |
man/qlist.1 | 4 ++-- |
22 |
man/qlop.1 | 2 +- |
23 |
man/qmerge.1 | 4 ++-- |
24 |
man/qpkg.1 | 4 ++-- |
25 |
man/qsearch.1 | 4 ++-- |
26 |
man/qsize.1 | 4 ++-- |
27 |
man/qtbz2.1 | 4 ++-- |
28 |
man/quse.1 | 4 ++-- |
29 |
man/qxpak.1 | 4 ++-- |
30 |
q.c | 2 +- |
31 |
qatom.c | 2 +- |
32 |
qcache.c | 2 +- |
33 |
qcheck.c | 2 +- |
34 |
qdepends.c | 2 +- |
35 |
qfile.c | 2 +- |
36 |
qglsa.c | 2 +- |
37 |
qgrep.c | 2 +- |
38 |
qlist.c | 2 +- |
39 |
qlop.c | 9 ++++++++- |
40 |
qmerge.c | 2 +- |
41 |
qpkg.c | 2 +- |
42 |
qsearch.c | 2 +- |
43 |
qsize.c | 2 +- |
44 |
qtbz2.c | 2 +- |
45 |
quse.c | 2 +- |
46 |
qxpak.c | 2 +- |
47 |
template.c | 2 +- |
48 |
34 files changed, 62 insertions(+), 52 deletions(-) |
49 |
|
50 |
diff --git a/main.c b/main.c |
51 |
index 0834756..a50b451 100644 |
52 |
--- a/main.c |
53 |
+++ b/main.c |
54 |
@@ -115,7 +115,7 @@ void no_colors(void) |
55 |
|
56 |
/* display usage and exit */ |
57 |
static void usage(int status, const char *flags, struct option const opts[], |
58 |
- const char * const help[], int blabber) |
59 |
+ const char * const help[], const char *desc, int blabber) |
60 |
{ |
61 |
const char opt_arg[] = "[arg]"; |
62 |
const char a_arg[] = "<arg>"; |
63 |
@@ -136,10 +136,13 @@ static void usage(int status, const char *flags, struct option const opts[], |
64 |
DKBLUE, applets[i].opts, NORM, |
65 |
RED, NORM, _(applets[i].desc)); |
66 |
} else if (blabber > 0) { |
67 |
- printf("%sUsage:%s %s%s%s <opts> %s%s%s %s:%s %s\n", GREEN, NORM, |
68 |
- YELLOW, applets[blabber].name, NORM, |
69 |
- DKBLUE, applets[blabber].opts, NORM, |
70 |
- RED, NORM, _(applets[blabber].desc)); |
71 |
+ printf("%sUsage:%s %s%s%s [opts] %s%s%s %s:%s %s\n", |
72 |
+ GREEN, NORM, |
73 |
+ YELLOW, applets[blabber].name, NORM, |
74 |
+ DKBLUE, applets[blabber].opts, NORM, |
75 |
+ RED, NORM, _(applets[blabber].desc)); |
76 |
+ if (desc) |
77 |
+ printf("\n%s\n", desc); |
78 |
} |
79 |
if (module_name != NULL) |
80 |
printf("%sLoaded module:%s\n%s%8s%s %s<args>%s\n", GREEN, NORM, YELLOW, module_name, NORM, DKBLUE, NORM); |
81 |
|
82 |
diff --git a/man/qatom.1 b/man/qatom.1 |
83 |
index 42991a5..4a30343 100644 |
84 |
--- a/man/qatom.1 |
85 |
+++ b/man/qatom.1 |
86 |
@@ -1,9 +1,9 @@ |
87 |
-.TH qatom "1" "Feb 2016" "Gentoo Foundation" "qatom" |
88 |
+.TH qatom "1" "Mar 2016" "Gentoo Foundation" "qatom" |
89 |
.SH NAME |
90 |
qatom \- split atom strings |
91 |
.SH SYNOPSIS |
92 |
.B qatom |
93 |
-\fI<opts> <pkg>\fR |
94 |
+\fI[opts] <pkg>\fR |
95 |
.SH DESCRIPTION |
96 |
|
97 |
.SH OPTIONS |
98 |
|
99 |
diff --git a/man/qcache.1 b/man/qcache.1 |
100 |
index 1f46e4b..81ae2fa 100644 |
101 |
--- a/man/qcache.1 |
102 |
+++ b/man/qcache.1 |
103 |
@@ -1,9 +1,9 @@ |
104 |
-.TH qcache "1" "Mar 2014" "Gentoo Foundation" "qcache" |
105 |
+.TH qcache "1" "Mar 2016" "Gentoo Foundation" "qcache" |
106 |
.SH NAME |
107 |
qcache \- search the metadata cache |
108 |
.SH SYNOPSIS |
109 |
.B qcache |
110 |
-\fI<opts> <action> <args>\fR |
111 |
+\fI[opts] <action> <args>\fR |
112 |
.SH DESCRIPTION |
113 |
|
114 |
.SH OPTIONS |
115 |
|
116 |
diff --git a/man/qcheck.1 b/man/qcheck.1 |
117 |
index b686662..ed90c86 100644 |
118 |
--- a/man/qcheck.1 |
119 |
+++ b/man/qcheck.1 |
120 |
@@ -1,9 +1,9 @@ |
121 |
-.TH qcheck "1" "Feb 2016" "Gentoo Foundation" "qcheck" |
122 |
+.TH qcheck "1" "Mar 2016" "Gentoo Foundation" "qcheck" |
123 |
.SH NAME |
124 |
qcheck \- verify integrity of installed packages |
125 |
.SH SYNOPSIS |
126 |
.B qcheck |
127 |
-\fI<opts> <pkgname>\fR |
128 |
+\fI[opts] <pkgname>\fR |
129 |
.SH DESCRIPTION |
130 |
|
131 |
.SH OPTIONS |
132 |
|
133 |
diff --git a/man/qdepends.1 b/man/qdepends.1 |
134 |
index 3b316a0..a0cac5b 100644 |
135 |
--- a/man/qdepends.1 |
136 |
+++ b/man/qdepends.1 |
137 |
@@ -1,9 +1,9 @@ |
138 |
-.TH qdepends "1" "Mar 2014" "Gentoo Foundation" "qdepends" |
139 |
+.TH qdepends "1" "Mar 2016" "Gentoo Foundation" "qdepends" |
140 |
.SH NAME |
141 |
qdepends \- show dependency info |
142 |
.SH SYNOPSIS |
143 |
.B qdepends |
144 |
-\fI<opts> <pkgname>\fR |
145 |
+\fI[opts] <pkgname>\fR |
146 |
.SH DESCRIPTION |
147 |
The qdepends applet has a couple different modes. Normally it is geared towards |
148 |
answering the queries "what does package X depend on" and "what packages depend |
149 |
|
150 |
diff --git a/man/qfile.1 b/man/qfile.1 |
151 |
index 54823cd..e57e8e3 100644 |
152 |
--- a/man/qfile.1 |
153 |
+++ b/man/qfile.1 |
154 |
@@ -1,9 +1,9 @@ |
155 |
-.TH qfile "1" "Feb 2016" "Gentoo Foundation" "qfile" |
156 |
+.TH qfile "1" "Mar 2016" "Gentoo Foundation" "qfile" |
157 |
.SH NAME |
158 |
qfile \- list all pkgs owning files |
159 |
.SH SYNOPSIS |
160 |
.B qfile |
161 |
-\fI<opts> <filename>\fR |
162 |
+\fI[opts] <filename>\fR |
163 |
.SH DESCRIPTION |
164 |
|
165 |
.SH OPTIONS |
166 |
|
167 |
diff --git a/man/qgrep.1 b/man/qgrep.1 |
168 |
index 1ff4797..e31e45a 100644 |
169 |
--- a/man/qgrep.1 |
170 |
+++ b/man/qgrep.1 |
171 |
@@ -1,9 +1,9 @@ |
172 |
-.TH qgrep "1" "Mar 2014" "Gentoo Foundation" "qgrep" |
173 |
+.TH qgrep "1" "Mar 2016" "Gentoo Foundation" "qgrep" |
174 |
.SH NAME |
175 |
qgrep \- grep in ebuilds |
176 |
.SH SYNOPSIS |
177 |
.B qgrep |
178 |
-\fI<opts> <misc args>\fR |
179 |
+\fI[opts] <misc args>\fR |
180 |
.SH DESCRIPTION |
181 |
|
182 |
.SH OPTIONS |
183 |
|
184 |
diff --git a/man/qlist.1 b/man/qlist.1 |
185 |
index eedc2cd..05e9326 100644 |
186 |
--- a/man/qlist.1 |
187 |
+++ b/man/qlist.1 |
188 |
@@ -1,9 +1,9 @@ |
189 |
-.TH qlist "1" "Feb 2016" "Gentoo Foundation" "qlist" |
190 |
+.TH qlist "1" "Mar 2016" "Gentoo Foundation" "qlist" |
191 |
.SH NAME |
192 |
qlist \- list files owned by pkgname |
193 |
.SH SYNOPSIS |
194 |
.B qlist |
195 |
-\fI<opts> <pkgname>\fR |
196 |
+\fI[opts] <pkgname>\fR |
197 |
.SH DESCRIPTION |
198 |
|
199 |
.SH OPTIONS |
200 |
|
201 |
diff --git a/man/qlop.1 b/man/qlop.1 |
202 |
index 77cf5ef..f8f0cdd 100644 |
203 |
--- a/man/qlop.1 |
204 |
+++ b/man/qlop.1 |
205 |
@@ -3,7 +3,7 @@ |
206 |
qlop \- emerge log analyzer |
207 |
.SH SYNOPSIS |
208 |
.B qlop |
209 |
-\fI<opts> <pkgname>\fR |
210 |
+\fI[opts] <pkgname>\fR |
211 |
.SH DESCRIPTION |
212 |
|
213 |
.SH OPTIONS |
214 |
|
215 |
diff --git a/man/qmerge.1 b/man/qmerge.1 |
216 |
index df928f1..f3d80db 100644 |
217 |
--- a/man/qmerge.1 |
218 |
+++ b/man/qmerge.1 |
219 |
@@ -1,9 +1,9 @@ |
220 |
-.TH qmerge "1" "Feb 2016" "Gentoo Foundation" "qmerge" |
221 |
+.TH qmerge "1" "Mar 2016" "Gentoo Foundation" "qmerge" |
222 |
.SH NAME |
223 |
qmerge \- fetch and merge binary package |
224 |
.SH SYNOPSIS |
225 |
.B qmerge |
226 |
-\fI<opts> <pkgnames>\fR |
227 |
+\fI[opts] <pkgnames>\fR |
228 |
.SH DESCRIPTION |
229 |
|
230 |
.SH OPTIONS |
231 |
|
232 |
diff --git a/man/qpkg.1 b/man/qpkg.1 |
233 |
index ac99736..8bb098a 100644 |
234 |
--- a/man/qpkg.1 |
235 |
+++ b/man/qpkg.1 |
236 |
@@ -1,9 +1,9 @@ |
237 |
-.TH qpkg "1" "Mar 2014" "Gentoo Foundation" "qpkg" |
238 |
+.TH qpkg "1" "Mar 2016" "Gentoo Foundation" "qpkg" |
239 |
.SH NAME |
240 |
qpkg \- manipulate Gentoo binpkgs |
241 |
.SH SYNOPSIS |
242 |
.B qpkg |
243 |
-\fI<opts> <misc args>\fR |
244 |
+\fI[opts] <misc args>\fR |
245 |
.SH DESCRIPTION |
246 |
|
247 |
.SH OPTIONS |
248 |
|
249 |
diff --git a/man/qsearch.1 b/man/qsearch.1 |
250 |
index 7d88c50..5f888ba 100644 |
251 |
--- a/man/qsearch.1 |
252 |
+++ b/man/qsearch.1 |
253 |
@@ -1,9 +1,9 @@ |
254 |
-.TH qsearch "1" "Mar 2014" "Gentoo Foundation" "qsearch" |
255 |
+.TH qsearch "1" "Mar 2016" "Gentoo Foundation" "qsearch" |
256 |
.SH NAME |
257 |
qsearch \- search pkgname/desc |
258 |
.SH SYNOPSIS |
259 |
.B qsearch |
260 |
-\fI<opts> <regex>\fR |
261 |
+\fI[opts] <regex>\fR |
262 |
.SH DESCRIPTION |
263 |
|
264 |
.SH OPTIONS |
265 |
|
266 |
diff --git a/man/qsize.1 b/man/qsize.1 |
267 |
index af32869..aa613f8 100644 |
268 |
--- a/man/qsize.1 |
269 |
+++ b/man/qsize.1 |
270 |
@@ -1,9 +1,9 @@ |
271 |
-.TH qsize "1" "Feb 2016" "Gentoo Foundation" "qsize" |
272 |
+.TH qsize "1" "Mar 2016" "Gentoo Foundation" "qsize" |
273 |
.SH NAME |
274 |
qsize \- calculate size usage |
275 |
.SH SYNOPSIS |
276 |
.B qsize |
277 |
-\fI<opts> <pkgname>\fR |
278 |
+\fI[opts] <pkgname>\fR |
279 |
.SH DESCRIPTION |
280 |
|
281 |
.SH OPTIONS |
282 |
|
283 |
diff --git a/man/qtbz2.1 b/man/qtbz2.1 |
284 |
index 2ecd77f..b22c70c 100644 |
285 |
--- a/man/qtbz2.1 |
286 |
+++ b/man/qtbz2.1 |
287 |
@@ -1,9 +1,9 @@ |
288 |
-.TH qtbz2 "1" "Mar 2014" "Gentoo Foundation" "qtbz2" |
289 |
+.TH qtbz2 "1" "Mar 2016" "Gentoo Foundation" "qtbz2" |
290 |
.SH NAME |
291 |
qtbz2 \- manipulate tbz2 packages |
292 |
.SH SYNOPSIS |
293 |
.B qtbz2 |
294 |
-\fI<opts> <misc args>\fR |
295 |
+\fI[opts] <misc args>\fR |
296 |
.SH DESCRIPTION |
297 |
|
298 |
.SH OPTIONS |
299 |
|
300 |
diff --git a/man/quse.1 b/man/quse.1 |
301 |
index 78f4b5c..e1e6db9 100644 |
302 |
--- a/man/quse.1 |
303 |
+++ b/man/quse.1 |
304 |
@@ -1,9 +1,9 @@ |
305 |
-.TH quse "1" "Mar 2014" "Gentoo Foundation" "quse" |
306 |
+.TH quse "1" "Mar 2016" "Gentoo Foundation" "quse" |
307 |
.SH NAME |
308 |
quse \- find pkgs using useflags |
309 |
.SH SYNOPSIS |
310 |
.B quse |
311 |
-\fI<opts> <useflag>\fR |
312 |
+\fI[opts] <useflag>\fR |
313 |
.SH DESCRIPTION |
314 |
|
315 |
.SH OPTIONS |
316 |
|
317 |
diff --git a/man/qxpak.1 b/man/qxpak.1 |
318 |
index 733cad2..dbf36f6 100644 |
319 |
--- a/man/qxpak.1 |
320 |
+++ b/man/qxpak.1 |
321 |
@@ -1,9 +1,9 @@ |
322 |
-.TH qxpak "1" "Mar 2014" "Gentoo Foundation" "qxpak" |
323 |
+.TH qxpak "1" "Mar 2016" "Gentoo Foundation" "qxpak" |
324 |
.SH NAME |
325 |
qxpak \- manipulate xpak archives |
326 |
.SH SYNOPSIS |
327 |
.B qxpak |
328 |
-\fI<opts> <misc args>\fR |
329 |
+\fI[opts] <misc args>\fR |
330 |
.SH DESCRIPTION |
331 |
|
332 |
.SH OPTIONS |
333 |
|
334 |
diff --git a/q.c b/q.c |
335 |
index 1475f99..6ee9aef 100644 |
336 |
--- a/q.c |
337 |
+++ b/q.c |
338 |
@@ -21,7 +21,7 @@ static const char * const q_opts_help[] = { |
339 |
"Module path", |
340 |
COMMON_OPTS_HELP |
341 |
}; |
342 |
-#define q_usage(ret) usage(ret, Q_FLAGS, q_long_opts, q_opts_help, lookup_applet_idx("q")) |
343 |
+#define q_usage(ret) usage(ret, Q_FLAGS, q_long_opts, q_opts_help, NULL, lookup_applet_idx("q")) |
344 |
|
345 |
static APPLET lookup_applet(const char *applet) |
346 |
{ |
347 |
|
348 |
diff --git a/qatom.c b/qatom.c |
349 |
index acf9fd6..8cdffb1 100644 |
350 |
--- a/qatom.c |
351 |
+++ b/qatom.c |
352 |
@@ -21,7 +21,7 @@ static const char * const qatom_opts_help[] = { |
353 |
"Compare two atoms", |
354 |
COMMON_OPTS_HELP |
355 |
}; |
356 |
-#define qatom_usage(ret) usage(ret, QATOM_FLAGS, qatom_long_opts, qatom_opts_help, lookup_applet_idx("qatom")) |
357 |
+#define qatom_usage(ret) usage(ret, QATOM_FLAGS, qatom_long_opts, qatom_opts_help, NULL, lookup_applet_idx("qatom")) |
358 |
|
359 |
/* Run printf on an atom! The format field takes the form: |
360 |
* %{keyword}: Always display the field that matches "keyword" |
361 |
|
362 |
diff --git a/qcache.c b/qcache.c |
363 |
index 759e50a..222c8ae 100644 |
364 |
--- a/qcache.c |
365 |
+++ b/qcache.c |
366 |
@@ -44,7 +44,7 @@ static const char * const qcache_opts_help[] = { |
367 |
"list packages that aren't keyworded on a given arch.", |
368 |
COMMON_OPTS_HELP |
369 |
}; |
370 |
-#define qcache_usage(ret) usage(ret, QCACHE_FLAGS, qcache_long_opts, qcache_opts_help, lookup_applet_idx("qcache")) |
371 |
+#define qcache_usage(ret) usage(ret, QCACHE_FLAGS, qcache_long_opts, qcache_opts_help, NULL, lookup_applet_idx("qcache")) |
372 |
|
373 |
/********************************************************************/ |
374 |
/* Structs */ |
375 |
|
376 |
diff --git a/qcheck.c b/qcheck.c |
377 |
index 7f8031e..79f52a9 100644 |
378 |
--- a/qcheck.c |
379 |
+++ b/qcheck.c |
380 |
@@ -31,7 +31,7 @@ static const char * const qcheck_opts_help[] = { |
381 |
"Undo prelink when calculating checksums", |
382 |
COMMON_OPTS_HELP |
383 |
}; |
384 |
-#define qcheck_usage(ret) usage(ret, QCHECK_FLAGS, qcheck_long_opts, qcheck_opts_help, lookup_applet_idx("qcheck")) |
385 |
+#define qcheck_usage(ret) usage(ret, QCHECK_FLAGS, qcheck_long_opts, qcheck_opts_help, NULL, lookup_applet_idx("qcheck")) |
386 |
|
387 |
#define qcprintf(fmt, args...) do { if (!state->bad_only) printf(_(fmt), ## args); } while (0) |
388 |
|
389 |
|
390 |
diff --git a/qdepends.c b/qdepends.c |
391 |
index f5867f8..7337c61 100644 |
392 |
--- a/qdepends.c |
393 |
+++ b/qdepends.c |
394 |
@@ -31,7 +31,7 @@ static const char * const qdepends_opts_help[] = { |
395 |
"Pretty format specified depend strings", |
396 |
COMMON_OPTS_HELP |
397 |
}; |
398 |
-#define qdepends_usage(ret) usage(ret, QDEPENDS_FLAGS, qdepends_long_opts, qdepends_opts_help, lookup_applet_idx("qdepends")) |
399 |
+#define qdepends_usage(ret) usage(ret, QDEPENDS_FLAGS, qdepends_long_opts, qdepends_opts_help, NULL, lookup_applet_idx("qdepends")) |
400 |
|
401 |
static char qdep_name_only = 0; |
402 |
|
403 |
|
404 |
diff --git a/qfile.c b/qfile.c |
405 |
index 2848129..c6c3664 100644 |
406 |
--- a/qfile.c |
407 |
+++ b/qfile.c |
408 |
@@ -27,7 +27,7 @@ static const char * const qfile_opts_help[] = { |
409 |
"Exact match (used with --exclude)", |
410 |
COMMON_OPTS_HELP |
411 |
}; |
412 |
-#define qfile_usage(ret) usage(ret, QFILE_FLAGS, qfile_long_opts, qfile_opts_help, lookup_applet_idx("qfile")) |
413 |
+#define qfile_usage(ret) usage(ret, QFILE_FLAGS, qfile_long_opts, qfile_opts_help, NULL, lookup_applet_idx("qfile")) |
414 |
|
415 |
#define qfile_is_prefix(path, prefix, prefix_length) \ |
416 |
(!prefix_length \ |
417 |
|
418 |
diff --git a/qglsa.c b/qglsa.c |
419 |
index 885ce1e..6670093 100644 |
420 |
--- a/qglsa.c |
421 |
+++ b/qglsa.c |
422 |
@@ -27,7 +27,7 @@ static const char * const qglsa_opts_help[] = { |
423 |
"Mark specified GLSAs as fixed", |
424 |
COMMON_OPTS_HELP |
425 |
}; |
426 |
-#define qglsa_usage(ret) usage(ret, QGLSA_FLAGS, qglsa_long_opts, qglsa_opts_help, lookup_applet_idx("qglsa")) |
427 |
+#define qglsa_usage(ret) usage(ret, QGLSA_FLAGS, qglsa_long_opts, qglsa_opts_help, NULL, lookup_applet_idx("qglsa")) |
428 |
|
429 |
typedef enum { |
430 |
GLSA_FUNKYTOWN, GLSA_LIST, GLSA_DUMP, GLSA_TEST, GLSA_FIX, GLSA_INJECT |
431 |
|
432 |
diff --git a/qgrep.c b/qgrep.c |
433 |
index 7551ebb..73556ee 100644 |
434 |
--- a/qgrep.c |
435 |
+++ b/qgrep.c |
436 |
@@ -46,7 +46,7 @@ static const char * const qgrep_opts_help[] = { |
437 |
"Print <arg> lines of trailing context", |
438 |
COMMON_OPTS_HELP |
439 |
}; |
440 |
-#define qgrep_usage(ret) usage(ret, QGREP_FLAGS, qgrep_long_opts, qgrep_opts_help, lookup_applet_idx("qgrep")) |
441 |
+#define qgrep_usage(ret) usage(ret, QGREP_FLAGS, qgrep_long_opts, qgrep_opts_help, NULL, lookup_applet_idx("qgrep")) |
442 |
|
443 |
char qgrep_name_match(const char*, const int, depend_atom**); |
444 |
char qgrep_name_match(const char* name, const int argc, depend_atom** argv) |
445 |
|
446 |
diff --git a/qlist.c b/qlist.c |
447 |
index cd52bf0..a5b17af 100644 |
448 |
--- a/qlist.c |
449 |
+++ b/qlist.c |
450 |
@@ -40,7 +40,7 @@ static const char * const qlist_opts_help[] = { |
451 |
/* "query filename for pkgname", */ |
452 |
COMMON_OPTS_HELP |
453 |
}; |
454 |
-#define qlist_usage(ret) usage(ret, QLIST_FLAGS, qlist_long_opts, qlist_opts_help, lookup_applet_idx("qlist")) |
455 |
+#define qlist_usage(ret) usage(ret, QLIST_FLAGS, qlist_long_opts, qlist_opts_help, NULL, lookup_applet_idx("qlist")) |
456 |
|
457 |
static char *grab_pkg_umap(q_vdb_pkg_ctx *pkg_ctx) |
458 |
{ |
459 |
|
460 |
diff --git a/qlop.c b/qlop.c |
461 |
index 0da636a..30e9f2f 100644 |
462 |
--- a/qlop.c |
463 |
+++ b/qlop.c |
464 |
@@ -35,7 +35,14 @@ static const char * const qlop_opts_help[] = { |
465 |
"Read emerge logfile instead of $EMERGE_LOG_DIR/" QLOP_DEFAULT_LOGFILE, |
466 |
COMMON_OPTS_HELP |
467 |
}; |
468 |
-#define qlop_usage(ret) usage(ret, QLOP_FLAGS, qlop_long_opts, qlop_opts_help, lookup_applet_idx("qlop")) |
469 |
+static const char qlop_desc[] = |
470 |
+ "The --date option can take a few forms:\n" |
471 |
+ " -d '# <day|week|month|year>[s] [ago]' (e.g. '3 days ago')\n" |
472 |
+ "Or using strptime(3) formats:\n" |
473 |
+ " -d '2015-12-25' (detected as %F)\n" |
474 |
+ " -d '1459101740' (detected as %s)\n" |
475 |
+ " -d '%d.%m.%Y|25.12.2015' (format is specified)"; |
476 |
+#define qlop_usage(ret) usage(ret, QLOP_FLAGS, qlop_long_opts, qlop_opts_help, qlop_desc, lookup_applet_idx("qlop")) |
477 |
|
478 |
#define QLOP_LIST 0x01 |
479 |
#define QLOP_UNLIST 0x02 |
480 |
|
481 |
diff --git a/qmerge.c b/qmerge.c |
482 |
index 297f939..b734a87 100644 |
483 |
--- a/qmerge.c |
484 |
+++ b/qmerge.c |
485 |
@@ -62,7 +62,7 @@ static const char * const qmerge_opts_help[] = { |
486 |
"Run shell funcs with `set -x`", |
487 |
COMMON_OPTS_HELP |
488 |
}; |
489 |
-#define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge")) |
490 |
+#define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, NULL, lookup_applet_idx("qmerge")) |
491 |
|
492 |
char search_pkgs = 0; |
493 |
char interactive = 1; |
494 |
|
495 |
diff --git a/qpkg.c b/qpkg.c |
496 |
index 996efcd..2cc658e 100644 |
497 |
--- a/qpkg.c |
498 |
+++ b/qpkg.c |
499 |
@@ -25,7 +25,7 @@ static const char * const qpkg_opts_help[] = { |
500 |
"alternate package directory", |
501 |
COMMON_OPTS_HELP |
502 |
}; |
503 |
-#define qpkg_usage(ret) usage(ret, QPKG_FLAGS, qpkg_long_opts, qpkg_opts_help, lookup_applet_idx("qpkg")) |
504 |
+#define qpkg_usage(ret) usage(ret, QPKG_FLAGS, qpkg_long_opts, qpkg_opts_help, NULL, lookup_applet_idx("qpkg")) |
505 |
|
506 |
extern char pretend; |
507 |
|
508 |
|
509 |
diff --git a/qsearch.c b/qsearch.c |
510 |
index 2ba2d39..e23642b 100644 |
511 |
--- a/qsearch.c |
512 |
+++ b/qsearch.c |
513 |
@@ -29,7 +29,7 @@ static const char * const qsearch_opts_help[] = { |
514 |
"Show homepage info", |
515 |
COMMON_OPTS_HELP |
516 |
}; |
517 |
-#define qsearch_usage(ret) usage(ret, QSEARCH_FLAGS, qsearch_long_opts, qsearch_opts_help, lookup_applet_idx("qsearch")) |
518 |
+#define qsearch_usage(ret) usage(ret, QSEARCH_FLAGS, qsearch_long_opts, qsearch_opts_help, NULL, lookup_applet_idx("qsearch")) |
519 |
|
520 |
#define LAST_BUF_SIZE 256 |
521 |
|
522 |
|
523 |
diff --git a/qsize.c b/qsize.c |
524 |
index db00247..376a772 100644 |
525 |
--- a/qsize.c |
526 |
+++ b/qsize.c |
527 |
@@ -29,7 +29,7 @@ static const char * const qsize_opts_help[] = { |
528 |
"Ignore regexp string", |
529 |
COMMON_OPTS_HELP |
530 |
}; |
531 |
-#define qsize_usage(ret) usage(ret, QSIZE_FLAGS, qsize_long_opts, qsize_opts_help, lookup_applet_idx("qsize")) |
532 |
+#define qsize_usage(ret) usage(ret, QSIZE_FLAGS, qsize_long_opts, qsize_opts_help, NULL, lookup_applet_idx("qsize")) |
533 |
|
534 |
struct qsize_opt_state { |
535 |
array_t *atoms; |
536 |
|
537 |
diff --git a/qtbz2.c b/qtbz2.c |
538 |
index da2e9ab..6e6fff6 100644 |
539 |
--- a/qtbz2.c |
540 |
+++ b/qtbz2.c |
541 |
@@ -45,7 +45,7 @@ static const char * const qtbz2_opts_help[] = { |
542 |
"Write files to stdout", |
543 |
COMMON_OPTS_HELP |
544 |
}; |
545 |
-#define qtbz2_usage(ret) usage(ret, QTBZ2_FLAGS, qtbz2_long_opts, qtbz2_opts_help, lookup_applet_idx("qtbz2")) |
546 |
+#define qtbz2_usage(ret) usage(ret, QTBZ2_FLAGS, qtbz2_long_opts, qtbz2_opts_help, NULL, lookup_applet_idx("qtbz2")) |
547 |
|
548 |
static char tbz2_stdout = 0; |
549 |
|
550 |
|
551 |
diff --git a/quse.c b/quse.c |
552 |
index 59db37a..81d99d8 100644 |
553 |
--- a/quse.c |
554 |
+++ b/quse.c |
555 |
@@ -34,7 +34,7 @@ static const char * const quse_opts_help[] = { |
556 |
"Only show package name", |
557 |
COMMON_OPTS_HELP |
558 |
}; |
559 |
-#define quse_usage(ret) usage(ret, QUSE_FLAGS, quse_long_opts, quse_opts_help, lookup_applet_idx("quse")) |
560 |
+#define quse_usage(ret) usage(ret, QUSE_FLAGS, quse_long_opts, quse_opts_help, NULL, lookup_applet_idx("quse")) |
561 |
|
562 |
char quse_name_only = 0; |
563 |
|
564 |
|
565 |
diff --git a/qxpak.c b/qxpak.c |
566 |
index fb19ef9..baceda9 100644 |
567 |
--- a/qxpak.c |
568 |
+++ b/qxpak.c |
569 |
@@ -45,7 +45,7 @@ static const char * const qxpak_opts_help[] = { |
570 |
"Write files to stdout", |
571 |
COMMON_OPTS_HELP |
572 |
}; |
573 |
-#define qxpak_usage(ret) usage(ret, QXPAK_FLAGS, qxpak_long_opts, qxpak_opts_help, lookup_applet_idx("qxpak")) |
574 |
+#define qxpak_usage(ret) usage(ret, QXPAK_FLAGS, qxpak_long_opts, qxpak_opts_help, NULL, lookup_applet_idx("qxpak")) |
575 |
|
576 |
typedef struct { |
577 |
int dir_fd; |
578 |
|
579 |
diff --git a/template.c b/template.c |
580 |
index d4b9e98..877a187 100644 |
581 |
--- a/template.c |
582 |
+++ b/template.c |
583 |
@@ -15,7 +15,7 @@ static struct option const qtemp_long_opts[] = { |
584 |
static const char * const qtemp_opts_help[] = { |
585 |
COMMON_OPTS_HELP |
586 |
}; |
587 |
-#define qtemp_usage(ret) usage(ret, QTEMP_FLAGS, qtemp_long_opts, qtemp_opts_help, lookup_applet_idx("qtemp")) |
588 |
+#define qtemp_usage(ret) usage(ret, QTEMP_FLAGS, qtemp_long_opts, qtemp_opts_help, NULL, lookup_applet_idx("qtemp")) |
589 |
|
590 |
int qtemp_main(int argc, char **argv) |
591 |
{ |