[gentoo-commits] gentoo-projects commit in portage-utils: main.c main.h qcache.c qfile.c qlist.c qlop.c qpkg.c qsize.c quse.c

[Mike Frysinger (vapier)]

vapier      11/02/21 07:33:22

  Modified:             main.c main.h qcache.c qfile.c qlist.c qlop.c
                        qpkg.c qsize.c quse.c
  Log:
  convert many fgets() to getline(), clean up ARRAY_SIZE usage, and some other random fixes

Revision  Changes    Path
1.182                portage-utils/main.c

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

Index: main.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- main.c	21 Feb 2011 06:20:24 -0000	1.181
+++ main.c	21 Feb 2011 07:33:21 -0000	1.182
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2008 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.181 2011/02/21 06:20:24 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.182 2011/02/21 07:33:21 vapier Exp $
  *
  * Copyright 2005-2008 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2008 Mike Frysinger  - <vapier@g.o>
@@ -203,6 +203,34 @@
 	return ret;
 }
 
+#if !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
+static ssize_t getline(char **line, size_t *len, FILE *fp)
+{
+	char *s;
+	size_t off;
+
+	if (!*line) {
+		*len = BUFSIZE;
+		*line = xmalloc(*len);
+	}
+
+	off = 0;
+	while (1) {
+		s = fgets(*line + off, *len - off, fp);
+		if (s == NULL)
+			return -1;
+
+		s = strchr(s, '\n');
+		if (s)
+			break;
+
+		off = *len;
+		*len += BUFSIZE;
+		*line = xrealloc(*line, *len);
+	}
+}
+#endif
+
 static bool prompt(const char *p)
 {
 	printf("%s? [Y/n] ", p);
@@ -498,9 +526,9 @@
 /* Helper to read a portage env file (e.g. make.conf) */
 static void read_portage_env_file(const char *file, const env_vars vars[])
 {
-	size_t i;
+	size_t i, buflen, line;
 	FILE *fp;
-	char buf[BUFSIZE], *s, *p;
+	char *buf, *s, *p;
 
 	IF_DEBUG(fprintf(stderr, "profile %s\n", file));
 
@@ -508,7 +536,10 @@
 	if (fp == NULL)
 		return;
 
-	while (fgets(buf, sizeof(buf), fp) != NULL) {
+	line = 0;
+	buf = NULL;
+	while (getline(&buf, &buflen, fp) != -1) {
+		++line;
 		rmspace(buf);
 		if (*buf == '#' || *buf == '\0')
 			continue;
@@ -538,7 +569,7 @@
 					/* If the last char is not a quote, then we span lines */
 					char *q = s + l + 1, *qq = NULL;
 					q[-1] = ' ';
-					while (fgets(q, sizeof(buf) - (s - buf), fp) != NULL) {
+					while (fgets(q, buflen - (s - buf), fp) != NULL) {
 						l = strlen(q);
 						qq = strchr(q, *s);
 						if (qq) {
@@ -547,7 +578,7 @@
 						}
 					}
 					if (!qq)
-						warn("%s: %s: quote mismatch", file, vars[i].name);
+						warn("%s:%zu: %s: quote mismatch", file, line, vars[i].name);
 					++s;
 				} else {
 					s[l - 1] = '\0';
@@ -559,6 +590,7 @@
 		}
 	}
 
+	free(buf);
 	fclose(fp);
 }
 
@@ -642,7 +674,7 @@
 	read_portage_profile(EPREFIX "/etc/portage/make.profile", vars_to_read);
 
 	/* now read all the config files */
-	for (i = 0; i < ARR_SIZE(files); ++i)
+	for (i = 0; i < ARRAY_SIZE(files); ++i)
 		read_portage_env_file(files[i], vars_to_read);
 
 	/* finally, check the env */



1.6                  portage-utils/main.h

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

Index: main.h
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- main.h	7 Apr 2010 05:58:16 -0000	1.5
+++ main.h	21 Feb 2011 07:33:21 -0000	1.6
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.h,v 1.5 2010/04/07 05:58:16 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.h,v 1.6 2011/02/21 07:33:21 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -16,8 +16,6 @@
 # define _Q_PATH_MAX _POSIX_PATH_MAX
 #endif
 
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr))
-
 /* http://tinderbox.dev.gentoo.org/default-linux/arm */
 /* http://tinderbox.dev.gentoo.org/default-linux/hppa */
 



