a32dfcb Ensure incorrect option values are handled appropriately — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Ensure incorrect option values are handled appropriately

Matthew Seaman committed 13 years ago

commit a32dfcb17f910d6d997ff5775fdb2a70dec91f8a
parent e98ac41

4 files changed +11 -1

modified pkg/backup.c

@@ -45,7 +45,8 @@ exec_backup(int argc, char **argv)

 	struct pkgdb  *db = NULL;
 	char *dest = NULL;
 	if (argc < 2 || argc > 3 || argv[1][0] != '-') {
 	if (argc < 2 || argc > 3 || argv[1][0] != '-' ||
 	    (argv[1][1] != 'd' && argv[1][1] != 'r')) {
 		usage_backup();
 		return (EX_USAGE);
 	}

modified pkg/create.c

@@ -217,6 +217,9 @@ exec_create(int argc, char **argv)

 		case 'O':
 			old = true;
 			break;
 		default:
 			usage_create();
 			return (EX_USAGE);
 		}
 	}
 	argc -= optind;

modified pkg/version.c

@@ -235,6 +235,9 @@ exec_version(int argc, char **argv)

 		case 'T':
 			opt |= VERSION_TESTPATTERN;
 			break;
 		default:
 			usage_version();
 			return (EX_USAGE);
 		}
 	}
 	argc -= optind;

modified pkg/which.c

@@ -67,6 +67,9 @@ exec_which(int argc, char **argv)

 		case 'o':
 			orig = true;
 			break;
 		default:
 			usage_which();
 			return (EX_USAGE);
 		}
 	}