70d9f6c Print in pkg -vv the list of repositories and their status — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Print in pkg -vv the list of repositories and their status

Baptiste Daroussin committed 13 years ago

commit 70d9f6ca207d303232b297e90ea3b7ab68a2b6bb
parent 4bb1df2

2 files changed +17 -3

modified libpkg/pkg_config.c

@@ -740,6 +740,7 @@ add_repo(yaml_document_t *doc, yaml_node_t *repo, yaml_node_t *node)

 	    enable[0] == '0')) {
 		r->enable = false;
 	}
 	HASH_ADD_KEYPTR(hh, repos, r->name, strlen(r->name), r);
 }
 static void

@@ -784,7 +785,7 @@ load_repo_file(const char *repofile)

 	fp = fopen(repofile, "r");
 	if (fp == NULL) {
 		pkg_emit_errno("%s", repofile);
 		pkg_emit_errno("fopen", repofile);
 		return;
 	}

@@ -809,6 +810,7 @@ load_repo_files(const char *repodir)

 	DIR *d;
 	char *p;
 	size_t n;
 	char path[MAXPATHLEN];
 	if ((d = opendir(repodir)) == NULL)
 		return;

@@ -817,8 +819,10 @@ load_repo_files(const char *repodir)

 		if ((n = strlen(ent->d_name)) <= 5)
 			continue;
 		p = &ent->d_name[n - 5];
 		if (strcmp(p, ".conf") == 0)
 			load_repo_file(ent->d_name);
 		if (strcmp(p, ".conf") == 0) {
 			snprintf(path, MAXPATHLEN, "%s/%s", repodir, ent->d_name);
 			load_repo_file(path);
 		}
 	}
 	closedir(d);
 }

modified pkg/main.c

@@ -259,6 +259,7 @@ main(int argc, char **argv)

 	struct plugcmd *c;
 	struct pkg_plugin *p = NULL;
 	struct pkg_config *conf = NULL;
 	struct pkg_repo *repo = NULL;
 	const char *configname = NULL;
 	const char *conffile = NULL;
 	int64_t integer = 0;

@@ -469,6 +470,15 @@ main(int argc, char **argv)

 				}
 			}
 		}
 		printf("\nRepositories:\n");
 		while (pkg_repos(&repo) == EPKG_OK) {
 			printf("  %s:\n    url: %s\n    key: %s\n    enabled: %s\n",
 			    pkg_repo_name(repo), pkg_repo_url(repo),
 			    pkg_repo_key(repo) == NULL ? "" : pkg_repo_key(repo),
 			    pkg_repo_enabled(repo) ? "yes" : "no");
 		}
 		pkg_shutdown();
 		pkg_plugins_shutdown();
 		exit(EX_OK);