1.39                 portage-utils/qcache.c

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

Index: qcache.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qcache.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- qcache.c	21 Feb 2011 01:33:47 -0000	1.38
+++ qcache.c	21 Feb 2011 07:33:21 -0000	1.39
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcache.c,v 1.38 2011/02/21 01:33:47 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcache.c,v 1.39 2011/02/21 07:33:21 vapier Exp $
  *
  * Copyright 2006 Thomas A. Cort - <tcort@g.o>
  */
@@ -47,7 +47,7 @@
 	COMMON_OPTS_HELP
 };
 
-static const char qcache_rcsid[] = "$Id: qcache.c,v 1.38 2011/02/21 01:33:47 vapier Exp $";
+static const char qcache_rcsid[] = "$Id: qcache.c,v 1.39 2011/02/21 07:33:21 vapier Exp $";
 #define qcache_usage(ret) usage(ret, QCACHE_FLAGS, qcache_long_opts, qcache_opts_help, lookup_applet_idx("qcache"))
 
 /********************************************************************/
@@ -329,10 +329,10 @@
 portage_cache *qcache_read_cache_file(const char *filename)
 {
 	struct stat s;
-	char *ptr, buf[BUFSIZE];
+	char *ptr, *buf;
 	FILE *f;
 	portage_cache *ret = NULL;
-	size_t len;
+	size_t len, buflen;
 
 	if ((f = fopen(filename, "r")) == NULL)
 		goto err;
@@ -345,7 +345,7 @@
 	len = sizeof(*ret) + s.st_size + 1;
 	ret = xzalloc(len);
 
-	while ((fgets(buf, sizeof(buf), f)) != NULL) {
+	while (getline(&buf, &buflen, f) != -1) {
 		if ((ptr = strrchr(buf, '\n')) != NULL)
 			*ptr = 0;
 
@@ -389,6 +389,7 @@
 			ret->SRC_URI = xstrdup(buf + 8);
 	}
 
+	free(buf);
 	ret->atom = atom_explode(filename);
 	fclose(f);
 



1.55                 portage-utils/qfile.c

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

Index: qfile.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qfile.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- qfile.c	21 Feb 2011 01:33:47 -0000	1.54
+++ qfile.c	21 Feb 2011 07:33:21 -0000	1.55
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qfile.c,v 1.54 2011/02/21 01:33:47 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qfile.c,v 1.55 2011/02/21 07:33:21 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -34,7 +34,7 @@
 	"Display installed packages with slots",
 	COMMON_OPTS_HELP
 };
-static const char qfile_rcsid[] = "$Id: qfile.c,v 1.54 2011/02/21 01:33:47 vapier Exp $";
+static const char qfile_rcsid[] = "$Id: qfile.c,v 1.55 2011/02/21 07:33:21 vapier Exp $";
 #define qfile_usage(ret) usage(ret, QFILE_FLAGS, qfile_long_opts, qfile_opts_help, lookup_applet_idx("qfile"))
 
 #define qfile_is_prefix(path, prefix, prefix_length) \
@@ -68,8 +68,8 @@
 	DIR *dir;
 	struct dirent *dentry;
 	const char *base;
-	char *p;
-	char buf[1024];
+	size_t buflen;
+	char *p, *buf;
 	char pkg[150];
 	depend_atom *atom = NULL;
 	int i, path_ok;
@@ -86,6 +86,9 @@
 		return;
 	}
 
+	buflen = _Q_PATH_MAX;
+	buf = xmalloc(buflen);
+
 	while ((dentry = readdir(dir))) {
 		if (dentry->d_name[0] == '.')
 			continue;
@@ -118,8 +121,8 @@
 				warn("invalid atom %s", pkg);
 				goto dont_skip_pkg;
 			}
