Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f0b1fae
Garbage collect now no-op code
Baptiste Daroussin committed 11 years ago
commit f0b1faef84d3833aec6d894f1bbfa91e91cbdc87
parent 6d82384
12 files changed +7 -134
modified libpkg/libpkg.ver
@@ -53,9 +53,7 @@ global:
	pkg_dep_lookup;

	pkg_deps;

	pkg_dir_get;
- 
	pkg_dir_keep;

	pkg_dir_mode;
- 
	pkg_dir_try;

	pkg_dirs;

	pkg_dprintf;

	pkg_emit_manifest;
@@ -64,7 +62,6 @@ global:
	pkg_fetch_file;

	pkg_fetch_file_tmp;

	pkg_file_get;
- 
	pkg_file_keep;

	pkg_file_mode;

	pkg_files;

	pkg_finish_repo;
modified libpkg/pkg.c
@@ -809,7 +809,7 @@ pkg_adddir(struct pkg *pkg, const char *path, bool try, bool check_duplicates)
}



int
- 
pkg_adddir_attr(struct pkg *pkg, const char *path, const char *uname, const char *gname, mode_t perm, bool try, bool check_duplicates)
+ 
pkg_adddir_attr(struct pkg *pkg, const char *path, const char *uname, const char *gname, mode_t perm, bool try __unused, bool check_duplicates)

{

	struct pkg_dir *d = NULL;
@@ -842,8 +842,6 @@ pkg_adddir_attr(struct pkg *pkg, const char *path, const char *uname, const char
	if (perm != 0)

		d->perm = perm;
- 
	d->try = try;
- 


	HASH_ADD_STR(pkg->dirs, path, d);



	return (EPKG_OK);
modified libpkg/pkg.h.in
@@ -901,7 +901,6 @@ const char *pkg_file_get(struct pkg_file const * const, const pkg_file_attr);
#define pkg_file_uname(f) pkg_file_get(f, PKG_FILE_UNAME)

#define pkg_file_gname(f) pkg_file_get(f, PKG_FILE_GNAME)

mode_t pkg_file_mode(struct pkg_file const * const);
- 
bool pkg_file_keep(struct pkg_file const * const);



bool pkg_has_dir(struct pkg *, const char *);

bool pkg_has_file(struct pkg *, const char *);
@@ -911,8 +910,6 @@ const char *pkg_dir_get(struct pkg_dir const * const, const pkg_dir_attr);
#define pkg_dir_uname(d) pkg_dir_get(d, PKG_DIR_UNAME)

#define pkg_dir_gname(d) pkg_dir_get(d, PKG_DIR_GNAME)

mode_t pkg_dir_mode(struct pkg_dir const * const);
- 
bool pkg_dir_keep(struct pkg_dir const * const);
- 
bool pkg_dir_try(struct pkg_dir const * const);



/* pkg_category */

const char *pkg_category_name(struct pkg_category const * const);
modified libpkg/pkg_attributes.c
@@ -97,7 +97,6 @@ pkg_file_new(struct pkg_file **file)
		return (EPKG_FATAL);



	(*file)->perm = 0;
- 
	(*file)->keep = 0;



	return (EPKG_OK);

}
@@ -140,14 +139,6 @@ pkg_file_mode(struct pkg_file const * const f)
	return (f->perm);

}
- 
bool
- 
pkg_file_keep(struct pkg_file const * const f)
- 
{
- 
	assert(f != NULL);
-
- 
	return (f->keep);
- 
}
- 


/*

 * Dir

 */
@@ -159,8 +150,6 @@ pkg_dir_new(struct pkg_dir **d)
		return (EPKG_FATAL);



	(*d)->perm = 0;
- 
	(*d)->keep = 0;
- 
	(*d)->try = false;



	return (EPKG_OK);

}
@@ -198,22 +187,6 @@ pkg_dir_mode(struct pkg_dir const * const d)
	return (d->perm);

}
- 
bool
- 
pkg_dir_keep(struct pkg_dir const * const d)
- 
{
- 
	assert(d != NULL);
-
- 
	return (d->keep);
- 
}
-
- 
bool
- 
pkg_dir_try(struct pkg_dir const * const d)
- 
{
- 
	assert(d != NULL);
-
- 
	return (d->try);
- 
}
- 


/*

 * User

 */
modified libpkg/pkg_delete.c
@@ -295,9 +295,6 @@ pkg_delete_files(struct pkg *pkg, unsigned force)


	while (pkg_files(pkg, &file) == EPKG_OK) {

		pkg_emit_progress_tick(cur_file++, nfiles);
-
- 
		if (file->keep == 1)
- 
			continue;

		pkg_delete_file(pkg, file, force);

	}
@@ -341,12 +338,8 @@ pkg_delete_dirs(__unused struct pkgdb *db, struct pkg *pkg)
{

	struct pkg_dir		*dir = NULL;
- 
	while (pkg_dirs(pkg, &dir) == EPKG_OK) {
- 
		if (dir->keep == 1)
- 
			continue;
-
+ 
	while (pkg_dirs(pkg, &dir) == EPKG_OK)

		pkg_delete_dir(pkg, dir);
- 
	}



	pkg_effective_rmdir(db, pkg);
modified libpkg/pkg_manifest.c
@@ -1086,13 +1086,10 @@ pkg_emit_object(struct pkg *pkg, short flags)
			map = NULL;

			while (pkg_dirs(pkg, &dir) == EPKG_OK) {

				urlencode(pkg_dir_path(dir), &tmpsbuf);
- 
				/* For now append y/n to stay compatible with libyaml version
- 
				 * obj_append_boolean(map, sbuf_get(tmpsbuf), pkg_dir_try(dir));
- 
				 */

				if (map == NULL)

					map = ucl_object_typed_new(UCL_OBJECT);

				ucl_object_insert_key(map,
- 
				    ucl_object_fromstring(pkg_dir_try(dir) ? "y" : "n"),
+ 
				    ucl_object_fromstring("y"),

				    sbuf_data(tmpsbuf), sbuf_len(tmpsbuf), true);

			}

			if (map)
modified libpkg/pkg_old.c
@@ -150,15 +150,9 @@ pkg_old_emit_content(struct pkg *pkg, char **dest)
	}



	while (pkg_dirs(pkg, &dir) == EPKG_OK) {
- 
		if (pkg_dir_try(dir)) {
- 
			sbuf_printf(content,
- 
			    "@dirrm %s\n",
- 
			    pkg_dir_path(dir));
- 
		} else {
- 
			sbuf_printf(content,
- 
			    "@unexec /sbin/rmdir \"%s\" 2>/dev/null\n",
- 
			    pkg_dir_path(dir));
- 
		}
+ 
		sbuf_printf(content,
+ 
		    "@unexec /sbin/rmdir \"%s\" 2>/dev/null\n",
+ 
		    pkg_dir_path(dir));

	}



	sbuf_printf(content, "@comment OPTIONS:");
modified libpkg/pkg_printf.c
@@ -247,15 +247,6 @@ static const struct pkg_printf_fmt fmt[] = {
		PP_PKG|PP_D,

		&format_directory_group,

	},
- 
	[PP_PKG_DIRECTORY_KEEPFLAG] =
- 
	{
- 
		'D',
- 
		'k',
- 
		false,
- 
		false,
- 
		PP_PKG|PP_D,
- 
		&format_directory_keepflag,
- 
	},

	[PP_PKG_DIRECTORY_PATH] =

	{

		'D',
@@ -274,15 +265,6 @@ static const struct pkg_printf_fmt fmt[] = {
		PP_PKG|PP_D,

		&format_directory_perms,

	},
- 
	[PP_PKG_DIRECTORY_TRYFLAG] =
- 
	{
- 
		'D',
- 
		't',
- 
		false,
- 
		false,
- 
		PP_PKG|PP_D,
- 
		&format_directory_tryflag,
- 
	},

	[PP_PKG_DIRECTORY_USER] =

	{

		'D',
@@ -310,15 +292,6 @@ static const struct pkg_printf_fmt fmt[] = {
		PP_PKG|PP_F,

		&format_file_group,

	},
- 
	[PP_PKG_FILE_KEEPFLAG] =
- 
	{
- 
		'F',
- 
		'k',
- 
		false,
- 
		false,
- 
		PP_PKG|PP_F,
- 
		&format_file_keepflag,
- 
	},

	[PP_PKG_FILE_PATH] =

	{

		'F',
@@ -1021,17 +994,6 @@ format_directory_group(struct sbuf *sbuf, const void *data,
}



/*
- 
 * %Dk -- Directory Keep flag.
- 
 */
- 
struct sbuf *
- 
format_directory_keepflag(struct sbuf *sbuf, const void *data,
- 
		       struct percent_esc *p)
- 
{
- 
	const struct pkg_dir	*dir = data;
- 
	return (bool_val(sbuf, pkg_dir_keep(dir), p));
- 
}
-
- 
/*

 * %Dn -- Directory path name.

 */

struct sbuf *
@@ -1055,18 +1017,6 @@ format_directory_perms(struct sbuf *sbuf, const void *data,
}



/*
- 
 * %Dt -- Directory Try flag.
- 
 */
- 
struct sbuf *
- 
format_directory_tryflag(struct sbuf *sbuf, const void *data,
- 
			 struct percent_esc *p)
- 
{
- 
	const struct pkg_dir	*dir = data;
-
- 
	return (bool_val(sbuf, pkg_dir_try(dir), p));
- 
}
-
- 
/*

 * %Du -- Directory user. TODO: numeric UID

 */

struct sbuf *
@@ -1123,17 +1073,6 @@ format_file_group(struct sbuf *sbuf, const void *data, struct percent_esc *p)
}



/*
- 
 * %Fk -- File Keep flag.
- 
 */
- 
struct sbuf *
- 
format_file_keepflag(struct sbuf *sbuf, const void *data, struct percent_esc *p)
- 
{
- 
	const struct pkg_file	*file = data;
-
- 
	return (bool_val(sbuf, pkg_file_keep(file), p));
- 
}
-
- 
/*

 * %Fn -- File path name.

 */

struct sbuf *
modified libpkg/pkgdb.c
@@ -1710,7 +1710,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete, int forced)
			goto cleanup;

		}

		if ((ret = run_prstmt(DIRS2, package_id, pkg_dir_path(dir),
- 
		    pkg_dir_try(dir))) != SQLITE_DONE) {
+ 
		    true)) != SQLITE_DONE) {

			if (ret == SQLITE_CONSTRAINT) {

				pkg_emit_error("Another package is already "

				    "providing directory: %s",
modified libpkg/private/pkg.h
@@ -180,7 +180,6 @@ struct pkg_file {
	char		 sum[SHA256_DIGEST_LENGTH * 2 + 1];

	char		 uname[MAXLOGNAME];

	char		 gname[MAXLOGNAME];
- 
	bool		 keep;

	mode_t		 perm;

	UT_hash_handle	 hh;

};
@@ -190,8 +189,6 @@ struct pkg_dir {
	char		 uname[MAXLOGNAME];

	char		 gname[MAXLOGNAME];

	mode_t		 perm;
- 
	bool		 keep;
- 
	bool		 try;

	UT_hash_handle	 hh;

};
modified libpkg/private/pkg_printf.h
@@ -82,14 +82,11 @@ typedef enum _fmt_code_t {
	PP_PKG_CATEGORY_NAME,

	PP_PKG_CATEGORIES,

	PP_PKG_DIRECTORY_GROUP,
- 
	PP_PKG_DIRECTORY_KEEPFLAG,

	PP_PKG_DIRECTORY_PATH,

	PP_PKG_DIRECTORY_PERMS,
- 
	PP_PKG_DIRECTORY_TRYFLAG,

	PP_PKG_DIRECTORY_USER,

	PP_PKG_DIRECTORIES,

	PP_PKG_FILE_GROUP,
- 
	PP_PKG_FILE_KEEPFLAG,

	PP_PKG_FILE_PATH,

	PP_PKG_FILE_PERMS,

	PP_PKG_FILE_SHA256,
@@ -171,14 +168,11 @@ _static struct sbuf *format_categories(struct sbuf *, const void *, struct perce
_static struct sbuf *format_category_name(struct sbuf *, const void *, struct percent_esc *);

_static struct sbuf *format_directories(struct sbuf *, const void *, struct percent_esc *);

_static struct sbuf *format_directory_group(struct sbuf *, const void *, struct percent_esc *);
- 
_static struct sbuf *format_directory_keepflag(struct sbuf *, const void *, struct percent_esc *);

_static struct sbuf *format_directory_path(struct sbuf *, const void *, struct percent_esc *);

_static struct sbuf *format_directory_perms(struct sbuf *, const void *, struct percent_esc *);
- 
_static struct sbuf *format_directory_tryflag(struct sbuf *, const void *, struct percent_esc *);

_static struct sbuf *format_directory_user(struct sbuf *, const void *, struct percent_esc *);

_static struct sbuf *format_files(struct sbuf *, const void *, struct percent_esc *);

_static struct sbuf *format_file_group(struct sbuf *, const void *, struct percent_esc *);
- 
_static struct sbuf *format_file_keepflag(struct sbuf *, const void *, struct percent_esc *);

_static struct sbuf *format_file_path(struct sbuf *, const void *, struct percent_esc *);

_static struct sbuf *format_file_perms(struct sbuf *, const void *, struct percent_esc *);

_static struct sbuf *format_file_sha256(struct sbuf *, const void *, struct percent_esc *);
modified tests/lib/pkg_printf_test.c
@@ -1355,14 +1355,11 @@ ATF_TC_BODY(format_code, tc)
		{ "Cn", PP_PKG, PP_PKG_CATEGORY_NAME,       2, '\0', },

		{ "C",  PP_PKG, PP_PKG_CATEGORIES,          1, '\0', },

		{ "Dg", PP_PKG, PP_PKG_DIRECTORY_GROUP,     2, '\0', },
- 
		{ "Dk", PP_PKG, PP_PKG_DIRECTORY_KEEPFLAG,  2, '\0', },

		{ "Dn", PP_PKG, PP_PKG_DIRECTORY_PATH,      2, '\0', },

		{ "Dp", PP_PKG, PP_PKG_DIRECTORY_PERMS,     2, '\0', },
- 
		{ "Dt", PP_PKG, PP_PKG_DIRECTORY_TRYFLAG,   2, '\0', },

		{ "Du", PP_PKG, PP_PKG_DIRECTORY_USER,      2, '\0', },

		{ "D",  PP_PKG, PP_PKG_DIRECTORIES,         1, '\0', },

		{ "Fg", PP_PKG, PP_PKG_FILE_GROUP,          2, '\0', },
- 
		{ "Fk", PP_PKG, PP_PKG_FILE_KEEPFLAG,       2, '\0', },

		{ "Fn", PP_PKG, PP_PKG_FILE_PATH,           2, '\0', },

		{ "Fp", PP_PKG, PP_PKG_FILE_PERMS,          2, '\0', },

		{ "Fs", PP_PKG, PP_PKG_FILE_SHA256,         2, '\0', },
@@ -1556,10 +1553,8 @@ ATF_TC_BODY(format_code, tc)
		{ "Cn", PP_D, PP_UNKNOWN,                 0, 'C',  },

		{ "C",  PP_D, PP_UNKNOWN,                 0, 'C',  },

		{ "Dg", PP_D, PP_PKG_DIRECTORY_GROUP,     2, '\0', },
- 
		{ "Dk", PP_D, PP_PKG_DIRECTORY_KEEPFLAG,  2, '\0', },

		{ "Dn", PP_D, PP_PKG_DIRECTORY_PATH,      2, '\0', },

		{ "Dp", PP_D, PP_PKG_DIRECTORY_PERMS,     2, '\0', },
- 
		{ "Dt", PP_D, PP_PKG_DIRECTORY_TRYFLAG,   2, '\0', },

		{ "Du", PP_D, PP_PKG_DIRECTORY_USER,      2, '\0', },

		{ "D",  PP_D, PP_UNKNOWN,                 0, 'D',  },

		{ "Fg", PP_D, PP_UNKNOWN,                 0, 'F',  },
@@ -1630,7 +1625,6 @@ ATF_TC_BODY(format_code, tc)
		{ "Du", PP_F, PP_UNKNOWN,                 0, 'D',  },

		{ "D",  PP_F, PP_UNKNOWN,                 0, 'D',  },

		{ "Fg", PP_F, PP_PKG_FILE_GROUP,          2, '\0', },
- 
		{ "Fk", PP_F, PP_PKG_FILE_KEEPFLAG,       2, '\0', },

		{ "Fn", PP_F, PP_PKG_FILE_PATH,           2, '\0', },

		{ "Fp", PP_F, PP_PKG_FILE_PERMS,          2, '\0', },

		{ "Fs", PP_F, PP_PKG_FILE_SHA256,         2, '\0', },