Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 9f2d9ba
Fix #333 -- add -n, -q and -y options to pkg clean
Matthew Seaman committed 13 years ago
commit 9f2d9ba0ae289fdcada36e7684464b7525930cfb
parent ff8d525
1 file changed +235 -30
modified pkg/clean.c
@@ -25,7 +25,9 @@
 */



#include <sys/stat.h>
+ 
#include <sys/queue.h>
+ 
#include <assert.h>

#include <err.h>

#include <fts.h>

#include <pkg.h>
@@ -36,31 +38,206 @@


#include "pkgcli.h"
+ 
struct deletion_list {
+ 
	STAILQ_ENTRY(deletion_list) next;
+ 
	unsigned	 reason;
+ 
	const char	*path;
+ 
	const char	*origin;
+ 
	const char	*newname;
+ 
	const char	*newversion;
+ 
	char		 data[0];
+ 
};
+ 
#define OUT_OF_DATE	(1U<<0)
+ 
#define REMOVED		(1U<<1)
+
+ 
STAILQ_HEAD(dl_head, deletion_list);
+
+ 
static int
+ 
add_to_dellist(struct dl_head *dl,  unsigned reason, const char *path,
+ 
	       const char *origin, const char *newname, const char *newversion)
+ 
{
+ 
	struct deletion_list	*dl_entry;
+ 
	size_t			 alloc_len;
+ 
	size_t			 offset;
+
+ 
	assert(path != NULL);
+ 
	assert(origin != NULL);
+
+ 
	alloc_len = sizeof(struct deletion_list) + strlen(path) +
+ 
		strlen(origin) + 2;
+ 
	if (newname != NULL)
+ 
		alloc_len += strlen(newname) + 1;
+ 
	if (newversion != NULL)
+ 
		alloc_len += strlen(newversion) + 1;
+
+ 
	dl_entry = calloc(1, alloc_len);
+ 
	if (dl_entry == NULL) {
+ 
		warn("adding deletion list entry");
+ 
		return (EPKG_FATAL);
+ 
	}
+
+ 
	dl_entry->reason = reason;
+
+ 
	offset = 0;
+
+ 
	alloc_len = strlen(path) + 1;
+ 
	strlcpy(&(dl_entry->data[offset]), path, alloc_len);
+ 
	dl_entry->path = &(dl_entry->data[offset]);
+ 
	offset = alloc_len;
+
+ 
	alloc_len = strlen(origin) + 1;
+ 
	strlcpy(&(dl_entry->data[offset]), origin, alloc_len);
+ 
	dl_entry->origin = &(dl_entry->data[offset]);
+ 
	offset += alloc_len;
+
+ 
	if (newname != NULL) {
+ 
		alloc_len = strlen(newname) + 1;
+ 
		strlcpy(&(dl_entry->data[offset]), newname, alloc_len);
+ 
		dl_entry->newname = &(dl_entry->data[offset]);
+ 
		offset += alloc_len;
+ 
	} else
+ 
		dl_entry->newname = NULL;
+
+ 
	if (newversion != NULL) {
+ 
		alloc_len = strlen(newversion) + 1;
+ 
		strlcpy(&(dl_entry->data[offset]), newversion, alloc_len);
+ 
		dl_entry->newversion = &(dl_entry->data[offset]);
+ 
		offset += alloc_len;
+ 
	} else
+ 
		dl_entry->newversion = NULL;
+
+ 
	STAILQ_INSERT_TAIL(dl, dl_entry, next);
+
+ 
	return (EPKG_OK);
+ 
}
+
+ 
static void
+ 
free_dellist(struct dl_head *dl)
+ 
{
+ 
	struct deletion_list	*dl_entry;
+
+ 
	while (!STAILQ_EMPTY(dl)) {
+ 
		dl_entry = STAILQ_FIRST(dl);
+ 
		STAILQ_REMOVE_HEAD(dl, next);
+ 
		free(dl_entry);
+ 
	}
+ 
}
+
+ 
static void
+ 
display_dellist(struct dl_head *dl, const char *cachedir)
+ 
{
+ 
	struct deletion_list	*dl_entry;
+ 
	const char		*relpath;
+
+ 
	printf("The following package files will be deleted "
+ 
	       "from the cache directory\n%s:\n\n", cachedir);
+
+ 
	printf("%-30s %-20s %s\n", "Package:", "Origin:", "Reason:");
+ 
	STAILQ_FOREACH(dl_entry, dl, next) {
+ 
		if (strlen(cachedir) + 1 < strlen(dl_entry->path)) {
+ 
			relpath = dl_entry->path + strlen(cachedir);
+ 
			if (relpath[0] == '/')
+ 
				relpath++;
+ 
		} else
+ 
			relpath = dl_entry->path;
+
+ 
		printf("%-30s %-20s ", relpath, dl_entry->origin);
+
+ 
		switch (dl_entry->reason) {
+ 
		case OUT_OF_DATE:
+ 
			printf("Superseded by %s-%s\n",
+ 
			    dl_entry->newname != NULL ?
+ 
			       dl_entry->newname :
+ 
			       "(unknown)",
+ 
			    dl_entry->newversion != NULL ?
+ 
			       dl_entry->newversion :
+ 
			       "(unknown)");
+ 
			break;
+ 
		case REMOVED:
+ 
			printf("Removed from repository\n");
+ 
			break;
+ 
		default:	/* not reached */
+ 
			break;
+ 
		}
+ 
	}
+ 
}
+
+ 
static int
+ 
delete_dellist(struct dl_head *dl)
+ 
{
+ 
	struct deletion_list	*dl_entry;
+ 
	int			retcode = EX_OK;
+ 
	int			count = 0;
+
+ 
	if (!quiet)
+ 
		printf("Deleting:\n");
+
+ 
	STAILQ_FOREACH(dl_entry, dl, next) {
+ 
		if (!quiet)
+ 
			printf("\t%s\n", dl_entry->path);
+ 
		if (unlink(dl_entry->path) != 0) {
+ 
			warn("unlink(%s)", dl_entry->path);
+ 
			count++;
+ 
			retcode = EX_SOFTWARE;
+ 
		}
+ 
	}
+
+ 
	if (!quiet) {
+ 
		if (retcode == EX_OK)
+ 
			printf("All done\n");
+ 
		else
+ 
			printf("%d package%s could not be deleted\n",
+ 
			       count, count > 1 ? "s" : "");
+ 
	}
+ 
	return (retcode);
+ 
}
+ 