-			snprintf(buf, sizeof(buf), "%s/%s", atom->CATEGORY, atom->PN);
-			if (strncmp(args->exclude_pkg, buf, sizeof(buf)) != 0
+			snprintf(buf, buflen, "%s/%s", atom->CATEGORY, atom->PN);
+			if (strncmp(args->exclude_pkg, buf, buflen) != 0
 					&& strcmp(args->exclude_pkg, atom->PN) != 0)
 				goto dont_skip_pkg; /* "(CAT/)?PN" doesn't match */
 check_pkg_slot: /* Also compare slots, if any was specified */
@@ -127,10 +130,10 @@
 				continue; /* "(CAT/)?(PN|PF)" matches, and no SLOT specified */
 			buf[0] = '0'; buf[1] = '\0';
 			strcpy(p, "/SLOT");
-			eat_file(pkg, buf, sizeof(buf));
+			eat_file(pkg, buf, buflen);
 			rmspace(buf);
 			*p = '\0';
-			if (strncmp(args->exclude_slot, buf, sizeof(buf)) == 0)
+			if (strncmp(args->exclude_slot, buf, buflen) == 0)
 				continue; /* "(CAT/)?(PN|PF):SLOT" matches */
 		}
 dont_skip_pkg: /* End of the package exclusion tests. */
@@ -141,7 +144,7 @@
 		if (fp == NULL)
 			continue;
 
-		while ((fgets(buf, sizeof(buf), fp)) != NULL) {
+		while (getline(&buf, &buflen, fp) != -1) {
 			contents_entry *e;
 			e = contents_parse_line(buf);
 			if (!e)
@@ -251,6 +254,7 @@
 	}
 	closedir(dir);
 
+	free(buf);
 	return;
 }
 
@@ -492,7 +496,8 @@
 	short done = 0;
 	FILE *args_file = NULL;
 	int max_args = QFILE_DEFAULT_MAX_ARGS;
-	char path[_Q_PATH_MAX];
+	size_t buflen;
+	char *buf = NULL;
 
 	DBG("argc=%d argv[0]=%s argv[1]=%s",
 	    argc, argv[0], argc > 1 ? argv[1] : "NULL?");
