X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d9a64523371fa019c4575bb400cbbc3a50ac9903..eb6b6ca394357805f2bdba989abae309f718b4d8:/tools/tests/personas/persona_mgr.c

diff --git a/tools/tests/personas/persona_mgr.c b/tools/tests/personas/persona_mgr.c
index 93692f3d4..23a98f13d 100644
--- a/tools/tests/personas/persona_mgr.c
+++ b/tools/tests/personas/persona_mgr.c
@@ -50,7 +50,8 @@ static struct mgr_config {
 } g;
 
 
-static int persona_op_create(struct kpersona_info *ki)
+static int
+persona_op_create(struct kpersona_info *ki)
 {
 	int ret;
 	uid_t persona_id = 0;
@@ -68,20 +69,23 @@ static int persona_op_create(struct kpersona_info *ki)
 	return ret;
 }
 
-static int persona_op_destroy(struct kpersona_info *ki)
+static int
+persona_op_destroy(struct kpersona_info *ki)
 {
 	int ret;
 
 	info("Destroying Persona %d...", ki->persona_id);
 	ki->persona_info_version = PERSONA_INFO_V1;
 	ret = kpersona_dealloc(ki->persona_id);
-	if (ret < 0)
+	if (ret < 0) {
 		err_print("destroy failed!");
+	}
 
 	return ret;
 }
 
-static int persona_op_lookup(struct kpersona_info *ki, pid_t pid, uid_t uid)
+static int
+persona_op_lookup(struct kpersona_info *ki, pid_t pid, uid_t uid)
 {
 	int ret;
 
@@ -89,29 +93,33 @@ static int persona_op_lookup(struct kpersona_info *ki, pid_t pid, uid_t uid)
 	if (pid > 0) {
 		ki->persona_info_version = PERSONA_INFO_V1;
 		ret = kpersona_pidinfo(pid, ki);
-		if (ret < 0)
+		if (ret < 0) {
 			err_print("pidinfo failed!");
-		else
+		} else {
 			dump_kpersona("Persona-for-pid:", ki);
+		}
 	} else {
 		int np = 0;
 		uid_t personas[128];
 		size_t npersonas = ARRAY_SZ(personas);
 		const char *name = NULL;
-		if (ki->persona_name[0] != 0)
+		if (ki->persona_name[0] != 0) {
 			name = ki->persona_name;
+		}
 
 		np = kpersona_find(name, uid, personas, &npersonas);
-		if (np < 0)
+		if (np < 0) {
 			err("kpersona_find returned %d (errno:%d)", np, errno);
+		}
 		info("Found %zu persona%c", npersonas, npersonas != 1 ? 's' : ' ');
 		np = npersonas;
 		while (np--) {
 			info("\tpersona[%d]=%d...", np, personas[np]);
 			ki->persona_info_version = PERSONA_INFO_V1;
 			ret = kpersona_info(personas[np], ki);
-			if (ret < 0)
+			if (ret < 0) {
 				err("kpersona_info failed (errno:%d) for persona[%d]", errno, personas[np]);
+			}
 			dump_kpersona(NULL, ki);
 		}
 	}
@@ -119,7 +127,8 @@ static int persona_op_lookup(struct kpersona_info *ki, pid_t pid, uid_t uid)
 	return ret;
 }
 