void

usage_clean(void)

{
- 
	fprintf(stderr, "usage: pkg clean\n\n");
+ 
	fprintf(stderr, "usage: pkg [-nqy] clean\n\n");

	fprintf(stderr, "For more information see 'pkg help clean'.\n");

}



int

exec_clean(int argc, char **argv)

{
- 
	struct pkgdb *db = NULL;
- 
	struct pkgdb_it *it = NULL;
- 
	struct pkg *pkg = NULL;
- 
	struct pkg *p = NULL;
- 
	FTS *fts = NULL;
- 
	FTSENT *ent = NULL;
- 
	const char *cachedir;
- 
	char *paths[2];
- 
	char *repopath;
- 
	bool to_delete;
- 
	int retcode = EX_SOFTWARE;
- 
	int ret;
-
- 
	(void)argc;
- 
	(void)argv;
+ 
	struct pkgdb	*db = NULL;
+ 
	struct pkgdb_it	*it = NULL;
+ 
	struct pkg	*pkg = NULL;
+ 
	struct pkg	*p = NULL;
+ 
	FTS		*fts = NULL;
+ 
	FTSENT		*ent = NULL;
+ 
	struct dl_head	dl = STAILQ_HEAD_INITIALIZER(dl);
+ 
	const char	*cachedir;
+ 
	char		*paths[2];
+ 
	char		*repopath;
+ 
	bool		 dry_run = false;
+ 
	bool		 yes;
+ 
	int		 retcode = EX_SOFTWARE;
+ 
	int		 ret;
+ 
	int		 ch;
+
+ 
	pkg_config_bool(PKG_CONFIG_ASSUME_ALWAYS_YES, &yes);
+
+ 
	while ((ch = getopt(argc, argv, "nqy")) != -1) {
+ 
		switch (ch) {
+ 
		case 'n':
+ 
			dry_run = true;
+ 
			break;
+ 
		case 'q':
+ 
			quiet = true;
+ 
			break;
+ 
		case 'y':
+ 
			yes = true;
+ 
			break;
+ 
		default:
+ 
			usage_update();
+ 
			return (EX_USAGE);
+ 
		}
+ 
	}
+ 
	argc -= optind;
+ 
	argv += optind;



	if (pkg_config_string(PKG_CONFIG_CACHEDIR, &cachedir) != EPKG_OK) {

		warnx("Cannot get cachedir config entry");
@@ -79,6 +256,8 @@ exec_clean(int argc, char **argv)
		goto cleanup;

	}
+ 
	/* Build the list of out-of-date or obsolete packages */
+ 


	while ((ent = fts_read(fts)) != NULL) {

		const char *origin, *pkgrepopath;
@@ -90,7 +269,8 @@ exec_clean(int argc, char **argv)
			repopath++;



		if (pkg_open(&pkg, ent->fts_path) != EPKG_OK) {
- 
			warnx("skipping %s", ent->fts_path);
+ 
			if (!quiet)
+ 
				warnx("skipping %s", ent->fts_path);

			continue;

		}
@@ -99,37 +279,62 @@ exec_clean(int argc, char **argv)
		    FIELD_NONE, NULL);



		if (it == NULL) {
- 
			warnx("skipping %s", ent->fts_path);
+ 
			if (!quiet)
+ 
				warnx("skipping %s", ent->fts_path);

			continue;

		}



		if ((ret = pkgdb_it_next(it, &p, PKG_LOAD_BASIC)) ==

		    EPKG_FATAL) {
- 
			warnx("skipping %s", ent->fts_path);
+ 
			if (!quiet)
+ 
				warnx("skipping %s", ent->fts_path);

			continue;

		}
- 
		to_delete = false;
+ 


		pkg_get(p, PKG_REPOPATH, &pkgrepopath);

		if (ret == EPKG_END) {
- 
			to_delete = true;
- 
			printf("%s does not exist anymore, deleting it\n",
- 
			    repopath);
+ 
			ret = add_to_dellist(&dl, REMOVED, ent->fts_path,
+ 
					     origin, NULL, NULL);

		} else if (strcmp(repopath, pkgrepopath)) {
- 
			printf("%s is out-of-date, deleting it\n", repopath);
- 
			to_delete = true;
+ 
			const char	*newname;
+ 
			const char	*newversion;
+
+ 
			pkg_get(p,
+ 
				PKG_NAME,    &newname,
+ 
				PKG_VERSION, &newversion);
+
+ 
			ret = add_to_dellist(&dl, OUT_OF_DATE, ent->fts_path,
+ 
					     origin, newname, newversion);

		}
- 
		if (to_delete == true) {
- 
			if (unlink(ent->fts_path) != 0)
- 
				warn("unlink(%s)", ent->fts_path);
+ 
		if (ret != EPKG_OK && ret != EPKG_END) {
+ 
			retcode = EX_OSERR; /* out of memory */
+ 
			goto cleanup;

		}



		pkgdb_it_free(it);

	}
- 
	retcode = EX_OK;
+ 
	if (STAILQ_EMPTY(&dl)) {
+ 
	    printf("Nothing to do.\n");
+ 
	    retcode = EX_OK;
+ 
	    goto cleanup;
+ 
	}
+
+ 
	display_dellist(&dl, cachedir);
+
+ 
	if (!dry_run) {
+ 
		if (!yes)
+ 
			yes = query_yesno(
+ 
				"\nProceed with cleaning cache [y/N]: ");
+ 
		if (yes)
+ 
			retcode = delete_dellist(&dl);
+ 
	} else
+ 
		retcode = EX_OK;
+
+ 
cleanup:
+ 
	free_dellist(&dl);
- 
	cleanup:

	if (pkg != NULL)

		pkg_free(pkg);

	if (p != NULL)