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

[Mike Frysinger (vapier)]

vapier      11/02/23 08:59:45

  Modified:             .depend TODO main.c qmerge.c
  Log:
  replace `rm -rf` shells with an internal rm_rf(), and add support for running pkg_{pre,post}inst ourselves

Revision  Changes    Path
1.40                 portage-utils/.depend

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

Index: .depend
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/.depend,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .depend	19 Jul 2010 00:25:13 -0000	1.39
+++ .depend	23 Feb 2011 08:59:45 -0000	1.40
@@ -2,8 +2,8 @@
  libq/colors.c libq/xmalloc.c libq/xstrdup.c libq/xasprintf.c \
  libq/hash_fd.c libq/md5_sha1_sum.c libq/human_readable.c libq/rmspace.c \
  libq/which.c libq/compat.c libq/safe_io.c libq/xchdir.c libq/xgetcwd.c \
- libq/xreadlink.c libq/xsystem.c libq/atom_explode.c libq/atom_compare.c \
- libq/basename.c libq/vdb_get_next_dir.c libq/virtuals.c applets.h \
- include_applets.h q.c qcheck.c qdepends.c qfile.c qlist.c qlop.c \
- qsearch.c qsize.c qtbz2.c quse.c qxpak.c qpkg.c qgrep.c qatom.c qmerge.c \
- qcache.c qglsa.c
+ libq/xmkdir.c libq/xreadlink.c libq/xsystem.c libq/atom_explode.c \
+ libq/atom_compare.c libq/basename.c libq/vdb_get_next_dir.c \
+ libq/virtuals.c applets.h include_applets.h q.c qcheck.c qdepends.c \
+ qfile.c qlist.c qlop.c qsearch.c qsize.c qtbz2.c quse.c qxpak.c qpkg.c \
+ qgrep.c qatom.c qmerge.c qcache.c qglsa.c



1.5                  portage-utils/TODO

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

Index: TODO
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/TODO,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TODO	17 Jan 2008 06:35:07 -0000	1.4
+++ TODO	23 Feb 2011 08:59:45 -0000	1.5
@@ -11,6 +11,7 @@
 
 - qmerge: dep resolver needs spanktastic love.
 - qmerge: needs safe deleting.
+- qmerge: handle compressed Packages file
 
 - atoms:
 	- only 32bit values are supported for revision (-r#)



1.184                portage-utils/main.c

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

Index: main.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- main.c	21 Feb 2011 21:52:55 -0000	1.183
+++ main.c	23 Feb 2011 08:59:45 -0000	1.184
@@ -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.183 2011/02/21 21:52:55 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.184 2011/02/23 08:59:45 vapier Exp $
  *
  * Copyright 2005-2008 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2008 Mike Frysinger  - <vapier@g.o>
@@ -173,36 +173,47 @@
 	exit(EXIT_SUCCESS);
 }
 
-static char eat_file(const char *file, char *buf, const size_t bufsize)
+static char eat_file_fd(int fd, char *buf, const size_t bufsize)
 {
-	int fd;
 	struct stat s;
-	char ret = 0;
-
-	if ((fd = open(file, O_RDONLY)) == -1)
-		return ret;
 
 	buf[0] = '\0';
 	if (fstat(fd, &s) != 0)
-		goto close_and_ret;
+		return 0;
 	if (s.st_size) {
 		if (bufsize < (size_t)s.st_size)
-			goto close_and_ret;
+			return 0;
 		if (read(fd, buf, s.st_size) != (ssize_t)s.st_size)
-			goto close_and_ret;
+			return 0;
 		buf[s.st_size] = '\0';
 	} else {
 		if (read(fd, buf, bufsize) == 0)
-			goto close_and_ret;
+			return 0;
 		buf[bufsize - 1] = '\0';
 	}
 
-	ret = 1;
-close_and_ret:
+	return 1;
+}
+
+static char eat_file_at(int dfd, const char *file, char *buf, const size_t bufsize)
+{
+	int fd;
+	char ret;
+
+	if ((fd = openat(dfd, file, O_RDONLY)) == -1)
+		return 0;
+
+	ret = eat_file_fd(fd, buf, bufsize);
+
 	close(fd);
 	return ret;
 }
 
