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

[Mike Frysinger (vapier)]

vapier      11/03/02 07:03:31

  Modified:             libq.c virtuals.c
  Added:                profile.c
  Log:
  add a helper to walk the profile tree and read files

Revision  Changes    Path
1.24                 portage-utils/libq/libq.c

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

Index: libq.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/libq.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libq.c	23 Feb 2011 22:58:52 -0000	1.23
+++ libq.c	2 Mar 2011 07:03:31 -0000	1.24
@@ -34,6 +34,7 @@
 #include "basename.c"
 
 #ifndef _LIB_Q
+# include "profile.c"
 # include "vdb_get_next_dir.c"
 # include "virtuals.c"
 #endif



1.26                 portage-utils/libq/virtuals.c

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

Index: virtuals.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/virtuals.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- virtuals.c	24 Feb 2011 01:29:27 -0000	1.25
+++ virtuals.c	2 Mar 2011 07:03:31 -0000	1.26
@@ -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.25 2011/02/24 01:29:27 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/virtuals.c,v 1.26 2011/03/02 07:03:31 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.25 2011/02/24 01:29:27 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/virtuals.c,v 1.26 2011/03/02 07:03:31 vapier Exp $
  */
 
 #include <stdio.h>
@@ -81,10 +81,12 @@
 		strcpy(s, ptr);
 
 	} while (v[0]);
+
 	free(s);
 	free(ptr);
 	free(v);
 	free(vptr);
+
 	return q;
 }
 
@@ -248,57 +250,28 @@
 	return virtuals;
 }
 
-static queue *resolve_virtuals(void)
+_q_static void *
+resolve_virtuals_line(void *data, char *buf, FILE *fp)
 {
-	static char buf[_Q_PATH_MAX];
-	static char savecwd[_Q_PATH_MAX];
-	static char *p;
-	FILE *fp;
+	char *p;
+
+	if (*buf != 'v')
+		return data;
 
-	xgetcwd(savecwd, sizeof(savecwd));
+	rmspace(buf);
+	if ((p = strchr(buf, ' ')) != NULL) {
+		*p = 0;
+		if (virtual(buf, virtuals) == NULL)
+			virtuals = add_set(buf, rmspace(++p), virtuals);
+	}
+
+	return data;
+}
 
+_q_static queue *resolve_virtuals(void)
+{
 	free_sets(virtuals);
 	virtuals = resolve_local_profile_virtuals();
 	virtuals = resolve_vdb_virtuals(portvdb);
-
-	if (chdir("/etc/") == -1)
-		return virtuals;
-
-	if (readlink("make.profile", buf, sizeof(buf)) != -1) {
-		xchdir(buf);
-		xgetcwd(buf, sizeof(buf));
-		if (access(buf, R_OK) != 0)
-			return virtuals;
-	vstart:
-		if ((fp = fopen("virtuals", "r")) != NULL) {
-			while ((fgets(buf, sizeof(buf), fp)) != NULL) {
-				if (*buf != 'v') continue;
-				rmspace(buf);
-				if ((p = strchr(buf, ' ')) != NULL) {
-					*p = 0;
-					if (virtual(buf, virtuals) == NULL)
-						virtuals = add_set(buf, rmspace(++p), virtuals);
-				}
-			}
-			fclose(fp);
-		}
-		if ((fp = fopen("parent", "r")) != NULL) {
-			while ((fgets(buf, sizeof(buf), fp)) != NULL) {
-				rmspace(buf);
-				if (!*buf) continue;
-				if (*buf == '#') continue;
-				if (isspace(*buf)) continue;
-				fclose(fp);
-				if (chdir(buf) == -1) {
-					fclose(fp);
-					goto done;
-				}
-				goto vstart;
-			}
-			fclose(fp);
-		}
-	}
- done:
-	xchdir(savecwd);
-	return virtuals;
+	return q_profile_walk("virtuals", resolve_virtuals_line, virtuals);
 }



1.1                  portage-utils/libq/profile.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/profile.c?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/profile.c?rev=1.1&content-type=text/plain

Index: profile.c
===================================================================
typedef void *(q_profile_callback_t)(void *, char *, FILE *);

_q_static void *
q_profile_walk_at(int dir_fd, const char *dir, const char *file,
                  q_profile_callback_t callback, void *data)
{
	FILE *fp;
	int subdir_fd, fd;
	size_t buflen;
	char *buf;

	/* Pop open this profile dir */
	subdir_fd = openat(dir_fd, dir, O_RDONLY|O_CLOEXEC);
	if (subdir_fd < 0)
		return data;

	/* Then open the file */
	fd = openat(subdir_fd, file, O_RDONLY|O_CLOEXEC);
	if (fd < 0)
		goto walk_parent;

	fp = fdopen(fd, "r");
	if (!fp) {
		close(fd);
		goto walk_parent;
	}

	/* hand feed the file to the callback */
	buf = NULL;
	while (getline(&buf, &buflen, fp) != -1)
		data = callback(data, buf, fp);
	free(buf);

	/* does close(fd) for us */
	fclose(fp);

	/* Now walk the parents */
 walk_parent:
	fd = openat(subdir_fd, "parent", O_RDONLY|O_CLOEXEC);
	if (fd < 0)
		goto done;
	fp = fdopen(fd, "r");
	if (!fp) {
		close(fd);
		goto done;
	}

	buf = NULL;
	while (getline(&buf, &buflen, fp) != -1) {
		char *s;

		s = strchr(buf, '#');
		if (s)
			*s = '\0';
		rmspace(buf);

		data = q_profile_walk_at(subdir_fd, buf, file, callback, data);
	}
	free(buf);

	/* does close(fd) for us */
	fclose(fp);

 done:
	if (subdir_fd != AT_FDCWD)
		close(subdir_fd);

	return data;
}

_q_static void *
q_profile_walk(const char *file, q_profile_callback_t callback, void *data)
{
	/* Walk the profiles and read the file in question */
	data = q_profile_walk_at(AT_FDCWD, EPREFIX "/etc/make.profile", file, callback, data);
	return q_profile_walk_at(AT_FDCWD, EPREFIX "/etc/portage/make.profile", file, callback, data);
}