5066570 pkg_dir is internal only, no need for accessors — HardenedBSD-pkg

modified libpkg/libpkg.ver

@@ -52,8 +52,6 @@ global:

 	pkg_dep_is_locked;
 	pkg_dep_lookup;
 	pkg_deps;
 	pkg_dir_get;
 	pkg_dir_mode;
 	pkg_dirs;
 	pkg_dprintf;
 	pkg_emit_manifest;

modified libpkg/pkg.c

@@ -1625,8 +1625,8 @@ pkg_copy_tree(struct pkg *pkg, const char *src, const char *dest)

 	}
 	while (pkg_dirs(pkg, &dir) == EPKG_OK) {
 		snprintf(spath, sizeof(spath), "%s%s", src, pkg_dir_path(dir));
 		snprintf(dpath, sizeof(dpath), "%s%s", dest, pkg_dir_path(dir));
 		snprintf(spath, sizeof(spath), "%s%s", src, dir->path);
 		snprintf(dpath, sizeof(dpath), "%s%s", dest, dir->path);
 		packing_append_file_attr(pack, spath, dpath,
 		    dir->uname, dir->gname, dir->perm);
 	}

modified libpkg/pkg.h.in

@@ -288,12 +288,6 @@ typedef enum {

 } pkg_dep_attr;
 typedef enum {
 	PKG_DIR_PATH = 0,
 	PKG_DIR_UNAME,
 	PKG_DIR_GNAME
 } pkg_dir_attr;
 typedef enum {
 	PKG_DEPS = 0,
 	PKG_RDEPS,
 	PKG_OPTIONS,

@@ -889,12 +883,6 @@ bool pkg_dep_is_locked(struct pkg_dep const * const);

 bool pkg_has_dir(struct pkg *, const char *);
 bool pkg_has_file(struct pkg *, const char *);
 /* pkg_dir */
 const char *pkg_dir_get(struct pkg_dir const * const, const pkg_dir_attr);
 #define pkg_dir_path(d) pkg_dir_get(d, PKG_DIR_PATH)
 #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);
 /* pkg_category */
 const char *pkg_category_name(struct pkg_category const * const);

modified libpkg/pkg_attributes.c

@@ -128,33 +128,6 @@ pkg_dir_free(struct pkg_dir *d)

 	free(d);
 }
 const char *
 pkg_dir_get(struct pkg_dir const * const d, const pkg_dir_attr attr)
 {
 	assert(d != NULL);
 	switch (attr) {
 	case PKG_DIR_PATH:
 		return (d->path);
 		break;
 	case PKG_DIR_UNAME:
 		return (d->uname);
 		break;
 	case PKG_DIR_GNAME:
 		return (d->gname);
 		break;
 	default:
 		return(NULL);
 	}
 }
 mode_t
 pkg_dir_mode(struct pkg_dir const * const d)
 {
 	assert(d != NULL);
 	return (d->perm);
 }
 /*
  * User
  */

modified libpkg/pkg_create.c

@@ -153,12 +153,10 @@ pkg_create_from_dir(struct pkg *pkg, const char *root,

 	}
 	while (pkg_dirs(pkg, &dir) == EPKG_OK) {
 		const char *pkg_path = pkg_dir_path(dir);
 		snprintf(fpath, sizeof(fpath), "%s%s%s", root ? root : "",
 		    relocation, pkg_path);
 		    relocation, dir->path);
 		ret = packing_append_file_attr(pkg_archive, fpath, pkg_path,
 		ret = packing_append_file_attr(pkg_archive, fpath, dir->path,
 		    dir->uname, dir->gname, dir->perm);
 		developer = pkg_object_bool(pkg_config_get("DEVELOPER_MODE"));
 		if (developer && ret != EPKG_OK)

modified libpkg/pkg_delete.c

@@ -312,7 +312,7 @@ pkg_delete_dir(struct pkg *pkg, struct pkg_dir *dir)

 	pkg_open_root_fd(pkg);
 	path = pkg_dir_path(dir);
 	path = dir->path;
 	/* remove the first / */
 	path++;

modified libpkg/pkg_manifest.c

@@ -1083,7 +1083,7 @@ pkg_emit_object(struct pkg *pkg, short flags)

 			pkg_debug(4, "Emitting directories");
 			map = NULL;
 			while (pkg_dirs(pkg, &dir) == EPKG_OK) {
 				urlencode(pkg_dir_path(dir), &tmpsbuf);
 				urlencode(dir->path, &tmpsbuf);
 				if (map == NULL)
 					map = ucl_object_typed_new(UCL_OBJECT);
 				ucl_object_insert_key(map,

modified libpkg/pkg_old.c

@@ -152,7 +152,7 @@ pkg_old_emit_content(struct pkg *pkg, char **dest)

 	while (pkg_dirs(pkg, &dir) == EPKG_OK) {
 		sbuf_printf(content,
 		    "@unexec /sbin/rmdir \"%s\" 2>/dev/null\n",
 		    pkg_dir_path(dir));
 		    dir->path);
 	}
 	sbuf_printf(content, "@comment OPTIONS:");

modified libpkg/pkg_printf.c

@@ -990,7 +990,7 @@ format_directory_group(struct sbuf *sbuf, const void *data,

 {
 	const struct pkg_dir	*dir = data;
 	return (string_val(sbuf, pkg_dir_gname(dir), p));
 	return (string_val(sbuf, dir->gname, p));
 }
 /*

@@ -1001,7 +1001,7 @@ format_directory_path(struct sbuf *sbuf, const void *data, struct percent_esc *p

 {
 	const struct pkg_dir	*dir = data;
 	return (string_val(sbuf, pkg_dir_path(dir), p));
 	return (string_val(sbuf, dir->path, p));
 }
 /*

@@ -1013,7 +1013,7 @@ format_directory_perms(struct sbuf *sbuf, const void *data,

 {
 	const struct pkg_dir	*dir = data;
 	return (mode_val(sbuf, pkg_dir_mode(dir), p));
 	return (mode_val(sbuf, dir->perm, p));
 }
 /*

@@ -1025,7 +1025,7 @@ format_directory_user(struct sbuf *sbuf, const void *data,

 {
 	const struct pkg_dir	*dir = data;
 	return (string_val(sbuf, pkg_dir_uname(dir), p));
 	return (string_val(sbuf, dir->uname, p));
 }
 /*

modified libpkg/pkgdb.c

@@ -1703,16 +1703,16 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete, int forced)

 	 */
 	while (pkg_dirs(pkg, &dir) == EPKG_OK) {
 		if (run_prstmt(DIRS1, pkg_dir_path(dir)) != SQLITE_DONE) {
 		if (run_prstmt(DIRS1, dir->path) != SQLITE_DONE) {
 			ERROR_SQLITE(s, SQL(DIRS1));
 			goto cleanup;
 		}
 		if ((ret = run_prstmt(DIRS2, package_id, pkg_dir_path(dir),
 		if ((ret = run_prstmt(DIRS2, package_id, dir->path,
 		    true)) != SQLITE_DONE) {
 			if (ret == SQLITE_CONSTRAINT) {
 				pkg_emit_error("Another package is already "
 				    "providing directory: %s",
 				    pkg_dir_path(dir));
 				    dir->path);
 			} else
 				ERROR_SQLITE(s, SQL(DIRS2));
 			goto cleanup;