+static char eat_file(const char *file, char *buf, const size_t bufsize)
+{
+	return eat_file_at(AT_FDCWD, file, buf, bufsize);
+}
+
 #if !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
 static ssize_t getline(char **line, size_t *len, FILE *fp)
 {



1.102                portage-utils/qmerge.c

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

Index: qmerge.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- qmerge.c	22 Feb 2011 06:10:16 -0000	1.101
+++ qmerge.c	23 Feb 2011 08:59:45 -0000	1.102
@@ -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/qmerge.c,v 1.101 2011/02/22 06:10:16 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.102 2011/02/23 08:59:45 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -55,7 +55,7 @@
 	COMMON_OPTS_HELP
 };
 
-static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.101 2011/02/22 06:10:16 vapier Exp $";
+static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.102 2011/02/23 08:59:45 vapier Exp $";
 #define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
 
 char search_pkgs = 0;
@@ -112,22 +112,6 @@
 
 struct pkg_t *grab_binpkg_info(const char *);
 
-static int mkdirhier(char *dname, mode_t mode)
-{
-	char buf[BUFSIZ];
-	int i;
-	strncpy(buf, dname, sizeof(buf));
-	for (i = 0; i < strlen(buf); i++) {
-		if (buf[i] == '/') {
-			buf[i] = 0;
-			if (*buf)
-				mkdir(buf, mode);
-			buf[i] = '/';
-		}
-	}
-	return mkdir(dname, mode);
-}
-
 static int q_unlink_q(char *path, const char *func, int line)
 {
 	if ((strcmp(path, "/bin/sh") == 0) || (strcmp(path, BUSYBOX) == 0)) {
@@ -284,22 +268,20 @@
 	return 0;
 }
 
-void crossmount_rm(char *, const size_t size, const char *, const struct stat);
-void crossmount_rm(char *buf, const size_t size, const char *fname, const struct stat st)
+static void crossmount_rm(const char *fname, const struct stat st)
 {
 	struct stat lst;
 
 	assert(pretend == 0);
 
-	if (lstat(buf, &lst) == -1)
+	if (lstat(fname, &lst) == -1)
 		return;
 	if (lst.st_dev != st.st_dev) {
-		warn("skipping crossmount install masking: %s", buf);
+		warn("skipping crossmount install masking: %s", fname);
 		return;
 	}
-	qprintf("%s<<<%s %s\n", YELLOW, NORM, buf);
-	snprintf(buf, size, BUSYBOX " rm -rf ./%s", fname);
-	xsystem(buf);
+	qprintf("%s<<<%s %s\n", YELLOW, NORM, fname);
+	rm_rf(fname);
 }
 
 void install_mask_pwd(int argc, char **argv, const struct stat st);
@@ -324,13 +306,13 @@
 				for (g = 0; g < globbuf.gl_pathc; g++) {
 					strncpy(buf, globbuf.gl_pathv[g], sizeof(buf));
 					/* qprintf("globbed: %s\n", globbuf.gl_pathv[g]); */
-					crossmount_rm(buf, sizeof(buf), globbuf.gl_pathv[g], st);
+					crossmount_rm(globbuf.gl_pathv[g], st);
 				}
 				globfree(&globbuf);
 			}
 			continue;
 		}
-		crossmount_rm(buf, sizeof(buf), iargv[i], st);
+		crossmount_rm(iargv[i], st);
 	}
 }
 
@@ -408,41 +390,41 @@
 	return c;
 }
 
-static int has_postinst(char *vdbroot)
+static void pkg_run_func(const char *vdb_path, const char *phases, const char *func)
 {
-	FILE *fp;
-	int ret;
-	char buf[1024];
-	snprintf(buf, sizeof(buf), "%s/%s", vdbroot, "DEFINED_PHASES");
-	if ((fp = fopen(buf,  "r")) == NULL)
-		return 1;
-	if (fgets(buf, sizeof(buf), fp))
-		ret = (strstr(buf, "postinst") == NULL) ? 0 : 2;
-	else
-		ret = 0;
-	fclose(fp);
-	return ret;
-}
+	char *script;
+
+	/* This assumes no func is a substring of another func.
+	 * Today, that assumption is valid for all funcs ...
+	 * The phases are the func with the "pkg_" chopped off. */
+	if (strstr(phases, func + 4) == NULL)
+		return;
 
