Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › ac4b9a7
Cleanup arrays size.
jlaffaye committed 14 years ago
commit ac4b9a71b04d62e7642a268de1ea887a4483ebe1
parent 112c518
14 files changed +60 -58
modified libpkg/pkg.c
@@ -498,7 +498,7 @@ pkg_adduser(struct pkg *pkg, const char *name)


	pkg_user_new(&u);
- 
	strlcpy(u->name, name, MAXLOGNAME);
+ 
	strlcpy(u->name, name, sizeof(u->name));



	return (EPKG_OK);

}
@@ -513,7 +513,7 @@ pkg_addgroup(struct pkg *pkg, const char *name)


	pkg_group_new(&g);
- 
	strlcpy(g->name, name, MAXLOGNAME);
+ 
	strlcpy(g->name, name, sizeof(g->name));



	return (EPKG_OK);

}
@@ -1062,8 +1062,8 @@ pkg_copy_tree(struct pkg *pkg, const char *src, const char *dest)
{

	struct packing *pack;

	struct pkg_file *file = NULL;
- 
	char spath[MAXPATHLEN];
- 
	char dpath[MAXPATHLEN];
+ 
	char spath[MAXPATHLEN + 1];
+ 
	char dpath[MAXPATHLEN + 1];



	if (packing_init(&pack, dest, 0) != EPKG_OK) {

		/* TODO */
@@ -1071,8 +1071,8 @@ pkg_copy_tree(struct pkg *pkg, const char *src, const char *dest)
	}



	while (pkg_files(pkg, &file) == EPKG_OK) {
- 
		snprintf(spath, MAXPATHLEN, "%s%s", src, pkg_file_path(file));
- 
		snprintf(dpath, MAXPATHLEN, "%s%s", dest, pkg_file_path(file));
+ 
		snprintf(spath, sizeof(spath), "%s%s", src, pkg_file_path(file));
+ 
		snprintf(dpath, sizeof(dpath), "%s%s", dest, pkg_file_path(file));

		printf("%s -> %s\n", spath, dpath);

		packing_append_file(pack, spath, dpath);

	}
modified libpkg/pkg_add.c
@@ -37,7 +37,7 @@ do_extract(struct archive *a, struct archive_entry *ae)
{

	int retcode = EPKG_OK;

	int ret = 0;
- 
	char path[MAXPATHLEN];
+ 
	char path[MAXPATHLEN + 1];

	struct stat st;



	do {
@@ -94,7 +94,7 @@ pkg_add2(struct pkgdb *db, const char *path, int upgrade, int automatic)
	struct pkg_dep *dep = NULL;

	struct utsname u;

	bool extract = true;
- 
	char dpath[MAXPATHLEN];
+ 
	char dpath[MAXPATHLEN + 1];

	const char *basedir;

	const char *ext;

	int retcode = EPKG_OK;
modified libpkg/pkg_create.c
@@ -20,7 +20,7 @@ static int pkg_create_from_dir(struct pkg *, const char *, struct packing *);
static int

pkg_create_from_dir(struct pkg *pkg, const char *root, struct packing *pkg_archive)

{
- 
	char fpath[MAXPATHLEN];
+ 
	char fpath[MAXPATHLEN + 1];

	struct pkg_file *file = NULL;

	struct pkg_dir *dir = NULL;

	char *m;
@@ -33,9 +33,9 @@ pkg_create_from_dir(struct pkg *pkg, const char *root, struct packing *pkg_archi
	 */

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

		if (root != NULL)
- 
			snprintf(fpath, MAXPATHLEN, "%s%s", root, pkg_file_path(file));
+ 
			snprintf(fpath, sizeof(fpath), "%s%s", root, pkg_file_path(file));

		else
- 
			strlcpy(fpath, pkg_file_path(file), MAXPATHLEN);
+ 
			strlcpy(fpath, pkg_file_path(file), sizeof(fpath));



		if ((pkg_file_sha256(file) == NULL || pkg_file_sha256(file)[0] == '\0') && lstat(fpath, &st) == 0 && !S_ISLNK(st.st_mode)) {

			sha256_file(fpath, sha256);
@@ -54,18 +54,18 @@ pkg_create_from_dir(struct pkg *pkg, const char *root, struct packing *pkg_archi


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

		if (root != NULL)
- 
			snprintf(fpath, MAXPATHLEN, "%s%s", root, pkg_file_path(file));
+ 
			snprintf(fpath, sizeof(fpath), "%s%s", root, pkg_file_path(file));

		else
- 
			strlcpy(fpath, pkg_file_path(file), MAXPATHLEN);
+ 
			strlcpy(fpath, pkg_file_path(file), sizeof(fpath));



		packing_append_file_attr(pkg_archive, fpath, pkg_file_path(file), file->uname, file->gname, file->perm);

	}



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

		if (root != NULL)
- 
			snprintf(fpath, MAXPATHLEN, "%s%s", root, pkg_dir_path(dir));
+ 
			snprintf(fpath, sizeof(fpath), "%s%s", root, pkg_dir_path(dir));

		else
- 
			strlcpy(fpath, pkg_dir_path(dir), MAXPATHLEN);
+ 
			strlcpy(fpath, pkg_dir_path(dir), sizeof(fpath));



		packing_append_file_attr(pkg_archive, fpath, pkg_dir_path(dir), dir->uname, dir->gname, dir->perm);

	}
modified libpkg/pkg_jobs.c
@@ -76,7 +76,7 @@ pkg_jobs_install(struct pkg_jobs *j)
{

	struct pkg *p = NULL;

	const char *cachedir;
- 
	char path[MAXPATHLEN];
+ 
	char path[MAXPATHLEN + 1];



	/* Fetch */

	while (pkg_jobs(j, &p) == EPKG_OK) {
@@ -106,7 +106,7 @@ pkg_jobs_upgrade(struct pkg_jobs *j)
	struct pkg *oldpkg = NULL;

	struct pkgdb_it *it;

	const char *cachedir;
- 
	char path[MAXPATHLEN];
+ 
	char path[MAXPATHLEN + 1];

	int retcode;



	/* Fetch */
modified libpkg/pkg_manifest.c
@@ -100,8 +100,8 @@ parse_mapping(struct pkg *pkg, yaml_node_pair_t *pair, yaml_document_t *document
	char origin[BUFSIZ];

	char version[BUFSIZ];

	char sum[65];
- 
	char uname[MAXLOGNAME];
- 
	char gname[MAXLOGNAME];
+ 
	char uname[MAXLOGNAME + 1];
+ 
	char gname[MAXLOGNAME + 1];

	void *set;

	mode_t perm;

	pkg_script_t script_type;
@@ -126,9 +126,9 @@ parse_mapping(struct pkg *pkg, yaml_node_pair_t *pair, yaml_document_t *document
					if (!strcasecmp(subkey->data.scalar.value, "sum") && subval->data.scalar.length == 64)

						strlcpy(sum, subval->data.scalar.value, sizeof(sum));

					else if (!strcasecmp(subkey->data.scalar.value, "uname") && subval->data.scalar.length <= MAXLOGNAME)
- 
						strlcpy(uname, subval->data.scalar.value, MAXLOGNAME);
+ 
						strlcpy(uname, subval->data.scalar.value, sizeof(uname));

					else if (!strcasecmp(subkey->data.scalar.value, "gname") && subval->data.scalar.length <= MAXLOGNAME)
- 
						strlcpy(gname, subval->data.scalar.value, MAXLOGNAME);
+ 
						strlcpy(gname, subval->data.scalar.value, sizeof(gname));

					else if (!strcasecmp(subkey->data.scalar.value, "perm") && subval->data.scalar.length > 0) {

						if ((set = setmode(subval->data.scalar.value)) == NULL)

							EMIT_PKG_ERROR("Not a valide mode: %s", subval->data.scalar.value);
@@ -246,8 +246,8 @@ parse_node(struct pkg *pkg, yaml_node_t *node, yaml_document_t *document, int pk
	yaml_node_pair_t *pair, *p;

	yaml_node_item_t *item;

	yaml_node_t *nd, *pk, *pv, *key, *val;
- 
	char uname[MAXLOGNAME];
- 
	char gname[MAXLOGNAME];
+ 
	char uname[MAXLOGNAME + 1];
+ 
	char gname[MAXLOGNAME + 1];

	void *set;

	mode_t perm;
@@ -277,9 +277,11 @@ parse_node(struct pkg *pkg, yaml_node_t *node, yaml_document_t *document, int pk
								key = yaml_document_get_node(document, pair->key);

								val = yaml_document_get_node(document, pair->value);

								if (!strcasecmp(key->data.scalar.value, "uname") && val->data.scalar.length <= MAXLOGNAME)
- 
									strlcpy(uname, val->data.scalar.value, MAXLOGNAME);
+ 
									strlcpy(uname, val->data.scalar.value,
+ 
											sizeof(uname));

								else if (!strcasecmp(key->data.scalar.value, "gname") && val->data.scalar.length <= MAXLOGNAME)
- 
									strlcpy(gname, val->data.scalar.value, MAXLOGNAME);
+ 
									strlcpy(gname, val->data.scalar.value,
+ 
											sizeof(gname));

								else if (!strcasecmp(key->data.scalar.value, "perm") && val->data.scalar.length > 0) {

									if ((set = setmode(val->data.scalar.value)) == NULL)

										EMIT_PKG_ERROR("Not a valide mode: %s", val->data.scalar.value);
modified libpkg/pkg_ports.c
@@ -19,7 +19,7 @@ ports_parse_plist(struct pkg *pkg, char *plist)
	size_t next;

	size_t len;

	char sha256[65];
- 
	char path[MAXPATHLEN];
+ 
	char path[MAXPATHLEN + 1];

	char *last_plist_file = NULL;

	char *cmd = NULL;

	const char *prefix = NULL;
@@ -146,7 +146,7 @@ ports_parse_plist(struct pkg *pkg, char *plist)
					len--;

				}
- 
				snprintf(path, MAXPATHLEN, "%s%s%s/", prefix, slash, buf);
+ 
				snprintf(path, sizeof(path), "%s%s%s/", prefix, slash, buf);



				if (sbuf_len(unexec_scripts) == 0)

					sbuf_cat(unexec_scripts, "#@unexec\n"); /* to be able to regenerate the @unexec in pkg2legacy */
@@ -172,7 +172,7 @@ ports_parse_plist(struct pkg *pkg, char *plist)
				len--;

			}
- 
			snprintf(path, MAXPATHLEN, "%s%s%s", prefix, slash, buf);
+ 
			snprintf(path, sizeof(path), "%s%s%s", prefix, slash, buf);



			if (lstat(path, &st) == 0) {

				if (S_ISLNK(st.st_mode)) {
modified libpkg/pkg_repo.c
@@ -22,7 +22,7 @@
int

pkg_repo_fetch(struct pkg *pkg)

{
- 
	char dest[MAXPATHLEN];
+ 
	char dest[MAXPATHLEN + 1];

	char cksum[65];

	char *path;

	char *url;
@@ -171,7 +171,7 @@ pkg_create_repo(char *path, void (progress)(struct pkg *pkg, void *data), void *
	char cksum[65];



	char *repopath[2];
- 
	char repodb[MAXPATHLEN];
+ 
	char repodb[MAXPATHLEN + 1];



	const char initsql[] = ""

		"CREATE TABLE packages ("
@@ -244,7 +244,7 @@ pkg_create_repo(char *path, void (progress)(struct pkg *pkg, void *data), void *
	repopath[0] = path;

	repopath[1] = NULL;
- 
	snprintf(repodb, MAXPATHLEN, "%s/repo.sqlite", path);
+ 
	snprintf(repodb, sizeof(repodb), "%s/repo.sqlite", path);



	if (stat(repodb, &st) != -1)

		if (unlink(repodb) != 0) {
@@ -471,8 +471,8 @@ pkg_create_repo(char *path, void (progress)(struct pkg *pkg, void *data), void *
int

pkg_finish_repo(char *path, pem_password_cb *password_cb, char *rsa_key_path)

{
- 
	char repo_path[MAXPATHLEN];
- 
	char repo_archive[MAXPATHLEN];
+ 
	char repo_path[MAXPATHLEN + 1];
+ 
	char repo_archive[MAXPATHLEN + 1];

	struct packing *pack;

	int max_len = 0;

	unsigned char *sigret = NULL;
@@ -480,8 +480,8 @@ pkg_finish_repo(char *path, pem_password_cb *password_cb, char *rsa_key_path)
	RSA *rsa = NULL;

	char sha256[65];
- 
	snprintf(repo_path, MAXPATHLEN, "%s/repo.sqlite", path);
- 
	snprintf(repo_archive, MAXPATHLEN, "%s/repo", path);
+ 
	snprintf(repo_path, sizeof(repo_path), "%s/repo.sqlite", path);
+ 
	snprintf(repo_archive, sizeof(repo_archive), "%s/repo", path);



	packing_init(&pack, repo_archive, TXZ);

	if (rsa_key_path != NULL) {
modified libpkg/pkg_util.c
@@ -143,7 +143,7 @@ int
format_exec_cmd(char **dest, const char *in, const char *prefix, const char *plist_file)

{

	struct sbuf *buf = sbuf_new_auto();
- 
	char path[MAXPATHLEN];
+ 
	char path[MAXPATHLEN + 1];

	char *cp;



	while (in[0] != '\0') {
@@ -158,18 +158,18 @@ format_exec_cmd(char **dest, const char *in, const char *prefix, const char *pli
					break;

				case 'f':

					if (prefix[strlen(prefix) - 1] == '/')
- 
						snprintf(path, MAXPATHLEN, "%s%s", prefix, plist_file);
+ 
						snprintf(path, sizeof(path), "%s%s", prefix, plist_file);

					else
- 
						snprintf(path, MAXPATHLEN, "%s/%s", prefix, plist_file);
+ 
						snprintf(path, sizeof(path), "%s/%s", prefix, plist_file);

					cp = strrchr(path, '/');

					cp ++;

					sbuf_cat(buf, cp);

					break;

				case 'B':

					if (prefix[strlen(prefix) - 1] == '/')
- 
						snprintf(path, MAXPATHLEN, "%s%s", prefix, plist_file);
+ 
						snprintf(path, sizeof(path), "%s%s", prefix, plist_file);

					else
- 
						snprintf(path, MAXPATHLEN, "%s/%s", prefix, plist_file);
+ 
						snprintf(path, sizeof(path), "%s/%s", prefix, plist_file);

					cp = strrchr(path, '/');

					cp[0] = '\0';

					sbuf_cat(buf, path);
@@ -276,7 +276,7 @@ sha256_file(const char *path, char out[65])
}



int
- 
is_conf_file(const char *path, char newpath[MAXPATHLEN])
+ 
is_conf_file(const char *path, char newpath[MAXPATHLEN + 1])

{

	size_t n;

	char *p = NULL;
@@ -289,7 +289,7 @@ is_conf_file(const char *path, char newpath[MAXPATHLEN])
	p = strrchr(path, '.');



	if (p != NULL && !strcmp(p, ".pkgconf")) {
- 
		strlcpy(newpath, path, MAXPATHLEN);
+ 
		strlcpy(newpath, path, sizeof(newpath));

		newpath[n - 8] = '\0';

		return (1);

	}
modified libpkg/pkgdb.c
@@ -417,8 +417,8 @@ int
pkgdb_open(struct pkgdb **db, pkgdb_t type)

{

	int retcode;
- 
	char localpath[MAXPATHLEN];
- 
	char remotepath[MAXPATHLEN];
+ 
	char localpath[MAXPATHLEN + 1];
+ 
	char remotepath[MAXPATHLEN + 1];

	char sql[BUFSIZ];

	const char *dbdir;
modified pkg/add.c
@@ -36,7 +36,7 @@ int
exec_add(int argc, char **argv)

{

	struct pkgdb *db = NULL;
- 
	char path[MAXPATHLEN];
+ 
	char path[MAXPATHLEN + 1];

	char *file;

	int retcode = EPKG_OK;

	int i;
modified pkg/register.c
@@ -62,7 +62,7 @@ exec_register(int argc, char **argv)
	char *mdir = NULL;

	char *www = NULL;

	char *input_path = NULL;
- 
	char fpath[MAXPATHLEN];
+ 
	char fpath[MAXPATHLEN + 1];



	const char *desc = NULL;

	size_t size;
@@ -123,24 +123,24 @@ exec_register(int argc, char **argv)
	if (mdir == NULL)

		errx(EX_USAGE, "missing -m flag");
- 
	snprintf(fpath, MAXPATHLEN, "%s/+MANIFEST", mdir);
+ 
	snprintf(fpath, sizeof(fpath), "%s/+MANIFEST", mdir);

	if ((ret = pkg_load_manifest_file(pkg, fpath)) != EPKG_OK) {

		return (EX_IOERR);

	}
- 
	snprintf(fpath, MAXPATHLEN, "%s/+DESC", mdir);
+ 
	snprintf(fpath, sizeof(fpath), "%s/+DESC", mdir);

	pkg_set_from_file(pkg, PKG_DESC, fpath);
- 
	snprintf(fpath, MAXPATHLEN, "%s/+DISPLAY", mdir);
+ 
	snprintf(fpath, sizeof(fpath), "%s/+DISPLAY", mdir);

	if (access(fpath, F_OK) == 0)

		 pkg_set_from_file(pkg, PKG_MESSAGE, fpath);
- 
	snprintf(fpath, MAXPATHLEN, "%s/+MTREE_DIRS", mdir);
+ 
	snprintf(fpath, sizeof(fpath), "%s/+MTREE_DIRS", mdir);

	if (access(fpath, F_OK) == 0)

		pkg_set_from_file(pkg, PKG_MTREE, fpath);



	for (i = 0; scripts[i] != NULL; i++) {
- 
		snprintf(fpath, MAXPATHLEN, "%s/%s", mdir, scripts[i]);
+ 
		snprintf(fpath, sizeof(fpath), "%s/%s", mdir, scripts[i]);

		if (access(fpath, F_OK) == 0)

			pkg_addscript_file(pkg, fpath);

	}
modified pkg/update.c
@@ -31,7 +31,7 @@ usage_update(void)
int

exec_update(int argc, char **argv)

{
- 
	char url[MAXPATHLEN];
+ 
	char url[MAXPATHLEN + 1];

	const char *packagesite = NULL;

	char *tmp = NULL;

	int retcode = EPKG_OK;
@@ -57,9 +57,9 @@ exec_update(int argc, char **argv)
	}



	if (packagesite[strlen(packagesite) - 1] == '/')
- 
		snprintf(url, MAXPATHLEN, "%srepo.txz", packagesite);
+ 
		snprintf(url, sizeof(url), "%srepo.txz", packagesite);

	else
- 
		snprintf(url, MAXPATHLEN, "%s/repo.txz", packagesite);
+ 
		snprintf(url, sizeof(url), "%s/repo.txz", packagesite);



	tmp = mktemp(strdup("/tmp/repo.txz.XXXXXX"));
modified pkg/version.c
@@ -120,7 +120,7 @@ exec_version(int argc, char **argv)
	unsigned int opt = 0;

	int ch;

	FILE *indexfile;
- 
	char indexpath[MAXPATHLEN];
+ 
	char indexpath[MAXPATHLEN + 1];

	SLIST_HEAD(, index_entry) indexhead;

	struct utsname u;

	int rel_major_ver;
@@ -215,7 +215,7 @@ exec_version(int argc, char **argv)
		SLIST_INIT(&indexhead);

		uname(&u);

		rel_major_ver = (int) strtol(u.release, NULL, 10);
- 
		snprintf(indexpath, MAXPATHLEN, "%s/INDEX-%d", pkg_config("PORTSDIR"), rel_major_ver);
+ 
		snprintf(indexpath, sizeof(indexpath), "%s/INDEX-%d", pkg_config("PORTSDIR"), rel_major_ver);

		indexfile = fopen(indexpath, "r");

		if (!indexfile)

			err(EX_SOFTWARE, "Unable to open %s", indexpath);
modified pkg/which.c
@@ -24,8 +24,8 @@ exec_which(int argc, char **argv)
	struct pkgdb *db;

	struct pkgdb_it *it;

	struct pkg *pkg = NULL;
- 
	char pathabs[MAXPATHLEN];
- 
	char pathabsdir[MAXPATHLEN];
+ 
	char pathabs[MAXPATHLEN + 1];
+ 
	char pathabsdir[MAXPATHLEN + 1];

	int ret = EPKG_OK, retcode = EPKG_OK;



	if (argc != 2) {