Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-projects commit in portage-utils: qmerge.c
Date: Mon, 21 Feb 2011 01:52:56
Message-Id: 20110221015246.6E56F20054@flycatcher.gentoo.org
1 vapier 11/02/21 01:52:46
2
3 Modified: qmerge.c
4 Log:
5 clean up style a bit
6
7 Revision Changes Path
8 1.98 portage-utils/qmerge.c
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.98&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.98&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?r1=1.97&r2=1.98
13
14 Index: qmerge.c
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v
17 retrieving revision 1.97
18 retrieving revision 1.98
19 diff -u -r1.97 -r1.98
20 --- qmerge.c 21 Feb 2011 01:33:47 -0000 1.97
21 +++ qmerge.c 21 Feb 2011 01:52:46 -0000 1.98
22 @@ -1,7 +1,7 @@
23 /*
24 * Copyright 2005-2010 Gentoo Foundation
25 * Distributed under the terms of the GNU General Public License v2
26 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.97 2011/02/21 01:33:47 vapier Exp $
27 + * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.98 2011/02/21 01:52:46 vapier Exp $
28 *
29 * Copyright 2005-2010 Ned Ludd - <solar@g.o>
30 * Copyright 2005-2010 Mike Frysinger - <vapier@g.o>
31 @@ -55,7 +55,7 @@
32 COMMON_OPTS_HELP
33 };
34
35 -static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.97 2011/02/21 01:33:47 vapier Exp $";
36 +static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.98 2011/02/21 01:52:46 vapier Exp $";
37 #define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
38
39 char search_pkgs = 0;
40 @@ -113,8 +113,8 @@
41
42 struct pkg_t *grab_binpkg_info(const char *);
43
44 -int mkdirhier(char *dname, mode_t mode);
45 -int mkdirhier(char *dname, mode_t mode) {
46 +static int mkdirhier(char *dname, mode_t mode)
47 +{
48 char buf[BUFSIZ];
49 int i;
50 strncpy(buf, dname, sizeof(buf));
51 @@ -157,7 +157,7 @@
52 snprintf(buf, sizeof(buf), "qfile -Cqev %s 2>/dev/null", dst);
53 if ((fp = popen(buf, "r")) != NULL) {
54 buf[0] = '\0';
55 - if ((fgets(buf, sizeof(buf), fp)) != NULL)
56 + if (fgets(buf, sizeof(buf), fp) != NULL)
57 if ((p = strchr(buf, '\n')) != NULL) {
58 *p = 0;
59 p = xstrdup(buf);
60 @@ -218,7 +218,7 @@
61 errf("PORTAGE_BINHOST= does not appear to be valid");
62
63 if (!search_pkgs && !pretend) {
64 - if ((access(pkgdir, R_OK|W_OK|X_OK)) != 0)
65 + if (access(pkgdir, R_OK|W_OK|X_OK) != 0)
66 errf("Wrong perms on PKGDIR='%s'", pkgdir);
67 mkdir(port_tmpdir, 0755);
68 }
69 @@ -230,11 +230,11 @@
70 unlink(Packages);
71
72 if ((access(Packages, R_OK) != 0) && (force_download != 2)) {
73 - char *tbuf = NULL;
74 - xasprintf(&tbuf, "%s/portage/", port_tmpdir);
75 - if ((access(Packages, R_OK) != 0))
76 - fetch(tbuf, Packages);
77 - free(tbuf);
78 + char *tbuf = NULL;
79 + xasprintf(&tbuf, "%s/portage/", port_tmpdir);
80 + if (access(Packages, R_OK) != 0)
81 + fetch(tbuf, Packages);
82 + free(tbuf);
83 }
84 }
85
86 @@ -252,7 +252,7 @@
87 return NULL;
88
89 buf[0] = '\0';
90 - if ((fgets(buf, sizeof(buf), fp)) != NULL)
91 + if (fgets(buf, sizeof(buf), fp) != NULL)
92 if ((p = strchr(buf, '\n')) != NULL)
93 *p = 0;
94 pclose(fp);
95 @@ -267,14 +267,14 @@
96 snprintf(dest, sizeof(dest), "%s%s", portroot, buf);
97
98 for (i = 1; i < ARGC; i++)
99 - if ((strncmp(ARGV[i], buf, strlen(ARGV[i]))) == 0)
100 + if (strncmp(ARGV[i], buf, strlen(ARGV[i])) == 0)
101 if ((access(dest, R_OK)) == 0)
102 return 1;
103
104 - if ((strncmp("/etc", buf, 4)) == 0)
105 - if ((access(dest, R_OK)) == 0)
106 + if (strncmp("/etc", buf, 4) == 0)
107 + if (access(dest, R_OK) == 0)
108 return 1;
109 - if ((strcmp("/bin/sh", buf)) == 0)
110 + if (strcmp("/bin/sh", buf) == 0)
111 return 1;
112 return 0;
113 }
114 @@ -315,7 +315,7 @@
115 glob_t globbuf;
116
117 globbuf.gl_offs = 0;
118 - if ((glob(buf, GLOB_DOOFFS|GLOB_BRACE, NULL, &globbuf)) == 0) {
119 + if (glob(buf, GLOB_DOOFFS|GLOB_BRACE, NULL, &globbuf) == 0) {
120 for (g = 0; g < globbuf.gl_pathc; g++) {
121 strncpy(buf, globbuf.gl_pathv[g], sizeof(buf));
122 /* qprintf("globbed: %s\n", globbuf.gl_pathv[g]); */
123 @@ -374,11 +374,11 @@
124 }
125 if (update_only && c != 'U')
126 return c;
127 - if (((c == 'R') || (c == 'D')) && update_only && level)
128 + if ((c == 'R' || c == 'D') && update_only && level)
129 return c;
130 if (c == 'R')
131 snprintf(buf, sizeof(buf), "%s%c%s", YELLOW, c, NORM);
132 - if ((c == 'U') || (c == 'D'))
133 + if (c == 'U' || c == 'D')
134 snprintf(buf, sizeof(buf), "%s%c%s", BLUE, c, NORM);
135 #if 0
136 if (level) {
137 @@ -393,7 +393,8 @@
138 #endif
139 }
140 printf("[%s] ", buf);
141 - for (i = 0; i < level; i++) putchar(' ');
142 + for (i = 0; i < level; ++i)
143 + putchar(' ');
144 if (verbose)
145 printf("%s%s/%s%s %s%s%s%s%s%s\n", DKGREEN, pkg->CATEGORY, pkg->PF, NORM,
146 install_ver, strlen(pkg->USE) > 0 ? "(" : "", RED, pkg->USE, NORM, strlen(pkg->USE) > 0 ? ")" : "");
147 @@ -493,7 +494,7 @@
148 if (virtuals == NULL)
149 virtuals = resolve_virtuals();
150 resolved = find_binpkg(virtual(name, virtuals));
151 - if ((resolved == NULL) || (!strlen(resolved)))
152 + if (resolved == NULL || !strlen(resolved))
153 resolved = find_binpkg(name);
154 } else
155 resolved = NULL;
156 @@ -643,7 +644,7 @@
157
158 makeargv(config_protect, &ARGC, &ARGV);
159
160 - while ((fgets(buf, sizeof(buf), fp)) != NULL) {
161 + while (fgets(buf, sizeof(buf), fp) != NULL) {
162 char line[BUFSIZ];
163 int protected = 0;
164 char matched = 0;
165 @@ -655,7 +656,7 @@
166 if (buf[0] != '.')
167 continue;
168
169 - if (((strcmp(buf, ".")) == 0) || ((strcmp(buf, "..")) == 0))
170 + if ((strcmp(buf, ".") == 0) || (strcmp(buf, "..") == 0))
171 continue;
172
173 for (i = 1; i < iargc; i++) {
174 @@ -676,8 +677,8 @@
175
176 /* portage has code that handes fifo's but it looks unused */
177
178 - if ((S_ISCHR(st.st_mode)) || \
179 - (S_ISBLK(st.st_mode))); /* block or character device */
180 + if (S_ISCHR(st.st_mode) ||
181 + S_ISBLK(st.st_mode)); /* block or character device */
182 if (S_ISFIFO(st.st_mode)); /* FIFO (named pipe) */
183 if (S_ISSOCK(st.st_mode)); /* socket? (Not in POSIX.1-1996.) */
184
185 @@ -711,7 +712,7 @@
186 continue;
187 }
188 }
189 - if ((lstat(dest, &lst)) != (-1)) {
190 + if (lstat(dest, &lst) != -1) {
191 if (S_ISLNK(lst.st_mode)) {
192 warn("%s exists and is a symlink and we are going to overwrite it with a file", dest);
193 unlink_q(dest);
194 @@ -844,7 +845,7 @@
195 argv = NULL;
196 makeargv(config_protect, &argc, &argv);
197
198 - while ((fgets(buf, sizeof(buf), fp)) != NULL) {
199 + while (fgets(buf, sizeof(buf), fp) != NULL) {
200 contents_entry *e;
201 char zing[20];
202 int protected = 0;
203 @@ -928,10 +929,10 @@
204 int unlink_empty(char *buf)
205 {
206 struct stat st;
207 - if ((stat(buf, &st)) != (-1))
208 + if (stat(buf, &st) != -1)
209 if (st.st_size == 0)
210 return unlink(buf);
211 - return (-1);
212 + return -1;
213 }
214
215 int match_pkg(const char *name, struct pkg_t *pkg)
216 @@ -946,18 +947,18 @@
217 errf("%s/%s is not a valid atom", pkg->CATEGORY, pkg->PF);
218
219 /* verify this is the requested package */
220 - if ((strcmp(name, buf)) == 0)
221 + if (strcmp(name, buf) == 0)
222 match = 1;
223
224 - if ((strcmp(name, pkg->PF)) == 0)
225 + if (strcmp(name, pkg->PF) == 0)
226 match = 2;
227
228 snprintf(buf2, sizeof(buf2), "%s/%s", pkg->CATEGORY, atom->PN);
229
230 - if ((strcmp(name, buf2)) == 0)
231 + if (strcmp(name, buf2) == 0)
232 match = 3;
233
234 - if ((strcmp(name, atom->PN)) == 0)
235 + if (strcmp(name, atom->PN) == 0)
236 match = 4;
237
238 if (match)
239 @@ -1068,16 +1069,16 @@
240 snprintf(str, sizeof(str), "%s/%s", pkgdir, pkg->CATEGORY);
241 mkdir(str, 0755);
242
243 - if ((force_download) && (access(buf, R_OK) == 0) && ((pkg->SHA1[0]) || (pkg->MD5[0]))) {
244 - if ((pkg_verify_checksums(buf, pkg, atom, 0, 0)) != 0)
245 + if (force_download && (access(buf, R_OK) == 0) && (pkg->SHA1[0] || pkg->MD5[0])) {
246 + if (pkg_verify_checksums(buf, pkg, atom, 0, 0) != 0)
247 unlink(buf);
248 }
249 if (access(buf, R_OK) == 0) {
250 - if ((!pkg->SHA1[0]) && (!pkg->MD5[0])) {
251 + if (!pkg->SHA1[0] && !pkg->MD5[0]) {
252 warn("No checksum data for %s", buf);
253 return;
254 } else {
255 - if ((pkg_verify_checksums(buf, pkg, atom, qmerge_strict, 1)) == 0) {
256 + if (pkg_verify_checksums(buf, pkg, atom, qmerge_strict, 1) == 0) {
257 pkg_merge(0, atom, pkg);
258 return;
259 }
260 @@ -1120,7 +1121,7 @@
261 xchdir(savecwd);
262
263 snprintf(buf, sizeof(buf), "%s/%s/%s.tbz2", pkgdir, atom->CATEGORY, pkg->PF);
264 - if ((pkg_verify_checksums(buf, pkg, atom, qmerge_strict, 1)) == 0) {
265 + if (pkg_verify_checksums(buf, pkg, atom, qmerge_strict, 1) == 0) {
266 pkg_merge(0, atom, pkg);
267 return;
268 }
269 @@ -1231,7 +1232,7 @@
270 if ((fp = fopen(buf, "r")) == NULL)
271 errp("Unable to open package file %s", buf);
272
273 - while ((fgets(buf, sizeof(buf), fp)) != NULL) {
274 + while (fgets(buf, sizeof(buf), fp) != NULL) {
275 if (*buf == '\n') {
276 if (pkg->PF[0] && pkg->CATEGORY[0]) {
277 int ret;
278 @@ -1281,16 +1282,16 @@
279
280 if (*buf) {
281 /* we dont need all the info */
282 - if ((strcmp(buf, "RDEPEND:")) == 0)
283 + if (strcmp(buf, "RDEPEND:") == 0)
284 strncpy(pkg->RDEPEND, value, sizeof(Pkg.RDEPEND));
285 - if ((strcmp(buf, "PF:")) == 0)
286 + if (strcmp(buf, "PF:") == 0)
287 strncpy(pkg->PF, value, sizeof(Pkg.PF));
288 - if ((strcmp(buf, "CATEGORY:")) == 0)
289 + if (strcmp(buf, "CATEGORY:") == 0)
290 strncpy(pkg->CATEGORY, value, sizeof(Pkg.CATEGORY));
291 - if ((strcmp(buf, "REPO:")) == 0)
292 + if (strcmp(buf, "REPO:") == 0)
293 strncpy(pkg->REPO, value, sizeof(Pkg.REPO));
294
295 - if ((strcmp(buf, "CPV:")) == 0) {
296 + if (strcmp(buf, "CPV:") == 0) {
297 if ((atom = atom_explode(value)) != NULL) {
298 snprintf(buf, sizeof(buf), "%s-%s", atom->PN, atom->PV);
299 if (atom->PR_int)
300 @@ -1300,15 +1301,15 @@
301 atom_implode(atom);
302 }
303 }
304 - if ((strcmp(buf, "SLOT:")) == 0)
305 + if (strcmp(buf, "SLOT:") == 0)
306 strncpy(pkg->SLOT, value, sizeof(Pkg.SLOT));
307 - if ((strcmp(buf, "USE:")) == 0)
308 + if (strcmp(buf, "USE:") == 0)
309 strncpy(pkg->USE, value, sizeof(Pkg.USE));
310
311 /* checksums. We must have 1 or the other unless --*/
312 - if ((strcmp(buf, "MD5:")) == 0)
313 + if (strcmp(buf, "MD5:") == 0)
314 strncpy(pkg->MD5, value, sizeof(Pkg.MD5));
315 - if ((strcmp(buf, "SHA1:")) == 0)
316 + if (strcmp(buf, "SHA1:") == 0)
317 strncpy(pkg->SHA1, value, sizeof(Pkg.SHA1));
318 }
319 }
320 @@ -1337,7 +1338,7 @@
321 if ((fp = fopen(buf, "r")) == NULL)
322 errp("Unable to open package file %s", buf);
323
324 - while ((fgets(buf, sizeof(buf), fp)) != NULL) {
325 + while (fgets(buf, sizeof(buf), fp) != NULL) {
326 if (*buf == '\n') {
327 if (PF[0] && CATEGORY[0]) {
328 int ret;
329 @@ -1381,7 +1382,7 @@
330 strncpy(value, p, sizeof(value));
331
332 if (*buf) {
333 - if ((strcmp(buf, "CPV:")) == 0) {
334 + if (strcmp(buf, "CPV:") == 0) {
335 depend_atom *atom;
336 if ((atom = atom_explode(value)) != NULL) {
337 snprintf(buf, sizeof(buf), "%s-%s", atom->PN, atom->PV);
338 @@ -1392,9 +1393,9 @@
339 atom_implode(atom);
340 }
341 }
342 - if ((strcmp(buf, "PF:")) == 0)
343 + if (strcmp(buf, "PF:") == 0)
344 strncpy(PF, value, sizeof(PF));
345 - if ((strcmp(buf, "CATEGORY:")) == 0)
346 + if (strcmp(buf, "CATEGORY:") == 0)
347 strncpy(CATEGORY, value, sizeof(CATEGORY));
348 }
349 }
350 @@ -1416,7 +1417,7 @@
351
352 memset(&Pkg, 0, sizeof(Pkg));
353
354 - while ((fgets(buf, sizeof(buf), fp)) != NULL) {
355 + while (fgets(buf, sizeof(buf), fp) != NULL) {
356 lineno++;
357 if (*buf == '\n') {
358 if ((strlen(Pkg.PF) > 0) && (strlen(Pkg.CATEGORY) > 0)) {
359 @@ -1452,29 +1453,29 @@
360
361 switch (*buf) {
362 case 'U':
363 - if ((strcmp(buf, "USE:")) == 0) strncpy(Pkg.USE, value, sizeof(Pkg.USE));
364 + if (strcmp(buf, "USE:") == 0) strncpy(Pkg.USE, value, sizeof(Pkg.USE));
365 break;
366 case 'P':
367 - if ((strcmp(buf, "PF:")) == 0) strncpy(Pkg.PF, value, sizeof(Pkg.PF));
368 + if (strcmp(buf, "PF:") == 0) strncpy(Pkg.PF, value, sizeof(Pkg.PF));
369 break;
370 case 'S':
371 - if ((strcmp(buf, "SIZE:")) == 0) Pkg.SIZE = atol(value);
372 - if ((strcmp(buf, "SLOT:")) == 0) strncpy(Pkg.SLOT, value, sizeof(Pkg.SLOT));
373 - if ((strcmp(buf, "SHA1:")) == 0) strncpy(Pkg.SHA1, value, sizeof(Pkg.SHA1));
374 + if (strcmp(buf, "SIZE:") == 0) Pkg.SIZE = atol(value);
375 + if (strcmp(buf, "SLOT:") == 0) strncpy(Pkg.SLOT, value, sizeof(Pkg.SLOT));
376 + if (strcmp(buf, "SHA1:") == 0) strncpy(Pkg.SHA1, value, sizeof(Pkg.SHA1));
377 break;
378 case 'M':
379 - if ((strcmp(buf, "MD5:")) == 0) strncpy(Pkg.MD5, value, sizeof(Pkg.MD5));
380 + if (strcmp(buf, "MD5:") == 0) strncpy(Pkg.MD5, value, sizeof(Pkg.MD5));
381 break;
382 case 'R':
383 - if ((strcmp(buf, "REPO:")) == 0) strncpy(Pkg.REPO, value, sizeof(Pkg.REPO));
384 - if ((strcmp(buf, "RDEPEND:")) == 0) strncpy(Pkg.RDEPEND, value, sizeof(Pkg.RDEPEND));
385 + if (strcmp(buf, "REPO:") == 0) strncpy(Pkg.REPO, value, sizeof(Pkg.REPO));
386 + if (strcmp(buf, "RDEPEND:") == 0) strncpy(Pkg.RDEPEND, value, sizeof(Pkg.RDEPEND));
387 break;
388 case 'L':
389 - if ((strcmp(buf, "LICENSE:")) == 0) strncpy(Pkg.LICENSE, value, sizeof(Pkg.LICENSE));
390 + if (strcmp(buf, "LICENSE:") == 0) strncpy(Pkg.LICENSE, value, sizeof(Pkg.LICENSE));
391 break;
392 case 'C':
393 - if ((strcmp(buf, "CATEGORY:")) == 0) strncpy(Pkg.CATEGORY, value, sizeof(Pkg.CATEGORY));
394 - if ((strcmp(buf, "CPV:")) == 0) {
395 + if (strcmp(buf, "CATEGORY:") == 0) strncpy(Pkg.CATEGORY, value, sizeof(Pkg.CATEGORY));
396 + if (strcmp(buf, "CPV:") == 0) {
397 depend_atom *atom;
398 if ((atom = atom_explode(value)) != NULL) {
399 snprintf(buf, sizeof(buf), "%s-%s", atom->PN, atom->PV);
400 @@ -1487,7 +1488,7 @@
401 }
402 break;
403 case 'D':
404 - if ((strcmp(buf, "DESC:")) == 0) strncpy(Pkg.DESC, value, sizeof(Pkg.DESC));
405 + if (strcmp(buf, "DESC:") == 0) strncpy(Pkg.DESC, value, sizeof(Pkg.DESC));
406 break;
407 default:
408 break;
409 @@ -1499,7 +1500,8 @@
410 }
411
412 queue *get_world(void);
413 -queue *get_world(void) {
414 +queue *get_world(void)
415 +{
416 FILE *fp;
417 char buf[BUFSIZ];
418 queue *world = NULL;
419 @@ -1515,7 +1517,7 @@
420 return NULL;
421 }
422
423 - while ((fgets(buf, sizeof(buf), fp)) != NULL) {
424 + while (fgets(buf, sizeof(buf), fp) != NULL) {
425 char *p;
426 char *slot = (char *) "0";
427
428 @@ -1532,12 +1534,13 @@
429 }
430
431 queue *qmerge_load_set(char *, queue *);
432 -queue *qmerge_load_set(char *buf, queue *set) {
433 +queue *qmerge_load_set(char *buf, queue *set)
434 +{
435 if (set != NULL)
436 return set;
437 - if ((strcmp(buf, "world") == 0))
438 + if (strcmp(buf, "world") == 0)
439 return get_world();
440 - if ((strcmp(buf, "all") == 0))
441 + if (strcmp(buf, "all") == 0)
442 return get_vdb_atoms(0);
443 return NULL;
444 }
445 @@ -1545,7 +1548,7 @@
446 int qmerge_main(int argc, char **argv)
447 {
448 int i;
449 - const char *Packages = "Packages";
450 + const char Packages[] = "Packages";
451 int ARGC = argc;
452 char **ARGV = argv;
Report Message
Find on MARC Find on Google Groups