e140542 Add -O and -q to info to able to be compatible with ports infrastructure Now installing software from ports does not need FORCE_REGISTER anymore — HardenedBSD-pkg

HardenedBSD Package Manager

Add -O and -q to info to able to be compatible with ports infrastructure Now installing software from ports does not need FORCE_REGISTER anymore

Baptiste Daroussin committed 15 years ago

commit e14054274d061689dac1e1f0ca324a19e51b360f
parent c4434194a32b73c79368e23b6a7a1515d751d458

2 files changed +16 -2

modified pkg/info.c

@@ -65,7 +65,7 @@ query_pkg(struct pkg *pkg, unsigned char opt) {

 void
 usage_info(void)
 {
 	fprintf(stderr, "info [-egxXdrls] <pkg-name>\n"
 	fprintf(stderr, "info [-egxXdrlsqO] <pkg-name>\n"
 			"info\n");
 }

@@ -91,7 +91,7 @@ exec_info(int argc, char **argv)

 	int retcode = 0;
 	/* TODO: exclusive opts ? */
 	while ((ch = getopt(argc, argv, "egxXdrls")) != -1) {
 	while ((ch = getopt(argc, argv, "egxXdrlsqO")) != -1) {
 		switch (ch) {
 			case 'e':
 				opt |= INFO_EXISTS;

@@ -121,6 +121,12 @@ exec_info(int argc, char **argv)

 				opt |= INFO_SIZE;
 				query_flags = PKG_FILES;
 				break;
 			case 'q':
 				opt |= INFO_QUIET;
 				break;
 			case 'O':
 				opt |= INFO_ORIGIN;
 				break;
 		}
 	}
 	argc -= optind;

@@ -179,6 +185,12 @@ exec_info(int argc, char **argv)

 		} else if (opt & INFO_SIZE) {
 			humanize_number(size, sizeof(size), pkg_size(pkg), "B", HN_AUTOSCALE, 0);
 			printf("%s-%s size is %s\n", pkg_name(pkg), pkg_version(pkg), size);
 		} else if (opt & INFO_ORIGIN) {
 			if (opt & INFO_QUIET)
 				printf("%s\n", pkg_origin(pkg));
 			else
 				printf("%s-%s's origin: %s\n", pkg_name(pkg), pkg_version(pkg), pkg_origin(pkg));
 		} else {
 			printf("%s-%s: %s\n", pkg_name(pkg), pkg_version(pkg), pkg_comment(pkg));
 		}

modified pkg/info.h

@@ -6,6 +6,8 @@

 #define INFO_EXISTS (1<<2)
 #define INFO_LIST_FILES (1<<3)
 #define INFO_SIZE (1<<4)
 #define INFO_QUIET (1<<5)
 #define INFO_ORIGIN (1<<6)
 int exec_info(int, char **);
 void usage_info(void);