-#define pkg_run_func(func, setup) \
-	do { \
-		qprintf(">>> %s\n", func); \
-		xsystembash( \
-			"debug-print() { :; }; " \
-			"debug-print-function() { :; }; " \
-			"debug-print-section() { :; }; " \
-			func "() { :; }; " \
-			setup \
-			". ./environment && " \
-			func \
-		); \
-	} while (0)
+	qprintf(">>> %s\n", func);
+
+	xasprintf(&script,
+		/* Provide funcs required by the PMS */
+		"debug-print() { :; }\n"
+		"debug-print-function() { :; }\n"
+		"debug-print-section() { :; }\n"
+		"use() { useq \"$@\"; }\n"
+		"useq() { hasq $1 $USE; }\n"
+		"has() { hasq \"$@\"; }\n"
+		"hasq() { local h=$1; shift; case \" $* \" in *\" $h \"*) return 0;; *) return 1;; esac; }\n"
+		/* Unpack the env if need be */
+		"[ -e '%1$s/environment' ] || { bzip2 -dc '%1$s/environment.bz2' > '%1$s/environment' || exit 1; }\n"
+		/* Load the env and run the func */
+		". %1$s/environment && %2$s",
+		vdb_path, func);
+	xsystembash(script);
+	free(script);
+}
 
 /* oh shit getting into pkg mgt here. FIXME: write a real dep resolver. */
 void pkg_merge(int level, depend_atom *atom, struct pkg_t *pkg)
 {
 	FILE *fp, *contents;
-	char buf[1024];
+	char buf[1024], phases[128];
 	char tarball[255];
 	char *p;
 	int i;
@@ -567,7 +549,8 @@
 	/* mkdir(pkg->PF, 0710); */
 	xchdir(pkg->PF);
 
-	xsystem(BUSYBOX " rm -rf ./*"); /* this line does funny things to nano's highlighting. */
+	/* Doesn't actually remove $PWD, just everything under it */
+	rm_rf(".");
 
 	/* split the tbz and xpak data */
 	snprintf(tarball, sizeof(tarball), "%s.tbz2", pkg->PF);
@@ -640,17 +623,21 @@
 		freeargv(ARGC, ARGV);
 		ARGC = 0; ARGV = NULL;
 	}
+
 	xchdir("image");
 
+	eat_file("../vdb/DEFINED_PHASES", phases, sizeof(phases));
+	pkg_run_func("../vdb", phases, "pkg_preinst");
+
 	if (stat("./", &st) == -1)
 		err("Cant stat pwd");
 
 	makeargv(install_mask, &iargc, &iargv);
 	install_mask_pwd(iargc, iargv, st);
 
-	if ((strstr(features, "noinfo")) != NULL) if (access("./usr/share/info", R_OK) == 0) xsystem(BUSYBOX " rm -rf ./usr/share/info");
-	if ((strstr(features, "noman"))  != NULL) if (access("./usr/share/man",  R_OK) == 0) xsystem(BUSYBOX " rm -rf ./usr/share/man");
-	if ((strstr(features, "nodoc"))  != NULL) if (access("./usr/share/doc",  R_OK) == 0) xsystem(BUSYBOX " rm -rf ./usr/share/doc");
+	if (strstr(features, "noinfo")) rm_rf("./usr/share/info");
+	if (strstr(features, "noman" )) rm_rf("./usr/share/man");
+	if (strstr(features, "nodoc" )) rm_rf("./usr/share/doc");
 
 	/* we dont care about the return code */
 	rmdir("./usr/share");
@@ -802,38 +789,31 @@
 	xchdir(port_tmpdir);
 	xchdir(pkg->PF);
 