@@ -568,15 +573,17 @@
 
 	do { /* This block may be repeated if using --from with a big files list */
 		if (args_file != NULL) {
-			qargc = 0;
 			/* Read up to max_args files from the input file */
-			while ((fgets(path, _Q_PATH_MAX, args_file)) != NULL) {
-				if ((p = strchr(path, '\n')) != NULL)
+			qargc = 0;
+			while (getline(&buf, &buflen, args_file) != -1) {
+				if ((p = strchr(buf, '\n')) != NULL)
 					*p = '\0';
-				if (path == p) continue;
-				qargv[qargc] = xstrdup(path);
+				if (buf == p)
+					continue;
+				qargv[qargc] = xstrdup(buf);
 				qargc++;
-				if (qargc >= max_args) break;
+				if (qargc >= max_args)
+					break;
 			}
 		}
 
@@ -604,8 +611,10 @@
 
 		/* Iteration over VDB categories */
 		while (nb_of_queries && (dentry = q_vdb_get_next_dir(dir))) {
-			snprintf(path, _Q_PATH_MAX, "%s/%s/%s", qfile_args->real_root, portvdb, dentry->d_name);
+			char *path;
+			xasprintf(&path, "%s/%s/%s", qfile_args->real_root, portvdb, dentry->d_name);
 			qfile(path, (assume_root_prefix ? root_prefix : NULL), qfile_args);
+			free(path);
 		}
 
 		if (qfile_args->non_orphans != NULL) {



1.59                 portage-utils/qlist.c

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

Index: qlist.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qlist.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- qlist.c	21 Feb 2011 01:33:47 -0000	1.58
+++ qlist.c	21 Feb 2011 07:33:21 -0000	1.59
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlist.c,v 1.58 2011/02/21 01:33:47 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlist.c,v 1.59 2011/02/21 07:33:21 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -41,7 +41,7 @@
 	/* "query filename for pkgname", */
 	COMMON_OPTS_HELP
 };
-static const char qlist_rcsid[] = "$Id: qlist.c,v 1.58 2011/02/21 01:33:47 vapier Exp $";
+static const char qlist_rcsid[] = "$Id: qlist.c,v 1.59 2011/02/21 07:33:21 vapier Exp $";
 #define qlist_usage(ret) usage(ret, QLIST_FLAGS, qlist_long_opts, qlist_opts_help, lookup_applet_idx("qlist"))
 
 extern char *grab_vdb_item(const char *, const char *, const char *);
@@ -68,7 +68,7 @@
 
 static char *grab_pkg_umap(char *CAT, char *PV)
 {
-	static char umap[BUFSIZ] = "";
+	static char umap[BUFSIZ];
 	char *use = NULL;
 	char *iuse = NULL;
 	int use_argc = 0, iuse_argc = 0;
@@ -118,21 +118,22 @@
 	free_sets(sets);
 	/* end filter */
 
-	return (char *) umap;
+	return umap;
 }
 
-static char *umapstr(char display, char *cat, char *name);
-static char *umapstr(char display, char *cat, char *name)
+static const char *umapstr(char display, char *cat, char *name)
 {
-	static char buf[BUFSIZ] = "";
+	static char buf[BUFSIZ];
 	char *umap = NULL;
 
-	if (!display) return (char *) "";
+	buf[0] = '\0';
+	if (!display)
+		return buf;
 	if ((umap = grab_pkg_umap(cat, name)) == NULL)
-		return (char *) "";
+		return buf;
 	rmspace(umap);
 	if (!strlen(umap))
-		return (char *) "";
+		return buf;
 	snprintf(buf, sizeof(buf), " %s%s%s%s%s", quiet ? "": "(", RED, umap, NORM, quiet ? "": ")");
 	return buf;
 }
@@ -143,14 +144,15 @@
 	char qlist_all = 0, just_pkgname = 0, dups_only = 0;
 	char show_dir, show_obj, show_sym, show_slots, show_umap;
 	struct dirent **de, **cat;
-	char buf[_Q_PATH_MAX];
+	size_t buflen;
+	char *buf;
 	char swap[_Q_PATH_MAX];
 	queue *sets = NULL;
 	depend_atom *pkgname, *atom;
-	char *slot_separator;
+	const char *slot_separator;
 	int columns = 0;
 
-	slot_separator = (char *) " ";
+	slot_separator = " ";
 
 	DBG("argc=%d argv[0]=%s argv[1]=%s",
 	    argc, argv[0], argc > 1 ? argv[1] : "NULL?");
@@ -162,7 +164,7 @@
 		COMMON_GETOPTS_CASES(qlist)
 		case 'a': qlist_all = 1;
 		case 'I': just_pkgname = 1; break;
-		case 'L': slot_separator = (char *) ":"; break;
+		case 'L': slot_separator = ":"; break;
 		case 'S': just_pkgname = 1; show_slots = 1; break;
 		case 'U': just_pkgname = 1; show_umap = 1; break;
 		case 'e': exact = 1; break;
@@ -187,6 +189,9 @@
 	if ((dfd = scandir(".", &cat, filter_hidden, alphasort)) < 0)
 		return EXIT_FAILURE;
 
+	buflen = _Q_PATH_MAX;
+	buf = xmalloc(buflen);
+
 	/* open /var/db/pkg */
 	for (j = 0; j < dfd; j++) {
 		int a, x;
@@ -211,8 +216,7 @@
 			/* see if this cat/pkg is requested */
 			for (i = optind; i < argc; ++i) {
 				char *name = pkg_name(argv[i]);
-				snprintf(buf, sizeof(buf), "%s/%s", cat[j]->d_name,
-					 de[x]->d_name);
+				snprintf(buf, buflen, "%s/%s", cat[j]->d_name, de[x]->d_name);
 				/* printf("buf=%s:%s\n", buf,grab_vdb_item("SLOT", cat[j]->d_name, de[x]->d_name)); */
 				if (exact) {
 					if ((atom = atom_explode(buf)) == NULL) {
@@ -250,7 +254,7 @@
 			if (just_pkgname) {
 				if (dups_only) {
 					pkgname = atom_explode(de[x]->d_name);
-					snprintf(buf, sizeof(buf), "%s/%s", cat[j]->d_name, pkgname->P);
+					snprintf(buf, buflen, "%s/%s", cat[j]->d_name, pkgname->P);
 					snprintf(swap, sizeof(swap), "%s/%s", cat[j]->d_name, pkgname->PN);
 					sets = add_set(swap, buf, sets);
 					atom_implode(pkgname);
@@ -278,7 +282,7 @@
 					continue;
 			}
 
-			snprintf(buf, sizeof(buf), "%s%s/%s/%s/CONTENTS", portroot, portvdb,
+			snprintf(buf, buflen, "%s%s/%s/%s/CONTENTS", portroot, portvdb,
 			         cat[j]->d_name, de[x]->d_name);
 
 			if (verbose > 1)
@@ -287,7 +291,7 @@
 			if ((fp = fopen(buf, "r")) == NULL)
 				continue;
 
-			while ((fgets(buf, sizeof(buf), fp)) != NULL) {
+			while (getline(&buf, &buflen, fp) != -1) {
 				contents_entry *e;
 
 				e = contents_parse_line(buf);



1.56                 portage-utils/qlop.c

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

Index: qlop.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qlop.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- qlop.c	21 Feb 2011 01:33:47 -0000	1.55
+++ qlop.c	21 Feb 2011 07:33:21 -0000	1.56
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlop.c,v 1.55 2011/02/21 01:33:47 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlop.c,v 1.56 2011/02/21 07:33:21 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -52,7 +52,7 @@
 	"Read emerge logfile instead of " QLOP_DEFAULT_LOGFILE,
 	COMMON_OPTS_HELP
 };
-static const char qlop_rcsid[] = "$Id: qlop.c,v 1.55 2011/02/21 01:33:47 vapier Exp $";
+static const char qlop_rcsid[] = "$Id: qlop.c,v 1.56 2011/02/21 07:33:21 vapier Exp $";
 #define qlop_usage(ret) usage(ret, QLOP_FLAGS, qlop_long_opts, qlop_opts_help, lookup_applet_idx("qlop"))
 
 #define QLOP_LIST    0x01
@@ -241,7 +241,8 @@
 void show_emerge_history(char listflag, int argc, char **argv, const char *logfile)
 {
 	FILE *fp;
-	char buf[BUFSIZ], merged;
+	size_t buflen;
+	char *buf, merged;
 	char *p, *q;
 	int i;
 	time_t t;
@@ -251,7 +252,8 @@
 		return;
 	}
 
-	while ((fgets(buf, sizeof(buf), fp)) != NULL) {
+	buf = NULL;
+	while (getline(&buf, &buflen, fp) != -1) {
 		if (strlen(buf) < 30)
 			continue;
 
@@ -298,6 +300,8 @@
 			atom_implode(atom);
 		}
 	}
+
+	free(buf);
 	fclose(fp);
 }
 
@@ -305,8 +309,8 @@
 void show_sync_history(const char *logfile)
 {
 	FILE *fp;
-	char buf[BUFSIZ];
-	char *p, *q;
+	size_t buflen;
+	char *buf, *p, *q;
 	time_t t;
 
 	if ((fp = fopen(logfile, "r")) == NULL) {
@@ -314,7 +318,8 @@
 		return;
 	}
 
-	while ((fgets(buf, sizeof(buf), fp)) != NULL) {
+	buf = NULL;
+	while (getline(&buf, &buflen, fp) != -1) {
 		if (strlen(buf) < 35)
 			continue;
 		if (strncmp(buf+12, "=== Sync completed with", 23) != 0)
@@ -335,6 +340,8 @@
 
 		printf("%s >>> %s%s%s\n", chop_ctime(t), GREEN, q, NORM);
 	}
+
+	free(buf);
 	fclose(fp);
 }
 



1.32                 portage-utils/qpkg.c

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

Index: qpkg.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qpkg.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- qpkg.c	21 Feb 2011 01:33:47 -0000	1.31
+++ qpkg.c	21 Feb 2011 07:33:21 -0000	1.32
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qpkg.c,v 1.31 2011/02/21 01:33:47 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qpkg.c,v 1.32 2011/02/21 07:33:21 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -24,7 +24,7 @@
 	"alternate package directory",
 	COMMON_OPTS_HELP
 };
-static const char qpkg_rcsid[] = "$Id: qpkg.c,v 1.31 2011/02/21 01:33:47 vapier Exp $";
+static const char qpkg_rcsid[] = "$Id: qpkg.c,v 1.32 2011/02/21 07:33:21 vapier Exp $";
 #define qpkg_usage(ret) usage(ret, QPKG_FLAGS, qpkg_long_opts, qpkg_opts_help, lookup_applet_idx("qpkg"))
 
 extern char pretend;
@@ -107,7 +107,6 @@
 {
 	FILE *fp;
 	int i, count;
-	char buf[_Q_PATH_MAX];
 	size_t disp_units = 0;
 	uint64_t num_all_bytes;
 	struct dirent **dnames;
@@ -126,10 +125,10 @@
 
 	if (eclean) {
 		char fname[_Q_PATH_MAX] = "";
-		char *ecache;
+		const char *ecache;
 
 		/* CACHE_EBUILD_FILE is a macro so don't put it in the .bss */
-		ecache = (char *) CACHE_EBUILD_FILE;
+		ecache = CACHE_EBUILD_FILE;
 
 		if (ecache) {
 			if (*ecache != '/')
@@ -138,7 +137,11 @@
 				strncpy(fname, ecache, sizeof(fname));
 		}
 		if ((fp = fopen(fname, "r")) != NULL) {
-			while ((fgets(buf, sizeof(buf), fp)) != NULL) {
+			size_t buflen;
+			char *buf;
+
+			buf = NULL;
+			while (getline(&buf, &buflen, fp) != -1) {
 				char *name, *p;
 				if ((p = strrchr(buf, '.')) == NULL)
 					continue;
@@ -158,6 +161,8 @@
 				/* vdb = del_set(buf, vdb, &i); */
 				vdb = add_set(buf, "0", vdb);
 			}
+
+			free(buf);
 			fclose(fp);
 		}
 	}
@@ -165,6 +170,7 @@
 	num_all_bytes = qpkg_clean_dir(dirp, vdb);
 
 	for (i = 0; i < count; i++) {
+		char buf[_Q_PATH_MAX];
 		snprintf(buf, sizeof(buf), "%s/%s", dirp, dnames[i]->d_name);
 		num_all_bytes += qpkg_clean_dir(buf, vdb);
 	}
@@ -200,7 +206,8 @@
 {
 	FILE *fp, *out;
 	char tmpdir[BUFSIZE], filelist[BUFSIZE], xpak[BUFSIZE], tbz2[BUFSIZE];
-	char buf[BUFSIZE];
+	size_t buflen;
+	char *buf;
 	int i;
 	char *xpak_argv[2];
 	struct stat st;
@@ -226,15 +233,17 @@
 	if ((out = fopen(filelist, "w")) == NULL)
 		return -4;
 
-	while ((fgets(buf, sizeof(buf), fp)) != NULL) {
+	buflen = _Q_PATH_MAX;
+	buf = xmalloc(buflen);
+	while (getline(&buf, &buflen, fp) != -1) {
 		contents_entry *e;
 		e = contents_parse_line(buf);
 		if (!e || e->type == CONTENTS_DIR)
 			continue;
 		fprintf(out, "%s\n", e->name+1); /* dont output leading / */
 		if (e->type == CONTENTS_OBJ && verbose) {
-			char *hash = NULL;
-			if ((hash = (char*) hash_file(e->name, HASH_MD5)) != NULL) {
+			char *hash = (char *)hash_file(e->name, HASH_MD5);
+			if (hash != NULL) {
 				if (strcmp(e->digest, hash) != 0)
 					warn("MD5: mismatch expected %s got %s for %s", e->digest, hash, e->name);
 				free(hash);
@@ -249,18 +258,18 @@
 	fflush(stdout);
 
 	snprintf(tbz2, sizeof(tbz2), "%s/bin.tar.bz2", tmpdir);
-	snprintf(buf, sizeof(buf), "tar jcf '%s' --files-from='%s' --no-recursion >/dev/null 2>&1", tbz2, filelist);
+	snprintf(buf, buflen, "tar jcf '%s' --files-from='%s' --no-recursion >/dev/null 2>&1", tbz2, filelist);
 	if ((fp = popen(buf, "r")) == NULL)
 		return 2;
 	pclose(fp);
 
 	snprintf(xpak, sizeof(xpak), "%s/inf.xpak", tmpdir);
-	snprintf(buf, sizeof(buf), "%s/%s/%s", portvdb, atom->CATEGORY, atom_to_pvr(atom));
+	snprintf(buf, buflen, "%s/%s/%s", portvdb, atom->CATEGORY, atom_to_pvr(atom));
 	xpak_argv[0] = buf;
 	xpak_argv[1] = NULL;
 	xpak_create(xpak, 1, xpak_argv);
 
-	snprintf(buf, sizeof(buf), "%s/binpkg.tbz2", tmpdir);
+	snprintf(buf, buflen, "%s/binpkg.tbz2", tmpdir);
 	tbz2_compose(tbz2, xpak, buf);
 
 	unlink(filelist);



1.37                 portage-utils/qsize.c

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

Index: qsize.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qsize.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- qsize.c	21 Feb 2011 01:33:47 -0000	1.36
+++ qsize.c	21 Feb 2011 07:33:21 -0000	1.37
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qsize.c,v 1.36 2011/02/21 01:33:47 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qsize.c,v 1.37 2011/02/21 07:33:21 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -32,7 +32,7 @@
 	"Ignore regexp string",
 	COMMON_OPTS_HELP
 };
-static const char qsize_rcsid[] = "$Id: qsize.c,v 1.36 2011/02/21 01:33:47 vapier Exp $";
+static const char qsize_rcsid[] = "$Id: qsize.c,v 1.37 2011/02/21 07:33:21 vapier Exp $";
 #define qsize_usage(ret) usage(ret, QSIZE_FLAGS, qsize_long_opts, qsize_opts_help, lookup_applet_idx("qsize"))
 
 int qsize_main(int argc, char **argv)
@@ -48,7 +48,8 @@
 	uint64_t num_all_bytes, num_bytes;
 	size_t disp_units = 0;
 	const char *str_disp_units = NULL;
-	char buf[_Q_PATH_MAX];
+	size_t buflen;
+	char *buf;
 	char filename[_Q_PATH_MAX], *filename_root;
 	queue *ignore_regexp = NULL;
 
@@ -80,13 +81,13 @@
 
 	strcpy(filename, portroot);
 	filename_root = filename + strlen(filename);
+	buflen = _Q_PATH_MAX;
+	buf = xmalloc(buflen);
 
 	/* open /var/db/pkg */
 	while ((dentry = q_vdb_get_next_dir(dir))) {
 
-		if (chdir(dentry->d_name) != 0)
-			continue;
-		if ((dirp = opendir(".")) == NULL)
+		if ((dirp = opendir(dentry->d_name)) == NULL)
 			continue;
 
 		/* open the cateogry */
@@ -98,7 +99,7 @@
 			/* see if this cat/pkg is requested */
 			if (!search_all) {
 				for (i = optind; i < argc; ++i) {
-					snprintf(buf, sizeof(buf), "%s/%s", dentry->d_name,
+					snprintf(buf, buflen, "%s/%s", dentry->d_name,
 					         de->d_name);
 					if (rematch(argv[i], buf, REG_EXTENDED) == 0)
 						break;
@@ -109,13 +110,13 @@
 					continue;
 			}
 
-			snprintf(buf, sizeof(buf), "%s%s/%s/%s/CONTENTS", portroot, portvdb,
+			snprintf(buf, buflen, "%s%s/%s/%s/CONTENTS", portroot, portvdb,
 			         dentry->d_name, de->d_name);
 			if ((fp = fopen(buf, "r")) == NULL)
 				continue;
 
 			num_ignored = num_files = num_nonfiles = num_bytes = 0;
-			while ((fgets(buf, sizeof(buf), fp)) != NULL) {
+			while (getline(&buf, &buflen, fp) != -1) {
 				contents_entry *e;
 				queue *ll;
 				int ok = 0;
@@ -165,7 +166,6 @@
 			}
 		}
 		closedir(dirp);
-		xchdir("..");
 	}
 
 	if (summary) {



1.64                 portage-utils/quse.c

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

Index: quse.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/quse.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- quse.c	21 Feb 2011 01:33:47 -0000	1.63
+++ quse.c	21 Feb 2011 07:33:21 -0000	1.64
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/quse.c,v 1.63 2011/02/21 01:33:47 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/quse.c,v 1.64 2011/02/21 07:33:21 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -35,7 +35,7 @@
 	"Only show package name",
 	COMMON_OPTS_HELP
 };
-static const char quse_rcsid[] = "$Id: quse.c,v 1.63 2011/02/21 01:33:47 vapier Exp $";
+static const char quse_rcsid[] = "$Id: quse.c,v 1.64 2011/02/21 07:33:21 vapier Exp $";
 #define quse_usage(ret) usage(ret, QUSE_FLAGS, quse_long_opts, quse_opts_help, lookup_applet_idx("quse"))
 
 int quse_describe_flag(int ind, int argc, char **argv);
@@ -83,8 +83,9 @@
 
 int quse_describe_flag(int ind, int argc, char **argv)
 {
-#define NUM_SEARCH_FILES ARR_SIZE(search_files)
-	char buf[BUFSIZE], *p;
+#define NUM_SEARCH_FILES ARRAY_SIZE(search_files)
+	size_t buflen;
+	char *buf, *p;
 	int i, f;
 	size_t s;
 	const char *search_files[] = { "use.desc", "use.local.desc", "arch.list", "lang.desc" };
@@ -92,8 +93,11 @@
 	DIR *d;
 	struct dirent *de;
 
+	buflen = _Q_PATH_MAX;
+	buf = xmalloc(buflen);
+
 	for (i = 0; i < NUM_SEARCH_FILES; ++i) {
-		snprintf(buf, sizeof(buf), "%s/profiles/%s", portdir, search_files[i]);
+		snprintf(buf, buflen, "%s/profiles/%s", portdir, search_files[i]);
 		if ((fp[i] = fopen(buf, "r")) == NULL)
 			if ((strcmp(search_files[i], "lang.desc")) != 0)
 				warnp("skipping %s", search_files[i]);
@@ -106,7 +110,7 @@
 			if (fp[f] == NULL)
 				continue;
 
-			while (fgets(buf, sizeof(buf), fp[f]) != NULL) {
+			while (getline(&buf, &buflen, fp[f]) != -1) {
 				if (buf[0] == '#' || buf[0] == '\n')
 					continue;
 
@@ -161,23 +165,23 @@
 			fclose(fp[f]);
 
 	/* now scan the desc dir */
-	snprintf(buf, sizeof(buf), "%s/profiles/desc/", portdir);
+	snprintf(buf, buflen, "%s/profiles/desc/", portdir);
 	if ((d = opendir(buf)) == NULL) {
 		warnp("skipping profiles/desc/");
-		return 0;
+		goto done;
 	}
 
 	while ((de = readdir(d)) != NULL) {
 		if (strcmp(de->d_name+strlen(de->d_name)-5, ".desc"))
 			continue;
 
-		snprintf(buf, sizeof(buf), "%s/profiles/desc/%s", portdir, de->d_name);
+		snprintf(buf, buflen, "%s/profiles/desc/%s", portdir, de->d_name);
 		if ((fp[0]=fopen(buf, "r")) == NULL) {
 			warn("Could not open '%s' for reading; skipping", de->d_name);
 			continue;
 		}
 
-		while (fgets(buf, sizeof(buf), fp[0]) != NULL) {
+		while (getline(&buf, &buflen, fp[0]) != -1) {
 			if (buf[0] == '#' || buf[0] == '\n')
 				continue;
 
@@ -205,6 +209,8 @@
 	}
 	closedir(d);
 
+ done:
+	free(buf);
 	return 0;
 }
 
@@ -217,7 +223,8 @@
 	char buf1[_Q_PATH_MAX];
 	char buf2[_Q_PATH_MAX];
 
-	char ebuild[_Q_PATH_MAX];
+	size_t ebuildlen;
+	char *ebuild;
 
 	const char *search_var = NULL;
 	const char *search_vars[] = { "IUSE=", "KEYWORDS=", "LICENSE=", search_var };
@@ -254,7 +261,8 @@
 
 	if ((fp = fopen(CACHE_EBUILD_FILE, "r")) == NULL)
 		return 1;
-	while ((fgets(ebuild, sizeof(ebuild), fp)) != NULL) {
+	ebuild = NULL;
+	while (getline(&ebuild, &ebuildlen, fp) != -1) {
 		FILE *newfp;
 		if ((p = strchr(ebuild, '\n')) != NULL)
 			*p = 0;
@@ -303,7 +311,6 @@
 
 				multiline:
 					*p = ' ';
-					memset(buf1, 0, sizeof(buf1));
 
 					if ((fgets(buf1, sizeof(buf1), newfp)) == NULL)
 						continue;