1 |
commit: 6eee66bd91df5928c0fbf1ee9cd2ff8a3f575d89 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 2 18:00:17 2019 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 2 18:00:17 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=6eee66bd |
7 |
|
8 |
qcache: rename to qkeyword |
9 |
|
10 |
qcache has its roots in reading the metadata cache, but since this is |
11 |
standard functionality provided by libq/cache now, all that qcache does |
12 |
really is things with keywords. |
13 |
|
14 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
15 |
|
16 |
.gitignore | 4 +- |
17 |
Makefile.am | 6 +-- |
18 |
Makefile.in | 40 ++++++++-------- |
19 |
TODO.md | 2 - |
20 |
applets.h | 4 +- |
21 |
man/q.1 | 6 +-- |
22 |
man/qatom.1 | 4 +- |
23 |
man/qcheck.1 | 4 +- |
24 |
man/qdepends.1 | 4 +- |
25 |
man/qfile.1 | 4 +- |
26 |
man/qgrep.1 | 4 +- |
27 |
man/{qcache.1 => qkeyword.1} | 6 +-- |
28 |
man/qlist.1 | 4 +- |
29 |
man/qlop.1 | 4 +- |
30 |
man/qmerge.1 | 4 +- |
31 |
man/qpkg.1 | 4 +- |
32 |
man/qsearch.1 | 4 +- |
33 |
man/qsize.1 | 4 +- |
34 |
man/qtbz2.1 | 4 +- |
35 |
man/qtegrity.1 | 4 +- |
36 |
man/quse.1 | 2 +- |
37 |
man/qxpak.1 | 4 +- |
38 |
qcache.c => qkeyword.c | 112 +++++++++++++++++++++---------------------- |
39 |
23 files changed, 118 insertions(+), 120 deletions(-) |
40 |
|
41 |
diff --git a/.gitignore b/.gitignore |
42 |
index c571c4e..b65a0fb 100644 |
43 |
--- a/.gitignore |
44 |
+++ b/.gitignore |
45 |
@@ -32,18 +32,18 @@ stamp-h1 |
46 |
/*.old.c |
47 |
/q |
48 |
/qatom |
49 |
-/qcache |
50 |
/qcheck |
51 |
/qdepends |
52 |
/qfile |
53 |
/qglsa |
54 |
/qgrep |
55 |
+/qkeyword |
56 |
/qlist |
57 |
/qlop |
58 |
/qmerge |
59 |
/qpkg |
60 |
/qsearch |
61 |
/qsize |
62 |
+/qtegrity |
63 |
/quse |
64 |
/qxpak |
65 |
-/qtegrity |
66 |
|
67 |
diff --git a/Makefile.am b/Makefile.am |
68 |
index 9306019..b36173c 100644 |
69 |
--- a/Makefile.am |
70 |
+++ b/Makefile.am |
71 |
@@ -10,11 +10,11 @@ SUBDIRS = \ |
72 |
APPLETS = \ |
73 |
q \ |
74 |
qatom \ |
75 |
- qcache \ |
76 |
qcheck \ |
77 |
qdepends \ |
78 |
qfile \ |
79 |
qgrep \ |
80 |
+ qkeyword \ |
81 |
qlist \ |
82 |
qlop \ |
83 |
qmerge \ |
84 |
@@ -30,11 +30,11 @@ APPLETS = \ |
85 |
dist_man_MANS = \ |
86 |
man/q.1 \ |
87 |
man/qatom.1 \ |
88 |
- man/qcache.1 \ |
89 |
man/qcheck.1 \ |
90 |
man/qdepends.1 \ |
91 |
man/qfile.1 \ |
92 |
man/qgrep.1 \ |
93 |
+ man/qkeyword.1 \ |
94 |
man/qlist.1 \ |
95 |
man/qlop.1 \ |
96 |
man/qmerge.1 \ |
97 |
@@ -52,11 +52,11 @@ q_SOURCES = \ |
98 |
main.c \ |
99 |
q.c \ |
100 |
qatom.c \ |
101 |
- qcache.c \ |
102 |
qcheck.c \ |
103 |
qdepends.c \ |
104 |
qfile.c \ |
105 |
qgrep.c \ |
106 |
+ qkeyword.c \ |
107 |
qlist.c \ |
108 |
qlop.c \ |
109 |
qmerge.c \ |
110 |
|
111 |
diff --git a/Makefile.in b/Makefile.in |
112 |
index b211bdd..6af9c8a 100644 |
113 |
--- a/Makefile.in |
114 |
+++ b/Makefile.in |
115 |
@@ -246,8 +246,8 @@ CONFIG_CLEAN_VPATH_FILES = |
116 |
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" |
117 |
PROGRAMS = $(bin_PROGRAMS) |
118 |
am_q_OBJECTS = q-main.$(OBJEXT) q-q.$(OBJEXT) q-qatom.$(OBJEXT) \ |
119 |
- q-qcache.$(OBJEXT) q-qcheck.$(OBJEXT) q-qdepends.$(OBJEXT) \ |
120 |
- q-qfile.$(OBJEXT) q-qgrep.$(OBJEXT) q-qlist.$(OBJEXT) \ |
121 |
+ q-qcheck.$(OBJEXT) q-qdepends.$(OBJEXT) q-qfile.$(OBJEXT) \ |
122 |
+ q-qgrep.$(OBJEXT) q-qkeyword.$(OBJEXT) q-qlist.$(OBJEXT) \ |
123 |
q-qlop.$(OBJEXT) q-qmerge.$(OBJEXT) q-qpkg.$(OBJEXT) \ |
124 |
q-qsearch.$(OBJEXT) q-qsize.$(OBJEXT) q-qtbz2.$(OBJEXT) \ |
125 |
q-qtegrity.$(OBJEXT) q-quse.$(OBJEXT) q-qxpak.$(OBJEXT) |
126 |
@@ -1550,11 +1550,11 @@ SUBDIRS = \ |
127 |
APPLETS = \ |
128 |
q \ |
129 |
qatom \ |
130 |
- qcache \ |
131 |
qcheck \ |
132 |
qdepends \ |
133 |
qfile \ |
134 |
qgrep \ |
135 |
+ qkeyword \ |
136 |
qlist \ |
137 |
qlop \ |
138 |
qmerge \ |
139 |
@@ -1570,11 +1570,11 @@ APPLETS = \ |
140 |
dist_man_MANS = \ |
141 |
man/q.1 \ |
142 |
man/qatom.1 \ |
143 |
- man/qcache.1 \ |
144 |
man/qcheck.1 \ |
145 |
man/qdepends.1 \ |
146 |
man/qfile.1 \ |
147 |
man/qgrep.1 \ |
148 |
+ man/qkeyword.1 \ |
149 |
man/qlist.1 \ |
150 |
man/qlop.1 \ |
151 |
man/qmerge.1 \ |
152 |
@@ -1591,11 +1591,11 @@ q_SOURCES = \ |
153 |
main.c \ |
154 |
q.c \ |
155 |
qatom.c \ |
156 |
- qcache.c \ |
157 |
qcheck.c \ |
158 |
qdepends.c \ |
159 |
qfile.c \ |
160 |
qgrep.c \ |
161 |
+ qkeyword.c \ |
162 |
qlist.c \ |
163 |
qlop.c \ |
164 |
qmerge.c \ |
165 |
@@ -1744,11 +1744,11 @@ distclean-compile: |
166 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-main.Po@am__quote@ |
167 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-q.Po@am__quote@ |
168 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-qatom.Po@am__quote@ |
169 |
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-qcache.Po@am__quote@ |
170 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-qcheck.Po@am__quote@ |
171 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-qdepends.Po@am__quote@ |
172 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-qfile.Po@am__quote@ |
173 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-qgrep.Po@am__quote@ |
174 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-qkeyword.Po@am__quote@ |
175 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-qlist.Po@am__quote@ |
176 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-qlop.Po@am__quote@ |
177 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/q-qmerge.Po@am__quote@ |
178 |
@@ -1823,20 +1823,6 @@ q-qatom.obj: qatom.c |
179 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
180 |
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o q-qatom.obj `if test -f 'qatom.c'; then $(CYGPATH_W) 'qatom.c'; else $(CYGPATH_W) '$(srcdir)/qatom.c'; fi` |
181 |
|
182 |
-q-qcache.o: qcache.c |
183 |
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qcache.o -MD -MP -MF $(DEPDIR)/q-qcache.Tpo -c -o q-qcache.o `test -f 'qcache.c' || echo '$(srcdir)/'`qcache.c |
184 |
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qcache.Tpo $(DEPDIR)/q-qcache.Po |
185 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qcache.c' object='q-qcache.o' libtool=no @AMDEPBACKSLASH@ |
186 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
187 |
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o q-qcache.o `test -f 'qcache.c' || echo '$(srcdir)/'`qcache.c |
188 |
- |
189 |
-q-qcache.obj: qcache.c |
190 |
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qcache.obj -MD -MP -MF $(DEPDIR)/q-qcache.Tpo -c -o q-qcache.obj `if test -f 'qcache.c'; then $(CYGPATH_W) 'qcache.c'; else $(CYGPATH_W) '$(srcdir)/qcache.c'; fi` |
191 |
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qcache.Tpo $(DEPDIR)/q-qcache.Po |
192 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qcache.c' object='q-qcache.obj' libtool=no @AMDEPBACKSLASH@ |
193 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
194 |
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o q-qcache.obj `if test -f 'qcache.c'; then $(CYGPATH_W) 'qcache.c'; else $(CYGPATH_W) '$(srcdir)/qcache.c'; fi` |
195 |
- |
196 |
q-qcheck.o: qcheck.c |
197 |
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qcheck.o -MD -MP -MF $(DEPDIR)/q-qcheck.Tpo -c -o q-qcheck.o `test -f 'qcheck.c' || echo '$(srcdir)/'`qcheck.c |
198 |
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qcheck.Tpo $(DEPDIR)/q-qcheck.Po |
199 |
@@ -1893,6 +1879,20 @@ q-qgrep.obj: qgrep.c |
200 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
201 |
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o q-qgrep.obj `if test -f 'qgrep.c'; then $(CYGPATH_W) 'qgrep.c'; else $(CYGPATH_W) '$(srcdir)/qgrep.c'; fi` |
202 |
|
203 |
+q-qkeyword.o: qkeyword.c |
204 |
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qkeyword.o -MD -MP -MF $(DEPDIR)/q-qkeyword.Tpo -c -o q-qkeyword.o `test -f 'qkeyword.c' || echo '$(srcdir)/'`qkeyword.c |
205 |
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qkeyword.Tpo $(DEPDIR)/q-qkeyword.Po |
206 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qkeyword.c' object='q-qkeyword.o' libtool=no @AMDEPBACKSLASH@ |
207 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
208 |
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o q-qkeyword.o `test -f 'qkeyword.c' || echo '$(srcdir)/'`qkeyword.c |
209 |
+ |
210 |
+q-qkeyword.obj: qkeyword.c |
211 |
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qkeyword.obj -MD -MP -MF $(DEPDIR)/q-qkeyword.Tpo -c -o q-qkeyword.obj `if test -f 'qkeyword.c'; then $(CYGPATH_W) 'qkeyword.c'; else $(CYGPATH_W) '$(srcdir)/qkeyword.c'; fi` |
212 |
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qkeyword.Tpo $(DEPDIR)/q-qkeyword.Po |
213 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qkeyword.c' object='q-qkeyword.obj' libtool=no @AMDEPBACKSLASH@ |
214 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
215 |
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o q-qkeyword.obj `if test -f 'qkeyword.c'; then $(CYGPATH_W) 'qkeyword.c'; else $(CYGPATH_W) '$(srcdir)/qkeyword.c'; fi` |
216 |
+ |
217 |
q-qlist.o: qlist.c |
218 |
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qlist.o -MD -MP -MF $(DEPDIR)/q-qlist.Tpo -c -o q-qlist.o `test -f 'qlist.c' || echo '$(srcdir)/'`qlist.c |
219 |
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qlist.Tpo $(DEPDIR)/q-qlist.Po |
220 |
|
221 |
diff --git a/TODO.md b/TODO.md |
222 |
index 9d44710..007d906 100644 |
223 |
--- a/TODO.md |
224 |
+++ b/TODO.md |
225 |
@@ -30,8 +30,6 @@ |
226 |
|
227 |
- vdb repo/slot think about when it is freed (see cache\_pkg\_close) |
228 |
|
229 |
-- qcache -> rename to qkeyword |
230 |
- |
231 |
- quse -K -> move to qkeyword |
232 |
|
233 |
# Atoms |
234 |
|
235 |
diff --git a/applets.h b/applets.h |
236 |
index 4dd5bc2..8cb537a 100644 |
237 |
--- a/applets.h |
238 |
+++ b/applets.h |
239 |
@@ -52,7 +52,7 @@ DECLARE_APPLET(qpkg) |
240 |
DECLARE_APPLET(qgrep) |
241 |
DECLARE_APPLET(qatom) |
242 |
DECLARE_APPLET(qmerge) |
243 |
-DECLARE_APPLET(qcache) |
244 |
+DECLARE_APPLET(qkeyword) |
245 |
/*DECLARE_APPLET(qglsa) disable */ |
246 |
DECLARE_APPLET(qtegrity) |
247 |
#undef DECLARE_APPLET |
248 |
@@ -66,7 +66,7 @@ static const struct applet_t { |
249 |
/* q must always be the first applet */ |
250 |
{"q", q_main, "<applet> <args>", "virtual applet"}, |
251 |
{"qatom", qatom_main, "<pkg>", "split atom strings"}, |
252 |
- {"qcache", qcache_main, "<action> <args>", "search the metadata cache"}, |
253 |
+ {"qkeyword", qkeyword_main, "<action> <args>", "list packages based on keywords"}, |
254 |
{"qcheck", qcheck_main, "<pkgname>", "verify integrity of installed packages"}, |
255 |
{"qdepends", qdepends_main, "<pkgname>", "show dependency info"}, |
256 |
{"qfile", qfile_main, "<filename>", "list all pkgs owning files"}, |
257 |
|
258 |
diff --git a/man/q.1 b/man/q.1 |
259 |
index afba24a..cbf2303 100644 |
260 |
--- a/man/q.1 |
261 |
+++ b/man/q.1 |
262 |
@@ -1,5 +1,5 @@ |
263 |
.\" generated by mkman.py, please do NOT edit! |
264 |
-.TH q "1" "Apr 2019" "Gentoo Foundation" "q" |
265 |
+.TH q "1" "May 2019" "Gentoo Foundation" "q" |
266 |
.SH NAME |
267 |
q \- invoke a portage utility applet |
268 |
.SH SYNOPSIS |
269 |
@@ -37,7 +37,7 @@ Print version and exit. |
270 |
.B This applet also has sub applets: |
271 |
q <applet> <args> : virtual applet |
272 |
qatom <pkg> : split atom strings |
273 |
- qcache <action> <args> : search the metadata cache |
274 |
+ qkeyword <action> <args> : list packages based on keywords |
275 |
qcheck <pkgname> : verify integrity of installed packages |
276 |
qdepends <pkgname> : show dependency info |
277 |
qfile <filename> : list all pkgs owning files |
278 |
@@ -65,11 +65,11 @@ Fabian Groffen <grobian@g.o> |
279 |
.fi |
280 |
.SH "SEE ALSO" |
281 |
.BR qatom (1), |
282 |
-.BR qcache (1), |
283 |
.BR qcheck (1), |
284 |
.BR qdepends (1), |
285 |
.BR qfile (1), |
286 |
.BR qgrep (1), |
287 |
+.BR qkeyword (1), |
288 |
.BR qlist (1), |
289 |
.BR qlop (1), |
290 |
.BR qmerge (1), |
291 |
|
292 |
diff --git a/man/qatom.1 b/man/qatom.1 |
293 |
index 046b89e..15799c4 100644 |
294 |
--- a/man/qatom.1 |
295 |
+++ b/man/qatom.1 |
296 |
@@ -1,5 +1,5 @@ |
297 |
.\" generated by mkman.py, please do NOT edit! |
298 |
-.TH qatom "1" "Apr 2019" "Gentoo Foundation" "qatom" |
299 |
+.TH qatom "1" "May 2019" "Gentoo Foundation" "qatom" |
300 |
.SH NAME |
301 |
qatom \- split atom strings |
302 |
.SH SYNOPSIS |
303 |
@@ -100,11 +100,11 @@ Fabian Groffen <grobian@g.o> |
304 |
.fi |
305 |
.SH "SEE ALSO" |
306 |
.BR q (1), |
307 |
-.BR qcache (1), |
308 |
.BR qcheck (1), |
309 |
.BR qdepends (1), |
310 |
.BR qfile (1), |
311 |
.BR qgrep (1), |
312 |
+.BR qkeyword (1), |
313 |
.BR qlist (1), |
314 |
.BR qlop (1), |
315 |
.BR qmerge (1), |
316 |
|
317 |
diff --git a/man/qcheck.1 b/man/qcheck.1 |
318 |
index c139744..336813f 100644 |
319 |
--- a/man/qcheck.1 |
320 |
+++ b/man/qcheck.1 |
321 |
@@ -1,5 +1,5 @@ |
322 |
.\" generated by mkman.py, please do NOT edit! |
323 |
-.TH qcheck "1" "Apr 2019" "Gentoo Foundation" "qcheck" |
324 |
+.TH qcheck "1" "May 2019" "Gentoo Foundation" "qcheck" |
325 |
.SH NAME |
326 |
qcheck \- verify integrity of installed packages |
327 |
.SH SYNOPSIS |
328 |
@@ -64,10 +64,10 @@ Fabian Groffen <grobian@g.o> |
329 |
.SH "SEE ALSO" |
330 |
.BR q (1), |
331 |
.BR qatom (1), |
332 |
-.BR qcache (1), |
333 |
.BR qdepends (1), |
334 |
.BR qfile (1), |
335 |
.BR qgrep (1), |
336 |
+.BR qkeyword (1), |
337 |
.BR qlist (1), |
338 |
.BR qlop (1), |
339 |
.BR qmerge (1), |
340 |
|
341 |
diff --git a/man/qdepends.1 b/man/qdepends.1 |
342 |
index dcaef0c..1020b9a 100644 |
343 |
--- a/man/qdepends.1 |
344 |
+++ b/man/qdepends.1 |
345 |
@@ -1,5 +1,5 @@ |
346 |
.\" generated by mkman.py, please do NOT edit! |
347 |
-.TH qdepends "1" "Apr 2019" "Gentoo Foundation" "qdepends" |
348 |
+.TH qdepends "1" "May 2019" "Gentoo Foundation" "qdepends" |
349 |
.SH NAME |
350 |
qdepends \- show dependency info |
351 |
.SH SYNOPSIS |
352 |
@@ -121,10 +121,10 @@ Fabian Groffen <grobian@g.o> |
353 |
.SH "SEE ALSO" |
354 |
.BR q (1), |
355 |
.BR qatom (1), |
356 |
-.BR qcache (1), |
357 |
.BR qcheck (1), |
358 |
.BR qfile (1), |
359 |
.BR qgrep (1), |
360 |
+.BR qkeyword (1), |
361 |
.BR qlist (1), |
362 |
.BR qlop (1), |
363 |
.BR qmerge (1), |
364 |
|
365 |
diff --git a/man/qfile.1 b/man/qfile.1 |
366 |
index 5cd297a..1440bd7 100644 |
367 |
--- a/man/qfile.1 |
368 |
+++ b/man/qfile.1 |
369 |
@@ -1,5 +1,5 @@ |
370 |
.\" generated by mkman.py, please do NOT edit! |
371 |
-.TH qfile "1" "Apr 2019" "Gentoo Foundation" "qfile" |
372 |
+.TH qfile "1" "May 2019" "Gentoo Foundation" "qfile" |
373 |
.SH NAME |
374 |
qfile \- list all pkgs owning files |
375 |
.SH SYNOPSIS |
376 |
@@ -214,10 +214,10 @@ TGL <degrenier[at]easyconnect.fr> |
377 |
.SH "SEE ALSO" |
378 |
.BR q (1), |
379 |
.BR qatom (1), |
380 |
-.BR qcache (1), |
381 |
.BR qcheck (1), |
382 |
.BR qdepends (1), |
383 |
.BR qgrep (1), |
384 |
+.BR qkeyword (1), |
385 |
.BR qlist (1), |
386 |
.BR qlop (1), |
387 |
.BR qmerge (1), |
388 |
|
389 |
diff --git a/man/qgrep.1 b/man/qgrep.1 |
390 |
index 34fe54d..78ffb19 100644 |
391 |
--- a/man/qgrep.1 |
392 |
+++ b/man/qgrep.1 |
393 |
@@ -1,5 +1,5 @@ |
394 |
.\" generated by mkman.py, please do NOT edit! |
395 |
-.TH qgrep "1" "Apr 2019" "Gentoo Foundation" "qgrep" |
396 |
+.TH qgrep "1" "May 2019" "Gentoo Foundation" "qgrep" |
397 |
.SH NAME |
398 |
qgrep \- grep in ebuilds |
399 |
.SH SYNOPSIS |
400 |
@@ -94,10 +94,10 @@ Fabian Groffen <grobian@g.o> |
401 |
.SH "SEE ALSO" |
402 |
.BR q (1), |
403 |
.BR qatom (1), |
404 |
-.BR qcache (1), |
405 |
.BR qcheck (1), |
406 |
.BR qdepends (1), |
407 |
.BR qfile (1), |
408 |
+.BR qkeyword (1), |
409 |
.BR qlist (1), |
410 |
.BR qlop (1), |
411 |
.BR qmerge (1), |
412 |
|
413 |
diff --git a/man/qcache.1 b/man/qkeyword.1 |
414 |
similarity index 93% |
415 |
rename from man/qcache.1 |
416 |
rename to man/qkeyword.1 |
417 |
index 675059e..a575404 100644 |
418 |
--- a/man/qcache.1 |
419 |
+++ b/man/qkeyword.1 |
420 |
@@ -1,9 +1,9 @@ |
421 |
.\" generated by mkman.py, please do NOT edit! |
422 |
-.TH qcache "1" "Apr 2019" "Gentoo Foundation" "qcache" |
423 |
+.TH qkeyword "1" "May 2019" "Gentoo Foundation" "qkeyword" |
424 |
.SH NAME |
425 |
-qcache \- search the metadata cache |
426 |
+qkeyword \- list packages based on keywords |
427 |
.SH SYNOPSIS |
428 |
-.B qcache |
429 |
+.B qkeyword |
430 |
\fI[opts] <action> <args>\fR |
431 |
.SH DESCRIPTION |
432 |
|
433 |
|
434 |
diff --git a/man/qlist.1 b/man/qlist.1 |
435 |
index 0b16318..3932319 100644 |
436 |
--- a/man/qlist.1 |
437 |
+++ b/man/qlist.1 |
438 |
@@ -1,5 +1,5 @@ |
439 |
.\" generated by mkman.py, please do NOT edit! |
440 |
-.TH qlist "1" "Apr 2019" "Gentoo Foundation" "qlist" |
441 |
+.TH qlist "1" "May 2019" "Gentoo Foundation" "qlist" |
442 |
.SH NAME |
443 |
qlist \- list files owned by pkgname |
444 |
.SH SYNOPSIS |
445 |
@@ -86,11 +86,11 @@ Fabian Groffen <grobian@g.o> |
446 |
.SH "SEE ALSO" |
447 |
.BR q (1), |
448 |
.BR qatom (1), |
449 |
-.BR qcache (1), |
450 |
.BR qcheck (1), |
451 |
.BR qdepends (1), |
452 |
.BR qfile (1), |
453 |
.BR qgrep (1), |
454 |
+.BR qkeyword (1), |
455 |
.BR qlop (1), |
456 |
.BR qmerge (1), |
457 |
.BR qpkg (1), |
458 |
|
459 |
diff --git a/man/qlop.1 b/man/qlop.1 |
460 |
index 4dd31c1..83b62f8 100644 |
461 |
--- a/man/qlop.1 |
462 |
+++ b/man/qlop.1 |
463 |
@@ -1,5 +1,5 @@ |
464 |
.\" generated by mkman.py, please do NOT edit! |
465 |
-.TH qlop "1" "Apr 2019" "Gentoo Foundation" "qlop" |
466 |
+.TH qlop "1" "May 2019" "Gentoo Foundation" "qlop" |
467 |
.SH NAME |
468 |
qlop \- emerge log analyzer |
469 |
.SH SYNOPSIS |
470 |
@@ -135,11 +135,11 @@ Fabian Groffen <grobian@g.o> |
471 |
.SH "SEE ALSO" |
472 |
.BR q (1), |
473 |
.BR qatom (1), |
474 |
-.BR qcache (1), |
475 |
.BR qcheck (1), |
476 |
.BR qdepends (1), |
477 |
.BR qfile (1), |
478 |
.BR qgrep (1), |
479 |
+.BR qkeyword (1), |
480 |
.BR qlist (1), |
481 |
.BR qmerge (1), |
482 |
.BR qpkg (1), |
483 |
|
484 |
diff --git a/man/qmerge.1 b/man/qmerge.1 |
485 |
index d303e45..e0503e1 100644 |
486 |
--- a/man/qmerge.1 |
487 |
+++ b/man/qmerge.1 |
488 |
@@ -1,5 +1,5 @@ |
489 |
.\" generated by mkman.py, please do NOT edit! |
490 |
-.TH qmerge "1" "Apr 2019" "Gentoo Foundation" "qmerge" |
491 |
+.TH qmerge "1" "May 2019" "Gentoo Foundation" "qmerge" |
492 |
.SH NAME |
493 |
qmerge \- fetch and merge binary package |
494 |
.SH SYNOPSIS |
495 |
@@ -75,11 +75,11 @@ Fabian Groffen <grobian@g.o> |
496 |
.SH "SEE ALSO" |
497 |
.BR q (1), |
498 |
.BR qatom (1), |
499 |
-.BR qcache (1), |
500 |
.BR qcheck (1), |
501 |
.BR qdepends (1), |
502 |
.BR qfile (1), |
503 |
.BR qgrep (1), |
504 |
+.BR qkeyword (1), |
505 |
.BR qlist (1), |
506 |
.BR qlop (1), |
507 |
.BR qpkg (1), |
508 |
|
509 |
diff --git a/man/qpkg.1 b/man/qpkg.1 |
510 |
index 17278ec..4fb265c 100644 |
511 |
--- a/man/qpkg.1 |
512 |
+++ b/man/qpkg.1 |
513 |
@@ -1,5 +1,5 @@ |
514 |
.\" generated by mkman.py, please do NOT edit! |
515 |
-.TH qpkg "1" "Apr 2019" "Gentoo Foundation" "qpkg" |
516 |
+.TH qpkg "1" "May 2019" "Gentoo Foundation" "qpkg" |
517 |
.SH NAME |
518 |
qpkg \- manipulate Gentoo binpkgs |
519 |
.SH SYNOPSIS |
520 |
@@ -55,11 +55,11 @@ Fabian Groffen <grobian@g.o> |
521 |
.SH "SEE ALSO" |
522 |
.BR q (1), |
523 |
.BR qatom (1), |
524 |
-.BR qcache (1), |
525 |
.BR qcheck (1), |
526 |
.BR qdepends (1), |
527 |
.BR qfile (1), |
528 |
.BR qgrep (1), |
529 |
+.BR qkeyword (1), |
530 |
.BR qlist (1), |
531 |
.BR qlop (1), |
532 |
.BR qmerge (1), |
533 |
|
534 |
diff --git a/man/qsearch.1 b/man/qsearch.1 |
535 |
index 1bea7ab..af27416 100644 |
536 |
--- a/man/qsearch.1 |
537 |
+++ b/man/qsearch.1 |
538 |
@@ -1,5 +1,5 @@ |
539 |
.\" generated by mkman.py, please do NOT edit! |
540 |
-.TH qsearch "1" "Apr 2019" "Gentoo Foundation" "qsearch" |
541 |
+.TH qsearch "1" "May 2019" "Gentoo Foundation" "qsearch" |
542 |
.SH NAME |
543 |
qsearch \- search pkgname/desc |
544 |
.SH SYNOPSIS |
545 |
@@ -60,11 +60,11 @@ Fabian Groffen <grobian@g.o> |
546 |
.SH "SEE ALSO" |
547 |
.BR q (1), |
548 |
.BR qatom (1), |
549 |
-.BR qcache (1), |
550 |
.BR qcheck (1), |
551 |
.BR qdepends (1), |
552 |
.BR qfile (1), |
553 |
.BR qgrep (1), |
554 |
+.BR qkeyword (1), |
555 |
.BR qlist (1), |
556 |
.BR qlop (1), |
557 |
.BR qmerge (1), |
558 |
|
559 |
diff --git a/man/qsize.1 b/man/qsize.1 |
560 |
index 9733e04..bcad17e 100644 |
561 |
--- a/man/qsize.1 |
562 |
+++ b/man/qsize.1 |
563 |
@@ -1,5 +1,5 @@ |
564 |
.\" generated by mkman.py, please do NOT edit! |
565 |
-.TH qsize "1" "Apr 2019" "Gentoo Foundation" "qsize" |
566 |
+.TH qsize "1" "May 2019" "Gentoo Foundation" "qsize" |
567 |
.SH NAME |
568 |
qsize \- calculate size usage |
569 |
.SH SYNOPSIS |
570 |
@@ -64,11 +64,11 @@ Fabian Groffen <grobian@g.o> |
571 |
.SH "SEE ALSO" |
572 |
.BR q (1), |
573 |
.BR qatom (1), |
574 |
-.BR qcache (1), |
575 |
.BR qcheck (1), |
576 |
.BR qdepends (1), |
577 |
.BR qfile (1), |
578 |
.BR qgrep (1), |
579 |
+.BR qkeyword (1), |
580 |
.BR qlist (1), |
581 |
.BR qlop (1), |
582 |
.BR qmerge (1), |
583 |
|
584 |
diff --git a/man/qtbz2.1 b/man/qtbz2.1 |
585 |
index bb591b1..f177128 100644 |
586 |
--- a/man/qtbz2.1 |
587 |
+++ b/man/qtbz2.1 |
588 |
@@ -1,5 +1,5 @@ |
589 |
.\" generated by mkman.py, please do NOT edit! |
590 |
-.TH qtbz2 "1" "Apr 2019" "Gentoo Foundation" "qtbz2" |
591 |
+.TH qtbz2 "1" "May 2019" "Gentoo Foundation" "qtbz2" |
592 |
.SH NAME |
593 |
qtbz2 \- manipulate tbz2 packages |
594 |
.SH SYNOPSIS |
595 |
@@ -59,11 +59,11 @@ Fabian Groffen <grobian@g.o> |
596 |
.SH "SEE ALSO" |
597 |
.BR q (1), |
598 |
.BR qatom (1), |
599 |
-.BR qcache (1), |
600 |
.BR qcheck (1), |
601 |
.BR qdepends (1), |
602 |
.BR qfile (1), |
603 |
.BR qgrep (1), |
604 |
+.BR qkeyword (1), |
605 |
.BR qlist (1), |
606 |
.BR qlop (1), |
607 |
.BR qmerge (1), |
608 |
|
609 |
diff --git a/man/qtegrity.1 b/man/qtegrity.1 |
610 |
index 429c4f7..048d4fa 100644 |
611 |
--- a/man/qtegrity.1 |
612 |
+++ b/man/qtegrity.1 |
613 |
@@ -1,5 +1,5 @@ |
614 |
.\" generated by mkman.py, please do NOT edit! |
615 |
-.TH qtegrity "1" "Apr 2019" "Gentoo Foundation" "qtegrity" |
616 |
+.TH qtegrity "1" "May 2019" "Gentoo Foundation" "qtegrity" |
617 |
.SH NAME |
618 |
qtegrity \- verify files with IMA |
619 |
.SH SYNOPSIS |
620 |
@@ -65,11 +65,11 @@ Sam Besselink |
621 |
.SH "SEE ALSO" |
622 |
.BR q (1), |
623 |
.BR qatom (1), |
624 |
-.BR qcache (1), |
625 |
.BR qcheck (1), |
626 |
.BR qdepends (1), |
627 |
.BR qfile (1), |
628 |
.BR qgrep (1), |
629 |
+.BR qkeyword (1), |
630 |
.BR qlist (1), |
631 |
.BR qlop (1), |
632 |
.BR qmerge (1), |
633 |
|
634 |
diff --git a/man/quse.1 b/man/quse.1 |
635 |
index bb02306..6f0d8d3 100644 |
636 |
--- a/man/quse.1 |
637 |
+++ b/man/quse.1 |
638 |
@@ -58,11 +58,11 @@ Fabian Groffen <grobian@g.o> |
639 |
.SH "SEE ALSO" |
640 |
.BR q (1), |
641 |
.BR qatom (1), |
642 |
-.BR qcache (1), |
643 |
.BR qcheck (1), |
644 |
.BR qdepends (1), |
645 |
.BR qfile (1), |
646 |
.BR qgrep (1), |
647 |
+.BR qkeyword (1), |
648 |
.BR qlist (1), |
649 |
.BR qlop (1), |
650 |
.BR qmerge (1), |
651 |
|
652 |
diff --git a/man/qxpak.1 b/man/qxpak.1 |
653 |
index ccd94a1..529e8b3 100644 |
654 |
--- a/man/qxpak.1 |
655 |
+++ b/man/qxpak.1 |
656 |
@@ -1,5 +1,5 @@ |
657 |
.\" generated by mkman.py, please do NOT edit! |
658 |
-.TH qxpak "1" "Apr 2019" "Gentoo Foundation" "qxpak" |
659 |
+.TH qxpak "1" "May 2019" "Gentoo Foundation" "qxpak" |
660 |
.SH NAME |
661 |
qxpak \- manipulate xpak archives |
662 |
.SH SYNOPSIS |
663 |
@@ -55,11 +55,11 @@ Fabian Groffen <grobian@g.o> |
664 |
.SH "SEE ALSO" |
665 |
.BR q (1), |
666 |
.BR qatom (1), |
667 |
-.BR qcache (1), |
668 |
.BR qcheck (1), |
669 |
.BR qdepends (1), |
670 |
.BR qfile (1), |
671 |
.BR qgrep (1), |
672 |
+.BR qkeyword (1), |
673 |
.BR qlist (1), |
674 |
.BR qlop (1), |
675 |
.BR qmerge (1), |
676 |
|
677 |
diff --git a/qcache.c b/qkeyword.c |
678 |
similarity index 85% |
679 |
rename from qcache.c |
680 |
rename to qkeyword.c |
681 |
index 116f389..17430fc 100644 |
682 |
--- a/qcache.c |
683 |
+++ b/qkeyword.c |
684 |
@@ -28,8 +28,8 @@ |
685 |
/* Required portage-utils stuff */ |
686 |
/********************************************************************/ |
687 |
|
688 |
-#define QCACHE_FLAGS "p:c:idtans" COMMON_FLAGS |
689 |
-static struct option const qcache_long_opts[] = { |
690 |
+#define QKEYWORD_FLAGS "p:c:idtans" COMMON_FLAGS |
691 |
+static struct option const qkeyword_long_opts[] = { |
692 |
{"matchpkg", a_argument, NULL, 'p'}, |
693 |
{"matchcat", a_argument, NULL, 'c'}, |
694 |
{"imlate", no_argument, NULL, 'i'}, |
695 |
@@ -40,7 +40,7 @@ static struct option const qcache_long_opts[] = { |
696 |
{"not", no_argument, NULL, 'n'}, |
697 |
COMMON_LONG_OPTS |
698 |
}; |
699 |
-static const char * const qcache_opts_help[] = { |
700 |
+static const char * const qkeyword_opts_help[] = { |
701 |
"match pkgname", |
702 |
"match catname", |
703 |
"list packages that can be marked stable on a given arch", |
704 |
@@ -51,7 +51,7 @@ static const char * const qcache_opts_help[] = { |
705 |
"list packages that aren't keyworded on a given arch.", |
706 |
COMMON_OPTS_HELP |
707 |
}; |
708 |
-#define qcache_usage(ret) usage(ret, QCACHE_FLAGS, qcache_long_opts, qcache_opts_help, NULL, lookup_applet_idx("qcache")) |
709 |
+#define qkeyword_usage(ret) usage(ret, QKEYWORD_FLAGS, qkeyword_long_opts, qkeyword_opts_help, NULL, lookup_applet_idx("qkeyword")) |
710 |
|
711 |
typedef struct { |
712 |
depend_atom *qatom; |
713 |
@@ -60,14 +60,14 @@ typedef struct { |
714 |
size_t keywordsbuflen; |
715 |
const char *arch; |
716 |
cache_pkg_cb *runfunc; |
717 |
-} qcache_data; |
718 |
+} qkeyword_data; |
719 |
|
720 |
static set *archs = NULL; |
721 |
static char **archlist = NULL; |
722 |
static size_t archlist_count; |
723 |
static size_t arch_longest_len; |
724 |
const char status[3] = {'-', '~', '+'}; |
725 |
-int qcache_test_arch = 0; |
726 |
+int qkeyword_test_arch = 0; |
727 |
|
728 |
enum { none = 0, testing, stable, minus }; |
729 |
|
730 |
@@ -200,7 +200,7 @@ read_keywords(char *s, int *keywords) |
731 |
* 0 (SAME) |
732 |
*/ |
733 |
static int |
734 |
-qcache_vercmp(const struct dirent **x, const struct dirent **y) |
735 |
+qkeyword_vercmp(const struct dirent **x, const struct dirent **y) |
736 |
{ |
737 |
switch (atom_compare_str((*x)->d_name, (*y)->d_name)) { |
738 |
case EQUAL: return 0; |
739 |
@@ -211,12 +211,12 @@ qcache_vercmp(const struct dirent **x, const struct dirent **y) |
740 |
} |
741 |
|
742 |
static int |
743 |
-qcache_imlate(cache_pkg_ctx *pkg_ctx, void *priv) |
744 |
+qkeyword_imlate(cache_pkg_ctx *pkg_ctx, void *priv) |
745 |
{ |
746 |
size_t a; |
747 |
- qcache_data *data = (qcache_data *)priv; |
748 |
+ qkeyword_data *data = (qkeyword_data *)priv; |
749 |
|
750 |
- switch (data->keywordsbuf[qcache_test_arch]) { |
751 |
+ switch (data->keywordsbuf[qkeyword_test_arch]) { |
752 |
case stable: |
753 |
case none: |
754 |
case minus: |
755 |
@@ -238,13 +238,13 @@ qcache_imlate(cache_pkg_ctx *pkg_ctx, void *priv) |
756 |
} |
757 |
|
758 |
static int |
759 |
-qcache_not(cache_pkg_ctx *pkg_ctx, void *priv) |
760 |
+qkeyword_not(cache_pkg_ctx *pkg_ctx, void *priv) |
761 |
{ |
762 |
size_t a; |
763 |
- qcache_data *data = (qcache_data *)priv; |
764 |
+ qkeyword_data *data = (qkeyword_data *)priv; |
765 |
|
766 |
- if (data->keywordsbuf[qcache_test_arch] != testing && |
767 |
- data->keywordsbuf[qcache_test_arch] != stable) |
768 |
+ if (data->keywordsbuf[qkeyword_test_arch] != testing && |
769 |
+ data->keywordsbuf[qkeyword_test_arch] != stable) |
770 |
{ |
771 |
/* match if any of the other arches have keywords */ |
772 |
for (a = 0; a < archlist_count; a++) { |
773 |
@@ -263,12 +263,12 @@ qcache_not(cache_pkg_ctx *pkg_ctx, void *priv) |
774 |
} |
775 |
|
776 |
static int |
777 |
-qcache_all(cache_pkg_ctx *pkg_ctx, void *priv) |
778 |
+qkeyword_all(cache_pkg_ctx *pkg_ctx, void *priv) |
779 |
{ |
780 |
- qcache_data *data = (qcache_data *)priv; |
781 |
+ qkeyword_data *data = (qkeyword_data *)priv; |
782 |
|
783 |
- if (data->keywordsbuf[qcache_test_arch] == stable || |
784 |
- data->keywordsbuf[qcache_test_arch] == testing) |
785 |
+ if (data->keywordsbuf[qkeyword_test_arch] == stable || |
786 |
+ data->keywordsbuf[qkeyword_test_arch] == testing) |
787 |
{ |
788 |
print_keywords(pkg_ctx->cat_ctx->name, pkg_ctx->name, |
789 |
data->keywordsbuf); |
790 |
@@ -279,7 +279,7 @@ qcache_all(cache_pkg_ctx *pkg_ctx, void *priv) |
791 |
} |
792 |
|
793 |
static int |
794 |
-qcache_dropped(cache_pkg_ctx *pkg_ctx, void *priv) |
795 |
+qkeyword_dropped(cache_pkg_ctx *pkg_ctx, void *priv) |
796 |
{ |
797 |
static bool candidate = false; |
798 |
static char pkg1[_Q_PATH_MAX]; |
799 |
@@ -290,7 +290,7 @@ qcache_dropped(cache_pkg_ctx *pkg_ctx, void *priv) |
800 |
static int *candkwds = NULL; |
801 |
static size_t candkwdslen = 0; |
802 |
|
803 |
- qcache_data *data = (qcache_data *)priv; |
804 |
+ qkeyword_data *data = (qkeyword_data *)priv; |
805 |
size_t i; |
806 |
char *p; |
807 |
|
808 |
@@ -333,12 +333,12 @@ qcache_dropped(cache_pkg_ctx *pkg_ctx, void *priv) |
809 |
} |
810 |
|
811 |
/* explicitly removed? */ |
812 |
- if (data->keywordsbuf[qcache_test_arch] == minus) |
813 |
+ if (data->keywordsbuf[qkeyword_test_arch] == minus) |
814 |
return EXIT_FAILURE; |
815 |
|
816 |
/* got a keyword? */ |
817 |
- if (data->keywordsbuf[qcache_test_arch] == testing || |
818 |
- data->keywordsbuf[qcache_test_arch] == stable) |
819 |
+ if (data->keywordsbuf[qkeyword_test_arch] == testing || |
820 |
+ data->keywordsbuf[qkeyword_test_arch] == stable) |
821 |
{ |
822 |
if (candidate) { |
823 |
p = strchr(candpkg, '/'); |
824 |
@@ -390,7 +390,7 @@ print_seconds_for_earthlings(const unsigned long t) |
825 |
} |
826 |
|
827 |
static int |
828 |
-qcache_stats(cache_pkg_ctx *pkg_ctx, void *priv) |
829 |
+qkeyword_stats(cache_pkg_ctx *pkg_ctx, void *priv) |
830 |
{ |
831 |
static time_t runtime; |
832 |
static int numpkg = 0; |
833 |
@@ -404,7 +404,7 @@ qcache_stats(cache_pkg_ctx *pkg_ctx, void *priv) |
834 |
|
835 |
size_t a; |
836 |
depend_atom *atom; |
837 |
- qcache_data *data = (qcache_data *)priv; |
838 |
+ qkeyword_data *data = (qkeyword_data *)priv; |
839 |
|
840 |
/* Is this the last time we'll be called? */ |
841 |
if (!data) { |
842 |
@@ -527,7 +527,7 @@ qcache_stats(cache_pkg_ctx *pkg_ctx, void *priv) |
843 |
} |
844 |
|
845 |
static int |
846 |
-qcache_testing_only(cache_pkg_ctx *pkg_ctx, void *priv) |
847 |
+qkeyword_testing_only(cache_pkg_ctx *pkg_ctx, void *priv) |
848 |
{ |
849 |
static bool candidate = false; |
850 |
static char pkg1[_Q_PATH_MAX]; |
851 |
@@ -538,7 +538,7 @@ qcache_testing_only(cache_pkg_ctx *pkg_ctx, void *priv) |
852 |
static int *candkwds = NULL; |
853 |
static size_t candkwdslen = 0; |
854 |
|
855 |
- qcache_data *data = (qcache_data *)priv; |
856 |
+ qkeyword_data *data = (qkeyword_data *)priv; |
857 |
char *p; |
858 |
|
859 |
p = lastpkg; |
860 |
@@ -576,12 +576,12 @@ qcache_testing_only(cache_pkg_ctx *pkg_ctx, void *priv) |
861 |
} |
862 |
|
863 |
/* explicitly removed or unkeyworded? */ |
864 |
- if (data->keywordsbuf[qcache_test_arch] == minus || |
865 |
- data->keywordsbuf[qcache_test_arch] == none) |
866 |
+ if (data->keywordsbuf[qkeyword_test_arch] == minus || |
867 |
+ data->keywordsbuf[qkeyword_test_arch] == none) |
868 |
return EXIT_FAILURE; |
869 |
|
870 |
/* got a stable keyword? */ |
871 |
- if (data->keywordsbuf[qcache_test_arch] == stable) |
872 |
+ if (data->keywordsbuf[qkeyword_test_arch] == stable) |
873 |
return EXIT_SUCCESS; /* suppress further hits for this package */ |
874 |
|
875 |
/* must be testing at this point */ |
876 |
@@ -597,10 +597,10 @@ qcache_testing_only(cache_pkg_ctx *pkg_ctx, void *priv) |
877 |
} |
878 |
|
879 |
static int |
880 |
-qcache_results_cb(cache_pkg_ctx *pkg_ctx, void *priv) |
881 |
+qkeyword_results_cb(cache_pkg_ctx *pkg_ctx, void *priv) |
882 |
{ |
883 |
int *keywords; |
884 |
- qcache_data *data = (qcache_data *)priv; |
885 |
+ qkeyword_data *data = (qkeyword_data *)priv; |
886 |
char buf[_Q_PATH_MAX]; |
887 |
depend_atom *patom = NULL; |
888 |
cache_pkg_meta *meta; |
889 |
@@ -658,7 +658,7 @@ qcache_results_cb(cache_pkg_ctx *pkg_ctx, void *priv) |
890 |
} |
891 |
|
892 |
static void |
893 |
-qcache_load_arches(const char *overlay) |
894 |
+qkeyword_load_arches(const char *overlay) |
895 |
{ |
896 |
FILE *fp; |
897 |
char *filename, *s; |
898 |
@@ -705,17 +705,17 @@ qcache_load_arches(const char *overlay) |
899 |
} |
900 |
|
901 |
static int |
902 |
-qcache_traverse(cache_pkg_cb func, void *priv) |
903 |
+qkeyword_traverse(cache_pkg_cb func, void *priv) |
904 |
{ |
905 |
int ret; |
906 |
size_t n; |
907 |
const char *overlay; |
908 |
- qcache_data *data = (qcache_data *)priv; |
909 |
+ qkeyword_data *data = (qkeyword_data *)priv; |
910 |
|
911 |
/* Preload all the arches. Not entirely correctly (as arches are bound |
912 |
* to overlays if set), but oh well. */ |
913 |
array_for_each(overlays, n, overlay) |
914 |
- qcache_load_arches(overlay); |
915 |
+ qkeyword_load_arches(overlay); |
916 |
|
917 |
/* allocate memory (once) for the list used by various funcs */ |
918 |
if (archlist_count > data->keywordsbuflen) { |
919 |
@@ -724,28 +724,28 @@ qcache_traverse(cache_pkg_cb func, void *priv) |
920 |
data->keywordsbuflen = archlist_count; |
921 |
} |
922 |
|
923 |
- qcache_test_arch = decode_arch(data->arch); |
924 |
- if (qcache_test_arch == -1) |
925 |
+ qkeyword_test_arch = decode_arch(data->arch); |
926 |
+ if (qkeyword_test_arch == -1) |
927 |
return EXIT_FAILURE; |
928 |
|
929 |
data->runfunc = func; |
930 |
ret = 0; |
931 |
array_for_each(overlays, n, overlay) |
932 |
ret |= cache_foreach_pkg_sorted(portroot, overlay, |
933 |
- qcache_results_cb, priv, NULL, qcache_vercmp); |
934 |
+ qkeyword_results_cb, priv, NULL, qkeyword_vercmp); |
935 |
|
936 |
return ret; |
937 |
} |
938 |
|
939 |
-int qcache_main(int argc, char **argv) |
940 |
+int qkeyword_main(int argc, char **argv) |
941 |
{ |
942 |
int i; |
943 |
char action = '\0'; |
944 |
- qcache_data data; |
945 |
+ qkeyword_data data; |
946 |
char *pkg = NULL; |
947 |
char *cat = NULL; |
948 |
|
949 |
- while ((i = GETOPT_LONG(QCACHE, qcache, "")) != -1) { |
950 |
+ while ((i = GETOPT_LONG(QKEYWORD, qkeyword, "")) != -1) { |
951 |
switch (i) { |
952 |
case 'p': pkg = optarg; break; |
953 |
case 'c': cat = optarg; break; |
954 |
@@ -756,12 +756,12 @@ int qcache_main(int argc, char **argv) |
955 |
case 'a': |
956 |
case 'n': |
957 |
if (action) |
958 |
- qcache_usage(EXIT_FAILURE); |
959 |
+ qkeyword_usage(EXIT_FAILURE); |
960 |
/* trying to use more than 1 action */ |
961 |
action = i; |
962 |
break; |
963 |
|
964 |
- COMMON_GETOPTS_CASES(qcache) |
965 |
+ COMMON_GETOPTS_CASES(qkeyword) |
966 |
} |
967 |
} |
968 |
|
969 |
@@ -770,7 +770,7 @@ int qcache_main(int argc, char **argv) |
970 |
data.arch = argv[optind]; |
971 |
|
972 |
if ((data.arch == NULL && action != 's') || optind + 1 < argc) |
973 |
- qcache_usage(EXIT_FAILURE); |
974 |
+ qkeyword_usage(EXIT_FAILURE); |
975 |
|
976 |
if (cat != NULL) { |
977 |
char buf[_Q_PATH_MAX]; |
978 |
@@ -797,17 +797,17 @@ int qcache_main(int argc, char **argv) |
979 |
data.keywordsbuflen = 0; |
980 |
|
981 |
switch (action) { |
982 |
- case 'i': i = qcache_traverse(qcache_imlate, &data); break; |
983 |
- case 'd': i = qcache_traverse(qcache_dropped, &data); |
984 |
- i = qcache_dropped(NULL, NULL); break; |
985 |
- case 't': i = qcache_traverse(qcache_testing_only, &data); |
986 |
- i = qcache_testing_only(NULL, NULL); break; |
987 |
+ case 'i': i = qkeyword_traverse(qkeyword_imlate, &data); break; |
988 |
+ case 'd': i = qkeyword_traverse(qkeyword_dropped, &data); |
989 |
+ i = qkeyword_dropped(NULL, NULL); break; |
990 |
+ case 't': i = qkeyword_traverse(qkeyword_testing_only, &data); |
991 |
+ i = qkeyword_testing_only(NULL, NULL); break; |
992 |
case 's': data.arch = "amd64"; /* doesn't matter, need to be set */ |
993 |
- i = qcache_traverse(qcache_stats, &data); |
994 |
- i = qcache_stats(NULL, NULL); break; |
995 |
- case 'a': i = qcache_traverse(qcache_all, &data); break; |
996 |
- case 'n': i = qcache_traverse(qcache_not, &data); break; |
997 |
- default: i = -2; break; |
998 |
+ i = qkeyword_traverse(qkeyword_stats, &data); |
999 |
+ i = qkeyword_stats(NULL, NULL); break; |
1000 |
+ case 'a': i = qkeyword_traverse(qkeyword_all, &data); break; |
1001 |
+ case 'n': i = qkeyword_traverse(qkeyword_not, &data); break; |
1002 |
+ default: i = -2; break; |
1003 |
} |
1004 |
|
1005 |
if (data.qatom != NULL) |
1006 |
@@ -815,6 +815,6 @@ int qcache_main(int argc, char **argv) |
1007 |
free(archlist); |
1008 |
free_set(archs); |
1009 |
if (i == -2) |
1010 |
- qcache_usage(EXIT_FAILURE); |
1011 |
+ qkeyword_usage(EXIT_FAILURE); |
1012 |
return i; |
1013 |
} |