-static int persona_op_support(void)
+static int
+persona_op_support(void)
 {
 	uid_t pna_id = -1;
 	int ret = kpersona_get(&pna_id);
@@ -139,17 +148,20 @@ static int persona_op_support(void)
  *
  * = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
  */
-static void usage_main(const char *progname, const char *msg, int verbose)
+static void
+usage_main(const char *progname, const char *msg, int verbose)
 {
 	const char *nm = basename((char *)progname);
 
-	if (msg)
+	if (msg) {
 		printf("%s\n\n", msg);
+	}
 
 	printf("%s v%d.%d\n", PROG_NAME, PROG_VMAJOR, PROG_VMINOR);
 	printf("usage: %s [op] [-v] [-i id] [-t type] [-p pid] [-u uid] [-g gid] [-l login] [-G {groupspec}] [-m gmuid]\n", nm);
-	if (!verbose)
+	if (!verbose) {
 		exit(1);
+	}
 
 	printf("\t%-15s\tOne of: create | destroy | lookup | support\n", "[op]");
 	printf("\t%-15s\tBe verbose\n", "-v");
@@ -168,7 +180,8 @@ static void usage_main(const char *progname, const char *msg, int verbose)
 	exit(1);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	char ch;
 	int ret;
@@ -184,27 +197,31 @@ int main(int argc, char **argv)
 	 */
 	g.verbose = 0;
 
-	if (geteuid() != 0)
+	if (geteuid() != 0) {
 		err("%s must be run as root", argv[0] ? basename(argv[0]) : PROG_NAME);
+	}
 
-	if (argc < 2)
+	if (argc < 2) {
 		usage_main(argv[0], "Not enough arguments", 0);
+	}
 
 	op_str = argv[1];
 
-	if (strcmp(op_str, "create") == 0)
+	if (strcmp(op_str, "create") == 0) {
 		persona_op = PERSONA_OP_CREATE;
-	else if (strcmp(op_str, "destroy") == 0)
+	} else if (strcmp(op_str, "destroy") == 0) {
 		persona_op = PERSONA_OP_DESTROY;
-	else if (strcmp(op_str, "lookup") == 0)
+	} else if (strcmp(op_str, "lookup") == 0) {
 		persona_op = PERSONA_OP_LOOKUP;
-	else if (strcmp(op_str, "support") == 0)
+	} else if (strcmp(op_str, "support") == 0) {
 		persona_op = PERSONA_OP_SUPPORT;
-	else if (strcmp(op_str, "help") == 0 || strcmp(op_str, "-h") == 0)
+	} else if (strcmp(op_str, "help") == 0 || strcmp(op_str, "-h") == 0) {
 		usage_main(argv[0], NULL, 1);
+	}
 
-	if (persona_op <= 0 || persona_op > PERSONA_OP_MAX)
+	if (persona_op <= 0 || persona_op > PERSONA_OP_MAX) {
 		usage_main(argv[0], "Invalid [op]", 0);
+	}
 
 	memset(&kinfo, 0, sizeof(kinfo));
 	kinfo.persona_gmuid = KAUTH_UID_NONE;
@@ -241,8 +258,9 @@ int main(int argc, char **argv)
 			break;
 		case 'p':
 			ret = atoi(optarg);
-			if (ret <= 0)
+			if (ret <= 0) {
 				err("Invalid PID: %s", optarg);
+			}
 			pid = (pid_t)ret;
 			break;
 		case 'u':
@@ -255,21 +273,24 @@ int main(int argc, char **argv)
 			break;
 		case 'g':
 			kinfo.persona_gid = (gid_t)atoi(optarg);
-			if (kinfo.persona_gid <= 500)
+			if (kinfo.persona_gid <= 500) {
 				err("Invalid GID: %d", kinfo.persona_gid);
+			}
 			break;
 		case 'l':
 			strncpy(kinfo.persona_name, optarg, MAXLOGNAME);
 			break;
 		case 'G':
 			ret = parse_groupspec(&kinfo, optarg);
-			if (ret < 0)
+			if (ret < 0) {
 				err("Invalid groupspec: \"%s\"", optarg);
+			}
 			break;
 		case 'm':
 			ret = atoi(optarg);
-			if (ret < 0)
+			if (ret < 0) {
 				err("Invalid group membership ID: %s", optarg);
+			}
 			kinfo.persona_gmuid = (uid_t)ret;
 			break;
 		case 'v':
@@ -295,14 +316,16 @@ int main(int argc, char **argv)
 		 * least one group: make it equal to either the GID or UID
 		 */
 		kinfo.persona_ngroups = 1;
-		if (kinfo.persona_gid)
+		if (kinfo.persona_gid) {
 			kinfo.persona_groups[0] = kinfo.persona_gid;
-		else
+		} else {
 			kinfo.persona_groups[0] = kinfo.persona_id;
+		}
 	}
 
-	if (g.verbose)
+	if (g.verbose) {
 		dump_kpersona("Input persona:", &kinfo);
+	}
 
 	switch (persona_op) {
 	case PERSONA_OP_CREATE: