Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 8cf3721
More pkg_printf() cleanup.
Matthew Seaman committed 12 years ago
commit 8cf37212d2c9953abb79da242142cb31757bc6ae
parent beabb25
7 files changed +29 -36
modified libpkg/pkg.c
@@ -1314,6 +1314,12 @@ pkg_has_message(struct pkg *p)
}



bool
+ 
pkg_is_locked(const struct pkg *p)
+ 
{
+ 
	return (p->locked);
+ 
}
+
+ 
bool

pkg_has_file(struct pkg *p, const char *path)

{

	struct pkg_file *f;
modified libpkg/pkg.h.in
@@ -1499,5 +1499,6 @@ struct sbuf *pkg_sbuf_vprintf(struct sbuf * restrict sbuf,
	const char * restrict format, va_list ap);



bool pkg_has_message(struct pkg *p);
+ 
bool pkg_is_locked(const struct pkg *p);



#endif
modified libpkg/pkg_delete.c
@@ -44,7 +44,6 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)
	struct pkg_dep	*rdep = NULL;

	int		 ret;

	bool		 handle_rc = false;
- 
	bool		 locked;

	const char	*origin;



	assert(pkg != NULL);
@@ -76,8 +75,7 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)
		pkg_emit_deinstall_begin(pkg);



	/* If the package is locked */
- 
	pkg_get(pkg, PKG_LOCKED, &locked);
- 
	if (locked) {
+ 
	if (pkg_is_locked(pkg)) {

		pkg_emit_locked(pkg);

		return (EPKG_LOCKED);

	}
modified libpkg/pkg_jobs.c
@@ -642,7 +642,7 @@ newer_than_local_pkg(struct pkg_jobs *j, struct pkg *rp, bool force)
	struct pkg_option *lo = NULL, *ro = NULL;

	struct pkg_dep *ld = NULL, *rd = NULL;

	struct pkg_shlib *ls = NULL, *rs = NULL;
- 
	bool automatic, locked;
+ 
	bool automatic;

	int cmp = 0, ret1, ret2;



	pkg_get(rp, PKG_ORIGIN, &origin,
@@ -655,8 +655,12 @@ newer_than_local_pkg(struct pkg_jobs *j, struct pkg *rp, bool force)
		return (true);

	}
- 
	pkg_get(lp, PKG_LOCKED, &locked,
- 
	    PKG_AUTOMATIC, &automatic,
+ 
	if (pkg_is_locked(lp)) {
+ 
		pkg_free(lp);
+ 
		return (false);
+ 
	}
+
+ 
	pkg_get(lp, PKG_AUTOMATIC, &automatic,

	    PKG_VERSION, &oldversion,

	    PKG_FLATSIZE, &oldsize);
@@ -671,11 +675,6 @@ newer_than_local_pkg(struct pkg_jobs *j, struct pkg *rp, bool force)
		}

	}
- 
	if (locked) {
- 
		pkg_free(lp);
- 
		return (false);
- 
	}
- 


	pkg_get(rp, PKG_VERSION, &newversion);

	pkg_set(rp, PKG_OLD_VERSION, oldversion,

	    PKG_OLD_FLATSIZE, oldsize,
@@ -994,7 +993,7 @@ pkg_jobs_install(struct pkg_jobs *j)
	while (pkg_jobs(j, &p) == EPKG_OK) {

		const char *pkgorigin, *pkgrepopath, *oldversion, *origin;

		struct pkg_note *an;
- 
		bool automatic, locked;
+ 
		bool automatic;

		flags = 0;



		pkg_get(p, PKG_ORIGIN, &pkgorigin, PKG_REPOPATH, &pkgrepopath,
@@ -1006,8 +1005,7 @@ pkg_jobs_install(struct pkg_jobs *j)
			it = pkgdb_query(j->db, pkgorigin, MATCH_EXACT);

			if (it != NULL) {

				if (pkgdb_it_next(it, &pkg, lflags) == EPKG_OK) {
- 
					pkg_get(pkg, PKG_LOCKED, &locked);
- 
					if (locked) {
+ 
					if (pkg_is_locked(pkg)) {

						pkg_emit_locked(pkg);

						pkgdb_it_free(it);

						retcode = EPKG_LOCKED;
@@ -1041,8 +1039,7 @@ pkg_jobs_install(struct pkg_jobs *j)
			pkg = NULL;

			while (pkgdb_it_next(it, &pkg, lflags) == EPKG_OK) {
- 
				pkg_get(pkg, PKG_LOCKED, &locked);
- 
				if (locked) {
+ 
				if (pkg_is_locked(pkg)) {

					pkg_emit_locked(pkg);

					pkgdb_it_free(it);

					retcode = EPKG_LOCKED;
modified libpkg/pkg_printf.c
@@ -1513,10 +1513,8 @@ struct sbuf *
format_lock_status(struct sbuf *sbuf, const void *data, struct percent_esc *p)

{

	const struct pkg	*pkg = data;
- 
	bool			 locked;
- 
	pkg_get(pkg, PKG_LOCKED, &locked);
- 
	return (bool_val(sbuf, locked, p));
+ 
	return (bool_val(sbuf, pkg_is_locked(pkg), p));

}



/*
modified pkg/lock.c
@@ -58,10 +58,7 @@ usage_lock(void)
static int

do_lock(struct pkgdb *db, struct pkg *pkg)

{
- 
	bool locked;
-
- 
	pkg_get(pkg, PKG_LOCKED, &locked);
- 
	if (locked) {
+ 
	if (pkg_is_locked(pkg)) {

		if (!quiet)

			pkg_printf("%n-%v: already locked\n",

			       pkg, pkg);
@@ -82,10 +79,7 @@ do_lock(struct pkgdb *db, struct pkg *pkg)
static int

do_unlock(struct pkgdb *db, struct pkg *pkg)

{
- 
	bool locked;
-
- 
	pkg_get(pkg, PKG_LOCKED, &locked);
- 
	if (!locked) {
+ 
	if (!pkg_is_locked(pkg)) {

		if (!quiet)

			pkg_printf("%n-%v: already unlocked\n", pkg, pkg);

		return (EPKG_OK);
modified pkg/utils.c
@@ -537,10 +537,9 @@ print_jobs_summary(struct pkg_jobs *jobs, const char *msg, ...)
	struct pkg *pkg = NULL;

	char path[MAXPATHLEN];

	struct stat st;
- 
	const char *name, *version, *oldversion, *pkgrepopath, *cachedir, *why, *reponame;
+ 
	const char *version, *oldversion, *pkgrepopath, *cachedir, *why, *reponame;

	int64_t dlsize, oldsize, newsize;

	int64_t flatsize, oldflatsize, pkgsize;
- 
	bool locked;

	char size[7];

	va_list ap;

	pkg_jobs_t type;
@@ -553,18 +552,17 @@ print_jobs_summary(struct pkg_jobs *jobs, const char *msg, ...)


	dlsize = oldsize = newsize = 0;

	flatsize = oldflatsize = pkgsize = 0;
- 
	name = version = oldversion = NULL;
+ 
	version = oldversion = NULL;

	

	pkg_config_string(PKG_CONFIG_CACHEDIR, &cachedir);



	while (pkg_jobs(jobs, &pkg) == EPKG_OK) {
- 
		pkg_get(pkg, PKG_OLD_VERSION, &oldversion, PKG_NAME, &name,
- 
		    PKG_VERSION, &version, PKG_FLATSIZE, &flatsize,
- 
		    PKG_OLD_FLATSIZE, &oldflatsize, PKG_PKGSIZE, &pkgsize,
- 
		    PKG_REPOPATH, &pkgrepopath, PKG_LOCKED, &locked,
+ 
		pkg_get(pkg, PKG_OLD_VERSION, &oldversion, PKG_VERSION, &version,
+ 
		    PKG_FLATSIZE, &flatsize, PKG_OLD_FLATSIZE, &oldflatsize,
+ 
		    PKG_PKGSIZE, &pkgsize, PKG_REPOPATH, &pkgrepopath,

		    PKG_REASON, &why, PKG_REPONAME, &reponame);
- 
		if (locked) {
+ 
		if (pkg_is_locked(pkg)) {

			pkg_printf("\tPackage %n-%v is locked ", pkg, pkg);

			switch (type) {

			case PKG_JOBS_INSTALL:
@@ -664,7 +662,8 @@ print_jobs_summary(struct pkg_jobs *jobs, const char *msg, ...)


			humanize_number(size, sizeof(size), pkgsize, "B", HN_AUTOSCALE, 0);
- 
			printf("\t%s-%s (%" PRId64 "%% of %s)\n", name, version, 100 - (100 * oldsize)/pkgsize, size);
+ 
			pkg_printf("\t%n-%v ", pkg, pkg);
+ 
			printf("(%" PRId64 "%% of %s)\n", 100 - (100 * oldsize)/pkgsize, size);

			break;

		}

	}