[gentoo-commits] gentoo-projects commit in portage-utils/libq: colors.c libq.h virtuals.c

[Mike Frysinger (vapier)]

vapier      11/02/21 07:33:22

  Modified:             colors.c libq.h virtuals.c
  Log:
  convert many fgets() to getline(), clean up ARRAY_SIZE usage, and some other random fixes

Revision  Changes    Path
1.10                 portage-utils/libq/colors.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/colors.c?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/colors.c?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/colors.c?r1=1.9&r2=1.10

Index: colors.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/colors.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- colors.c	23 May 2007 13:47:31 -0000	1.9
+++ colors.c	21 Feb 2011 07:33:22 -0000	1.10
@@ -20,10 +20,6 @@
 
 static const char *COLOR_MAP = "/etc/portage/color.map";
 
-#ifndef ARR_SIZE
-# define ARR_SIZE(arr) (sizeof(arr) / sizeof(*arr))
-#endif
-
 #define COLOR _MAKE_COLOR
 
 typedef struct {
@@ -54,14 +50,16 @@
 {
 	FILE *fp;
 	int i;
-	char buf[512];
+	size_t buflen;
+	char *buf;
 	char *p;
 	int lineno = 0;
 
 	if ((fp = fopen(COLOR_MAP, "r")) == NULL)
 		return;
 
-	while (fgets(buf, sizeof(buf), fp) != NULL) {
+	buf = NULL;
+	while (getline(&buf, &buflen, fp) != -1) {
 		lineno++;
 		/* eat comments */
 		if ((p = strchr(buf, '#')) != NULL)
@@ -78,7 +76,7 @@
 
 		p = strchr(buf, '=');
 		*p++ = 0; /* split the pair */
-		for (i = 0; i < ARR_SIZE(color_pairs); ++i)
+		for (i = 0; i < ARRAY_SIZE(color_pairs); ++i)
 			if (strcmp(buf, color_pairs[i].name) == 0) {
 				if (strncmp(p, "0x", 2) == 0)
 					warn("[%s=%s] RGB values in color map are not supported on line %d of %s", buf, p, lineno, COLOR_MAP);
@@ -86,9 +84,11 @@
 					snprintf(color_pairs[i].value, sizeof(color_pairs[i].value), "\e[%s", p);
 			}
 	}
+
+	free(buf);
 	fclose(fp);
 
-	for (i = 0; i < ARR_SIZE(color_pairs); ++i) {
+	for (i = 0; i < ARRAY_SIZE(color_pairs); ++i) {
 		/* unmapped: MAGENTA YELLOW */
 		if (strcmp(color_pairs[i].name, "white") == 0)
 			WHITE = color_pairs[i].value;



1.6                  portage-utils/libq/libq.h

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/libq.h?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/libq.h?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/libq.h?r1=1.5&r2=1.6

Index: libq.h
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/libq.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libq.h	13 Jan 2010 14:02:35 -0000	1.5
+++ libq.h	21 Feb 2011 07:33:22 -0000	1.6
@@ -18,7 +18,7 @@
 #define errf(fmt, args...) _err(warnf, fmt , ## args)
 #define errp(fmt, args...) _err(warnp, fmt , ## args)
 #define errfp(fmt, args...) _err(warnfp, fmt, ## args)
-#define ARR_SIZE(arr) (sizeof(arr) / sizeof(*arr))
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr))
 
 #ifndef BUFSIZE
 # define BUFSIZE 8192



1.24                 portage-utils/libq/virtuals.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/virtuals.c?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/virtuals.c?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/virtuals.c?r1=1.23&r2=1.24

Index: virtuals.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/virtuals.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- virtuals.c	7 Apr 2010 05:58:16 -0000	1.23
+++ virtuals.c	21 Feb 2011 07:33:22 -0000	1.24
@@ -1,12 +1,12 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/virtuals.c,v 1.23 2010/04/07 05:58:16 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/virtuals.c,v 1.24 2011/02/21 07:33:22 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
  *
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/virtuals.c,v 1.23 2010/04/07 05:58:16 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/virtuals.c,v 1.24 2011/02/21 07:33:22 vapier Exp $
  */
 
 #include <stdio.h>
@@ -152,7 +152,7 @@
 {
 	DIR *dir, *dirp;
 	struct dirent *dentry_cat, *dentry_pkg;
-	char buf[BUFSIZE];
+	char buf[_Q_PATH_MAX];
 	depend_atom *atom;
 
 	xchdir("/");
@@ -169,84 +169,84 @@
 
 		/* scan all the packages in this category */
 		while ((dentry_pkg = q_vdb_get_next_dir(dirp)) != NULL) {
-			FILE *fp;
 			char *p;
 			/* see if user wants any of these packages */
 			snprintf(buf, sizeof(buf), "%s/%s/%s/PROVIDE", vdb, dentry_cat->d_name, dentry_pkg->d_name);
-			if ((fp = fopen(buf, "r")) != NULL) {
-				if (fgets(buf, sizeof(buf), fp) == NULL)
-					buf[0] = '\0';
 
-				if ((p = strrchr(buf, '\n')) != NULL)
-					*p = 0;
+			if (!eat_file(buf, buf, sizeof(buf)))
+				continue;
 
-				rmspace(buf);
+			if ((p = strrchr(buf, '\n')) != NULL)
+				*p = 0;
+
+			rmspace(buf);
 
-				if (*buf) {
-					int ok = 0;
-					char *v, *tmp = xstrdup(buf);
-					snprintf(buf, sizeof(buf), "%s/%s", dentry_cat->d_name, dentry_pkg->d_name);
-
-					atom = atom_explode(buf);
-					if (!atom) {
-						warn("could not explode '%s'", buf);
-						continue;
-					}
-					sprintf(buf, "%s/%s", atom->CATEGORY, atom->PN);
-					if ((v = virtual(tmp, virtuals)) != NULL) {
-						/* IF_DEBUG(fprintf(stderr, "%s provided by %s (removing)\n", tmp, v)); */
-						virtuals = del_set(tmp,  virtuals, &ok);
-					}
-					virtuals = add_set(tmp, buf, virtuals);
-					/* IF_DEBUG(fprintf(stderr, "%s provided by %s/%s (adding)\n", tmp, atom->CATEGORY, dentry_pkg->d_name)); */
-					free(tmp);
-					atom_implode(atom);
+			if (*buf) {
+				int ok = 0;
+				char *v, *tmp = xstrdup(buf);
+				snprintf(buf, sizeof(buf), "%s/%s", dentry_cat->d_name, dentry_pkg->d_name);
+
+				atom = atom_explode(buf);
+				if (!atom) {
+					warn("could not explode '%s'", buf);
+					continue;
 				}
-				fclose(fp);
+				sprintf(buf, "%s/%s", atom->CATEGORY, atom->PN);
+				if ((v = virtual(tmp, virtuals)) != NULL) {
+					/* IF_DEBUG(fprintf(stderr, "%s provided by %s (removing)\n", tmp, v)); */
+					virtuals = del_set(tmp,  virtuals, &ok);
+				}
+				virtuals = add_set(tmp, buf, virtuals);
+				/* IF_DEBUG(fprintf(stderr, "%s provided by %s/%s (adding)\n", tmp, atom->CATEGORY, dentry_pkg->d_name)); */
+				free(tmp);
+				atom_implode(atom);
 			}
 		}
 	}
+
 	return virtuals;
 }
 
-static queue *resolve_local_profile_virtuals();
-static queue *resolve_local_profile_virtuals()
+static queue *resolve_local_profile_virtuals(void)
 {
-	char buf[BUFSIZ];
+	static size_t buflen;
+	static char *buf = NULL;
 	FILE *fp;
 	char *p;
-	char *paths[] = { (char *) "/etc/portage/profile/virtuals", (char *) "/etc/portage/virtuals" };
+	static const char * const paths[] = { "/etc/portage/profile/virtuals", "/etc/portage/virtuals" };
 	size_t i;
 
-	for (i = 0; i < sizeof(paths)/sizeof(paths[0]); i++) {
-		if ((fp = fopen(paths[i], "r")) != NULL) {
-			while ((fgets(buf, sizeof(buf), fp)) != NULL) {
-				if (*buf != 'v') continue;
-				for (p = buf; *p != 0; ++p) if (isspace(*p)) *p = ' ';
-				if ((p = strchr(buf, ' ')) != NULL) {
-					int ok = 0;
-					*p = 0;
-					virtuals = del_set(buf, virtuals, &ok);
-					virtuals = add_set(buf, rmspace(++p), virtuals);
-					ok = 0;
-				}
+	for (i = 0; i < ARRAY_SIZE(paths); ++i) {
+		fp = fopen(paths[i], "r");
+		if (!fp)
+			continue;
+
+		while (getline(&buf, &buflen, fp) != -1) {
+			if (*buf != 'v')
+				continue;
+			rmspace(buf);
+			if ((p = strchr(buf, ' ')) != NULL) {
+				int ok = 0;
+				*p = 0;
+				virtuals = del_set(buf, virtuals, &ok);
+				virtuals = add_set(buf, rmspace(++p), virtuals);
+				ok = 0;
 			}
-			fclose(fp);
 		}
+
+		fclose(fp);
 	}
+
 	return virtuals;
 }
 
-static queue *resolve_virtuals();
-static queue *resolve_virtuals()
+static queue *resolve_virtuals(void)
 {
-	static char buf[BUFSIZ];
-	static char savecwd[_POSIX_PATH_MAX];
+	static char buf[_Q_PATH_MAX];
+	static char savecwd[_Q_PATH_MAX];
 	static char *p;
 	FILE *fp;
 
-	memset(buf, 0, sizeof(buf));
-
 	xgetcwd(savecwd, sizeof(savecwd));
 
 	free_sets(virtuals);
@@ -265,7 +265,7 @@
 		if ((fp = fopen("virtuals", "r")) != NULL) {
 			while ((fgets(buf, sizeof(buf), fp)) != NULL) {
 				if (*buf != 'v') continue;
-				for (p = buf; *p != 0; ++p) if (isspace(*p)) *p = ' ';
+				rmspace(buf);
 				if ((p = strchr(buf, ' ')) != NULL) {
 					*p = 0;
 					if (virtual(buf, virtuals) == NULL)