68736e5 Everywhere there is an option to match a package name (substring, regexp), add a -C option to force the match to be case sensitive. — HardenedBSD-pkg

modified src/annotate.c

@@ -1,5 +1,5 @@

 /*-
  * Copyright (c) 2013 Matthew Seaman <matthew@FreeBSD.org>
  * Copyright (c) 2013-2014 Matthew Seaman <matthew@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

@@ -54,9 +54,9 @@ void

 usage_annotate(void)
 {
 	fprintf(stderr,
             "Usage: pkg annotate [-giqxy] [-A|M] <pkg-name> <tag> [<value>]\n");
             "Usage: pkg annotate [-Cgiqxy] [-A|M] <pkg-name> <tag> [<value>]\n");
 	fprintf(stderr,
             "       pkg annotate [-giqxy] -D <pkg-name> <tag>\n");
             "       pkg annotate [-Cgiqxy] -D <pkg-name> <tag>\n");
 	fprintf(stderr,
             "       pkg annotate [-qy] -a [-A|M] <tag> [<value>]\n");
 	fprintf(stderr,

@@ -204,7 +204,7 @@ exec_annotate(int argc, char **argv)

 	yes = pkg_object_bool(pkg_config_get("ASSUME_ALWAYS_YES"));
 	while ((ch = getopt(argc, argv, "aADgiMqxy")) != -1) {
 	while ((ch = getopt(argc, argv, "aACDgiMqxy")) != -1) {
 		switch (ch) {
 		case 'a':
 			match = MATCH_ALL;

@@ -212,6 +212,9 @@ exec_annotate(int argc, char **argv)

 		case 'A':
 			action = ADD;
 			break;
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'D':
 			action = DELETE;
 			break;

modified src/check.c

@@ -1,6 +1,7 @@

 /*-
  * Copyright (c) 2011-2012 Baptiste Daroussin <bapt@FreeBSD.org>
  * Copyright (c) 2011-2012 Marin Atanasov Nikolov <dnaeon@gmail.com>
  * Copyright (c) 2014 Matthew Seaman <matthew@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

@@ -241,7 +242,7 @@ check_summary(struct pkgdb *db, struct deps_head *dh)

 void
 usage_check(void)
 {
 	fprintf(stderr, "Usage: pkg check [-Bdsr] [-vy] [-a | -gix <pattern>]\n\n");
 	fprintf(stderr, "Usage: pkg check [-Bdsr] [-vy] [-a | -Cgix <pattern>]\n\n");
 	fprintf(stderr, "For more information see 'pkg help check'.\n");
 }

@@ -269,7 +270,7 @@ exec_check(int argc, char **argv)

 	struct deps_head dh = STAILQ_HEAD_INITIALIZER(dh);
 	while ((ch = getopt(argc, argv, "yagidnBxsrv")) != -1) {
 	while ((ch = getopt(argc, argv, "aBCdginrsvxy")) != -1) {
 		switch (ch) {
 		case 'a':
 			match = MATCH_ALL;

@@ -278,6 +279,9 @@ exec_check(int argc, char **argv)

 			reanalyse_shlibs = true;
 			flags |= PKG_LOAD_FILES;
 			break;
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'd':
 			dcheck = true;
 			flags |= PKG_LOAD_DEPS;

modified src/delete.c

@@ -2,7 +2,7 @@

  * Copyright (c) 2011-2012 Baptiste Daroussin <bapt@FreeBSD.org>
  * Copyright (c) 2011-2012 Julien Laffaye <jlaffaye@FreeBSD.org>
  * Copyright (c) 2011-2012 Marin Atanasov Nikolov <dnaeon@gmail.com>
  * Copyright (c) 2013 Matthew Seaman <matthew@FreeBSD.org>
  * Copyright (c) 2013-2014 Matthew Seaman <matthew@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

@@ -40,7 +40,7 @@

 void
 usage_delete(void)
 {
 	fprintf(stderr, "Usage: pkg delete [-DfginqRxy] <pkg-name> ...\n");
 	fprintf(stderr, "Usage: pkg delete [-DfnqRy] [-Cgix] <pkg-name> ...\n");
 	fprintf(stderr, "       pkg delete [-Dnqy] -a\n\n");
 	fprintf(stderr, "For more information see 'pkg help delete'.\n");
 }

@@ -63,11 +63,14 @@ exec_delete(int argc, char **argv)

 	yes = pkg_object_bool(pkg_config_get("ASSUME_ALWAYS_YES"));
 	while ((ch = getopt(argc, argv, "aDfginqRxy")) != -1) {
 	while ((ch = getopt(argc, argv, "aCDfginqRxy")) != -1) {
 		switch (ch) {
 		case 'a':
 			match = MATCH_ALL;
 			break;
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'D':
 			f |= PKG_FLAG_NOSCRIPT;
 			break;

modified src/fetch.c

@@ -1,6 +1,6 @@

 /*-
  * Copyright (c) 2011-2012 Marin Atanasov Nikolov <dnaeon@gmail.com>
  * Copyright (c) 2013 Matthew Seaman <matthew@FreeBSD.org>
  * Copyright (c) 2013-2014 Matthew Seaman <matthew@FreeBSD.org>
  * Copyright (c) 2012-2013 Bryan Drewery <bdrewery@FreeBSD.org>
  * All rights reserved.
  *

@@ -43,7 +43,7 @@

 void
 usage_fetch(void)
 {
 	fprintf(stderr, "Usage: pkg fetch [-r reponame] [-dgiqUxy] <pkg-name> <...>\n");
 	fprintf(stderr, "Usage: pkg fetch [-r reponame] [-dqUy] [-Cgix] <pkg-name> <...>\n");
 	fprintf(stderr, "       pkg fetch [-r reponame] [-dqUy] -a\n");
 	fprintf(stderr, "       pkg fetch [-r reponame] [-dqUy] -u\n\n");
 	fprintf(stderr, "For more information see 'pkg help fetch'.\n");

@@ -67,11 +67,14 @@ exec_fetch(int argc, char **argv)

 	auto_update = pkg_object_bool(pkg_config_get("REPO_AUTOUPDATE"));
 	yes = pkg_object_bool(pkg_config_get("ASSUME_ALWAYS_YES"));
 	while ((ch = getopt(argc, argv, "adgiqr:Uuxy")) != -1) {
 	while ((ch = getopt(argc, argv, "aCdgiqr:Uuxy")) != -1) {
 		switch (ch) {
 		case 'a':
 			match = MATCH_ALL;
 			break;
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'd':
 			f |= PKG_FLAG_WITH_DEPS | PKG_FLAG_RECURSIVE;
 			break;

modified src/info.c

@@ -61,7 +61,7 @@ usage_info(void)

 {
 	fprintf(stderr, "Usage: pkg info <pkg-name>\n");
 	fprintf(stderr, "       pkg info -a\n");
 	fprintf(stderr, "       pkg info [-AbBDdefgiIklOqRrsx] <pkg-name>\n");
 	fprintf(stderr, "       pkg info [-AbBDdefIklOqRrs] [-Cgix] <pkg-name>\n");
 	fprintf(stderr, "       pkg info [-AbBDdfIlqRrs] -F <pkg-file>\n\n");
 	fprintf(stderr, "For more information see 'pkg help info'.\n");
 }

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

 #endif
 	/* TODO: exclusive opts ? */
 	while ((ch = getopt(argc, argv, "aADegixEIdrklbBsqopOfF:R")) != -1) {
 	while ((ch = getopt(argc, argv, "aACDegixEIdrklbBsqopOfF:R")) != -1) {
 		switch (ch) {
 		case 'a':
 			match = MATCH_ALL;

@@ -108,6 +108,9 @@ exec_info(int argc, char **argv)

 		case 'A':
 			opt |= INFO_ANNOTATIONS;
 			break;
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'O':
 			origin_search = true;  /* only for ports compat */
 			break;

modified src/install.c

@@ -2,7 +2,7 @@

  * Copyright (c) 2011-2012 Baptiste Daroussin <bapt@FreeBSD.org>
  * Copyright (c) 2011-2012 Julien Laffaye <jlaffaye@FreeBSD.org>
  * Copyright (c) 2011-2012 Marin Atanasov Nikolov <dnaeon@gmail.com>
  * Copyright (c) 2013 Matthew Seaman <matthew@FreeBSD.org>
  * Copyright (c) 2013-2014 Matthew Seaman <matthew@FreeBSD.org>
  * Copyright (c) 2012-2013 Bryan Drewery <bdrewery@FreeBSD.org>
  * All rights reserved.
  *

@@ -46,7 +46,7 @@ void

 usage_install(void)
 {
 	fprintf(stderr,
 	    "Usage: pkg install [-AfgIinFMqRUxy] [-r reponame] <pkg-name> ...\n\n");
 	    "Usage: pkg install [-AfInFMqRUy] [-r reponame] [-Cgix] <pkg-name> ...\n\n");
 	fprintf(stderr, "For more information see 'pkg help install'.\n");
 }

@@ -81,11 +81,14 @@ exec_install(int argc, char **argv)

 		quiet = true;
 	}
 	while ((ch = getopt(argc, argv, "AfgIiFMnqRr:Uxyl")) != -1) {
 	while ((ch = getopt(argc, argv, "ACfgIiFMnqRr:Uxyl")) != -1) {
 		switch (ch) {
 		case 'A':
 			f |= PKG_FLAG_AUTOMATIC;
 			break;
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'f':
 			f |= PKG_FLAG_FORCE;
 			break;

modified src/lock.c

@@ -1,5 +1,5 @@

 /*-
  * Copyright (c) 2012 Matthew Seaman <matthew@FreeBSD.org>
  * Copyright (c) 2012-2014 Matthew Seaman <matthew@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

@@ -47,9 +47,9 @@ static bool yes = false; /* Assume yes answer to questions */

 void
 usage_lock(void)
 {
 	fprintf(stderr, "Usage: pkg lock [-giqxy] <pkg-name>\n");
 	fprintf(stderr, "Usage: pkg lock [-qy] [-Cgix] <pkg-name>\n");
 	fprintf(stderr, "       pkg lock [-qy] -a\n");
 	fprintf(stderr, "       pkg unlock [-giqxy] <pkg-name>\n");
 	fprintf(stderr, "       pkg unlock [-qy] [-Cgix] <pkg-name>\n");
 	fprintf(stderr, "       pkg unlock [-qy] -a\n");
 	fprintf(stderr, "For more information see 'pkg help lock'.\n");
 }

@@ -120,11 +120,14 @@ exec_lock_unlock(int argc, char **argv, enum action action)

 	yes = pkg_object_bool(pkg_config_get("ASSUME_ALWAYS_YES"));
 	while ((ch = getopt(argc, argv, "agiqxy")) != -1) {
 	while ((ch = getopt(argc, argv, "aCgiqxy")) != -1) {
 		switch (ch) {
 		case 'a':
 			match = MATCH_ALL;
 			break;
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'g':
 			match = MATCH_GLOB;
 			break;

modified src/query.c

@@ -2,7 +2,7 @@

  * Copyright (c) 2011-2012 Baptiste Daroussin <bapt@FreeBSD.org>
  * Copyright (c) 2011-2012 Marin Atanasov Nikolov <dnaeon@gmail.com>
  * Copyright (c) 2012 Bryan Drewery <bryan@shatow.net>
  * Copyright (c) 2013 Matthew Seaman <matthew@FreeBSD.org>
  * Copyright (c) 2013-2014 Matthew Seaman <matthew@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

@@ -826,7 +826,7 @@ usage_query(void)

 	fprintf(stderr, "       pkg query [-a] <query-format>\n");
 	fprintf(stderr, "       pkg query -F <pkg-name> <query-format>\n");
 	fprintf(stderr, "       pkg query -e <evaluation> <query-format>\n");
 	fprintf(stderr, "       pkg query [-gix] <query-format> <pattern> <...>\n\n");
 	fprintf(stderr, "       pkg query [-Cgix] <query-format> <pattern> <...>\n\n");
 	fprintf(stderr, "For more information see 'pkg help query.'\n");
 }

@@ -849,11 +849,14 @@ exec_query(int argc, char **argv)

 	struct sbuf *sqlcond = NULL;
 	const unsigned int q_flags_len = (sizeof(accepted_query_flags)/sizeof(accepted_query_flags[0]));
 	while ((ch = getopt(argc, argv, "agixF:e:")) != -1) {
 	while ((ch = getopt(argc, argv, "aCgixF:e:")) != -1) {
 		switch (ch) {
 		case 'a':
 			match = MATCH_ALL;
 			break;
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'g':
 			match = MATCH_GLOB;
 			break;

modified src/rquery.c

@@ -2,7 +2,7 @@

  * Copyright (c) 2011-2012 Baptiste Daroussin <bapt@FreeBSD.org>
  * Copyright (c) 2011-2012 Marin Atanasov Nikolov <dnaeon@gmail.com>
  * Copyright (c) 2012-2013 Bryan Drewery <bdrewery@FreeBSD.org>
  * Copyright (c) 2013 Matthew Seaman <matthew@FreeBSD.org>
  * Copyright (c) 2013-2014 Matthew Seaman <matthew@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

@@ -74,7 +74,7 @@ usage_rquery(void)

 	fprintf(stderr, "Usage: pkg rquery [-r reponame] [-I|<query-format>] <pkg-name>\n");
 	fprintf(stderr, "       pkg rquery [-a] [-r reponame] [-I|<query-format>]\n");
 	fprintf(stderr, "       pkg rquery -e <evaluation> [-r reponame] <query-format>\n");
 	fprintf(stderr, "       pkg rquery [-gix] [-r reponame] [-I|<query-format>] <pattern> <...>\n\n");
 	fprintf(stderr, "       pkg rquery [-Cgix] [-r reponame] [-I|<query-format>] <pattern> <...>\n\n");
 	fprintf(stderr, "For more information see 'pkg help rquery.'\n");
 }

@@ -120,11 +120,14 @@ exec_rquery(int argc, char **argv)

 	auto_update = pkg_object_bool(pkg_config_get("REPO_AUTOUPDATE"));
 	while ((ch = getopt(argc, argv, "agiIxe:r:U")) != -1) {
 	while ((ch = getopt(argc, argv, "aCgiIxe:r:U")) != -1) {
 		switch (ch) {
 		case 'a':
 			match = MATCH_ALL;
 			break;
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'g':
 			match = MATCH_GLOB;
 			break;

modified src/search.c

@@ -3,6 +3,7 @@

  * Copyright (c) 2011-2012 Julien Laffaye <jlaffaye@FreeBSD.org>
  * Copyright (c) 2011-2012 Marin Atanasov Nikolov <dnaeon@gmail.com>
  * Copyright (c) 2012-2013 Bryan Drewery <bdrewery@FreeBSD.org>
  * Copyright (c) 2014 Matthew Seaman <matthew@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

@@ -216,10 +217,10 @@ usage_search(void)

 {
 	int i, n;
 	fprintf(stderr, "Usage: pkg search [-egiUx] [-r repo] [-S search] "
 	    "[-L label] [-Q mod]... <pkg-name>\n");
 	fprintf(stderr, "       pkg search [-cDdefgiopqRUx] [-r repo] "
 	    "<pattern>\n\n");
 	fprintf(stderr, "Usage: pkg search [-eU] [-r repo] [-S search] "
 	    "[-L label] [-Q mod]... [-Cgix] <pkg-name>\n");
 	fprintf(stderr, "       pkg search [-cDdefopqRU] [-r repo] "
 	    "[-Cgix] <pattern>\n\n");
 	n = fprintf(stderr, "       Search and Label options:");
 	for (i = 0; search_label[i].option != NULL; i++) {
 		if (n > 72)

@@ -257,8 +258,11 @@ exec_search(int argc, char **argv)

 	auto_update = pkg_object_bool(pkg_config_get("REPO_AUTOUPDATE"));
 	while ((ch = getopt(argc, argv, "cDdefgiL:opqQ:r:RS:sUx")) != -1) {
 	while ((ch = getopt(argc, argv, "CcDdefgiL:opqQ:r:RS:sUx")) != -1) {
 		switch (ch) {
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'c':	/* Same as -S comment */
 			search = search_label_opt("comment");
 			break;

modified src/set.c

@@ -1,5 +1,6 @@

 /*-
  * Copyright (c) 2012 Baptiste Daroussin <bapt@FreeBSD.org>
  * Copyright (c) 2014 Matthew Seaman <matthew@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

@@ -41,7 +42,7 @@

 void
 usage_set(void)
 {
 	fprintf(stderr, "Usage: pkg set [-a] [-A [01]] [-o <oldorigin>:<neworigin>] [-y] [-gix] <pkg-name>\n\n");
 	fprintf(stderr, "Usage: pkg set [-a] [-A [01]] [-o <oldorigin>:<neworigin>] [-y] [-Cgix] <pkg-name>\n\n");
 	fprintf(stderr, "For more information see 'pkg help set'. \n");
 }

@@ -66,7 +67,7 @@ exec_set(int argc, char **argv)

 	yes = pkg_object_bool(pkg_config_get("ASSUME_ALWAYS_YES"));
 	while ((ch = getopt(argc, argv, "A:agio:xy")) != -1) {
 	while ((ch = getopt(argc, argv, "A:aCgio:xy")) != -1) {
 		switch (ch) {
 		case 'A':
 			sets |= AUTOMATIC;

@@ -79,6 +80,9 @@ exec_set(int argc, char **argv)

 		case 'a':
 			match = MATCH_ALL;
 			break;
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'g':
 			match = MATCH_GLOB;
 			break;

modified src/version.c

@@ -58,7 +58,7 @@ struct index_entry {

 void
 usage_version(void)
 {
 	fprintf(stderr, "Usage: pkg version [-IPR] [-hoqvU] [-l limchar] [-L limchar] [-egix pattern]\n");
 	fprintf(stderr, "Usage: pkg version [-IPR] [-hoqvU] [-l limchar] [-L limchar] [-Cegix pattern]\n");
 	fprintf(stderr, "		    [-r reponame] [-O origin] [index]\n");
 	fprintf(stderr, "	pkg version -t <version1> <version2>\n");
 	fprintf(stderr, "	pkg version -T <pkgname> <pattern>\n\n");

@@ -652,67 +652,70 @@ exec_version(int argc, char **argv)

 	auto_update = pkg_object_bool(pkg_config_get("REPO_AUTOUPDATE"));
 	while ((ch = getopt(argc, argv, "hIPRUoqvl:L:ix:g:e:O:r:tT")) != -1) {
 	while ((ch = getopt(argc, argv, "Ce:g:hIiL:l:O:oPqRr:TtUvx:")) != -1) {
 		switch (ch) {
 		case 'C':
 			pkgdb_set_case_sensitivity(true);
 			break;
 		case 'e':
 			match = MATCH_EXACT;
 			pattern = optarg;
 			break;
 		case 'g':
 			match = MATCH_GLOB;
 			pattern = optarg;
 			break;
 		case 'h':
 			usage_version();
 			return (EX_OK);
 		case 'I':
 			opt |= VERSION_SOURCE_INDEX;
 			break;
 		case 'R':
 			opt |= VERSION_SOURCE_REMOTE;
 			break;
 		case 'U':
 			auto_update = false;
 			break;
 		case 'P':
 			opt |= VERSION_SOURCE_PORTS;
 			break;
 		case 'o':
 			opt |= VERSION_ORIGIN;
 			break;
 		case 'q':
 			opt |= VERSION_QUIET;
 		case 'i':
 			pkgdb_set_case_sensitivity(false);
 			break;
 		case 'v':
 			opt |= VERSION_VERBOSE;
 		case 'L':
 			opt |= VERSION_NOSTATUS;
 			limchar = *optarg;
 			break;
 		case 'l':
 			opt |= VERSION_STATUS;
 			limchar = *optarg;
 			break;
 		case 'L':
 			opt |= VERSION_NOSTATUS;
 			limchar = *optarg;
 		case 'O':
 			opt |= VERSION_WITHORIGIN;
 			matchorigin = optarg;
 			break;
 		case 'i':
 			pkgdb_set_case_sensitivity(false);
 		case 'o':
 			opt |= VERSION_ORIGIN;
 			break;
 		case 'x':
 			match = MATCH_REGEX;
 			pattern = optarg;
 		case 'P':
 			opt |= VERSION_SOURCE_PORTS;
 			break;
 		case 'g':
 			match = MATCH_GLOB;
 			pattern = optarg;
 		case 'q':
 			opt |= VERSION_QUIET;
 			break;
 		case 'e':
 			match = MATCH_EXACT;
 			pattern = optarg;
 		case 'R':
 			opt |= VERSION_SOURCE_REMOTE;
 			break;
 		case 'r':
 			reponame = optarg;
 			break;
 		case 'O':
 			opt |= VERSION_WITHORIGIN;
 			matchorigin = optarg;
 		case 'T':
 			opt |= VERSION_TESTPATTERN;
 			break;
 		case 't':
 			opt |= VERSION_TESTVERSION;
 			break;
 		case 'T':
 			opt |= VERSION_TESTPATTERN;
 		case 'U':
 			auto_update = false;
 			break;
 		case 'v':
 			opt |= VERSION_VERBOSE;
 			break;
 		case 'x':
 			match = MATCH_REGEX;
 			pattern = optarg;
 			break;
 		default:
 			usage_version();