+	/* run postinst */
+	pkg_run_func("./vdb", phases, "pkg_postinst");
+
 	snprintf(buf, sizeof(buf), "%s/var/db/pkg/%s/", portroot, pkg->CATEGORY);
 	if (access(buf, R_OK|W_OK|X_OK) != 0)
-		mkdirhier(buf, 0755);
+		mkdir_p(buf, 0755);
 	strncat(buf, pkg->PF, sizeof(buf)-strlen(buf)-1);
 
 	/* FIXME */ /* move unmerging to around here ? */
 	/* not perfect when a version is already installed */
 	if (access(buf, X_OK) == 0) {
-		char buf2[sizeof(buf)] = "";
 		/* we need to compare CONTENTS in it and remove any file not provided by our CONTENTS */
-		snprintf(buf2, sizeof(buf2), BUSYBOX " rm -rf %s", buf);
-		xsystem(buf2);
+		rm_rf(buf);
 	}
 	if ((fp = fopen("vdb/COUNTER", "w")) != NULL) {
 		fputs("0", fp);
 		fclose(fp);
 	}
+	/* move the local vdb copy to the final place */
 	interactive_rename("vdb", buf, pkg);
 
-	/* run postinst on non embedded systems */
-	if ((which("ebuild") != NULL) && has_postinst(buf)) {
-		char *tbuf;
-		xasprintf(&tbuf, "ebuild %s/%s.ebuild postinst", buf, basename(buf));
-		xsystem(tbuf);
-		free(tbuf);
-	}
-
 	snprintf(buf, sizeof(buf), BUSYBOX " %s.tar.bz2", pkg->PF);
 	unlink_q(buf);
 	xchdir(port_tmpdir);
-	snprintf(buf, sizeof(buf), "rm -rf %s", pkg->PF);
-	xsystem(buf);
+	rm_rf(pkg->PF);
 
 	snprintf(buf, sizeof(buf), "%s/%s.tbz2", pkgdir, pkg->PF);
 	unlink(buf);
@@ -842,7 +822,7 @@
 int pkg_unmerge(const char *cat, const char *pkgname)
 {
 	size_t buflen;
-	char *buf, *vdb_path;
+	char *buf, *vdb_path, phases[128];
 	FILE *fp;
 	int ret, fd, vdb_fd;
 	int cp_argc, cpm_argc;
@@ -875,8 +855,8 @@
 
 	/* First execute the pkg_prerm step */
 	if (!pretend) {
-		xchdir(vdb_path);
-		pkg_run_func("pkg_prerm", "bzip2 -dc environment.bz2 > environment && ");
+		eat_file_at(vdb_fd, "DEFINED_PHASES", phases, sizeof(phases));
+		pkg_run_func(vdb_path, phases, "pkg_prerm");
 	}
 
 	/* Now start removing all the installed files */
@@ -981,29 +961,22 @@
 	freeargv(cp_argc, cp_argv);
 	freeargv(cpm_argc, cpm_argv);
 
-	/* Then execute the pkg_postrm step */
-	if (!pretend)
-		pkg_run_func("pkg_postrm", "");
-
 	if (!pretend) {
-		/* Finally delete the vdb entry */
-		DIR *dir;
-		struct dirent *de;
+		char *dir;
 
-		dir = fdopendir(vdb_fd);
-		if (!dir)
-			goto done;
+		/* Then execute the pkg_postrm step */
+		pkg_run_func(vdb_path, phases, "pkg_postrm");
 
-		while ((de = readdir(dir)) != NULL)
-			unlinkat(vdb_fd, de->d_name, 0);
-
-		closedir(dir);
-		vdb_fd = -1;
+		/* Finally delete the vdb entry */
+		rm_rf(vdb_path);
 
+		/* And prune any empty vdb dirs */
+		dir = strrchr(vdb_path, '/');
+		*dir = '\0';
+		rmdir(vdb_path);
+		dir = strrchr(vdb_path, '/');
+		*dir = '\0';
 		rmdir(vdb_path);
-
-		/* XXX: Really only needed because we shell out to qlist and such ... */
-		xchdir("/");
 	}
 
 	ret = 0;