[gentoo-commits] gentoo-projects commit in portage-utils: main.c

[Mike Frysinger (vapier)]

vapier      11/03/02 02:40:19

  Modified:             main.c
  Log:
  convert grab_vdb_item to eat_file, and drop the leading slash on vdb path for now

Revision  Changes    Path
1.187                portage-utils/main.c

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

Index: main.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- main.c	28 Feb 2011 18:16:11 -0000	1.186
+++ main.c	2 Mar 2011 02:40:19 -0000	1.187
@@ -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.186 2011/02/28 18:16:11 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.187 2011/03/02 02:40:19 vapier Exp $
  *
  * Copyright 2005-2008 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2008 Mike Frysinger  - <vapier@g.o>
@@ -688,7 +688,10 @@
 		_Q_EVS(STR,  PORTAGE_TMPDIR,      port_tmpdir,         EPREFIX "/var/tmp/portage/")
 		_Q_EVS(STR,  PKGDIR,              pkgdir,              EPREFIX "/usr/portage/packages/")
 		_Q_EVS(STR,  ROOT,                portroot,            "/")
-		_Q_EVS(STR,  Q_VDB,               portvdb,             EPREFIX "/var/db/pkg")
+		/* XXX: This needs to not have a leading slash since some of the q
+		 *      utils use chdir(root) && chdir(portvdb).  Once those are
+		 *      fixed, we can add a proper leading slash here. */
+		_Q_EVS(STR,  Q_VDB,               portvdb,             EPREFIX "var/db/pkg")
 		{ }
 
 #undef _Q_EV
@@ -1022,21 +1025,12 @@
 	return (atom->PR_int == 0 ? atom->P : atom->PVR );
 }
 
-char *grab_vdb_item(const char *, const char *, const char *);
-char *grab_vdb_item(const char *item, const char *CATEGORY, const char *PF)
+static char *grab_vdb_item(const char *item, const char *CATEGORY, const char *PF)
 {
 	static char buf[_Q_PATH_MAX];
-	char *p;
-	FILE *fp;
 
 	snprintf(buf, sizeof(buf), "%s%s/%s/%s/%s", portroot, portvdb, CATEGORY, PF, item);
-	if ((fp = fopen(buf, "r")) == NULL)
-		return NULL;
-	if (fgets(buf, sizeof(buf), fp) == NULL)
-		buf[0] = '\0';
-	if ((p = strchr(buf, '\n')) != NULL)
-		*p = 0;
-	fclose(fp);
+	eat_file(buf, buf, sizeof(buf));
 	rmspace(buf);
 
 	return buf;