From owner-svn-src-all@freebsd.org Mon Dec 21 07:04:02 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1BB7A4EE62; Mon, 21 Dec 2015 07:04:02 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6269F1998; Mon, 21 Dec 2015 07:04:02 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBL741DD047818; Mon, 21 Dec 2015 07:04:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBL741w4047817; Mon, 21 Dec 2015 07:04:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512210704.tBL741w4047817@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 21 Dec 2015 07:04:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292530 - head/tools/regression/mac/mac_bsdextended X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2015 07:04:02 -0000 Author: ngie Date: Mon Dec 21 07:04:01 2015 New Revision: 292530 URL: https://svnweb.freebsd.org/changeset/base/292530 Log: - Use 1 for an exit code instead of -1 with err, errx, and exit - Add unistd.h for getuid(3) - Sort #includes MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Modified: head/tools/regression/mac/mac_bsdextended/test_ugidfw.c Modified: head/tools/regression/mac/mac_bsdextended/test_ugidfw.c ============================================================================== --- head/tools/regression/mac/mac_bsdextended/test_ugidfw.c Mon Dec 21 05:08:20 2015 (r292529) +++ head/tools/regression/mac/mac_bsdextended/test_ugidfw.c Mon Dec 21 07:04:01 2015 (r292530) @@ -35,10 +35,11 @@ #include #include #include -#include #include #include #include +#include +#include /* * Starting point for a regression test for mac_bsdextended(4) and the @@ -49,7 +50,7 @@ usage(void) { fprintf(stderr, "test_ugidfw\n"); - exit(-1); + exit(1); } /* @@ -159,13 +160,13 @@ test_libugidfw_strings(void) for (i = 0; i < test_users_len; i++) { if (getpwnam(test_users[i]) == NULL) - err(-1, "test_libugidfw_strings: getpwnam: %s", + err(1, "test_libugidfw_strings: getpwnam: %s", test_users[i]); } for (i = 0; i < test_groups_len; i++) { if (getgrnam(test_groups[i]) == NULL) - err(-1, "test_libugidfw_strings: getgrnam: %s", + err(1, "test_libugidfw_strings: getgrnam: %s", test_groups[i]); } @@ -173,15 +174,15 @@ test_libugidfw_strings(void) error = bsde_parse_rule_string(test_strings[i], &rule, sizeof(errorstr), errorstr); if (error == -1) - errx(-1, "bsde_parse_rule_string: '%s' (%d): %s", + errx(1, "bsde_parse_rule_string: '%s' (%d): %s", test_strings[i], i, errorstr); error = bsde_rule_to_string(&rule, rulestr, sizeof(rulestr)); if (error < 0) - errx(-1, "bsde_rule_to_string: rule for '%s' " + errx(1, "bsde_rule_to_string: rule for '%s' " "returned %d", test_strings[i], error); if (strcmp(test_strings[i], rulestr) != 0) - errx(-1, "test_libugidfw: '%s' in, '%s' out", + errx(1, "test_libugidfw: '%s' in, '%s' out", test_strings[i], rulestr); } } @@ -210,12 +211,12 @@ main(int argc, char *argv[]) switch (mac_is_present("bsdextended")) { case -1: - err(-1, "mac_is_present"); + err(1, "mac_is_present"); case 1: break; case 0: default: - errx(-1, "mac_bsdextended not loaded"); + errx(1, "mac_bsdextended not loaded"); } /* @@ -226,13 +227,13 @@ main(int argc, char *argv[]) */ count = bsde_get_rule_count(sizeof(errorstr), errorstr); if (count == -1) - errx(-1, "bsde_get_rule_count: %s", errorstr); + errx(1, "bsde_get_rule_count: %s", errorstr); if (count != 0) - errx(-1, "bsde_get_rule_count: %d rules", count); + errx(1, "bsde_get_rule_count: %d rules", count); slots = bsde_get_rule_slots(sizeof(errorstr), errorstr); if (slots == -1) - errx(-1, "bsde_get_rule_slots: %s", errorstr); + errx(1, "bsde_get_rule_slots: %s", errorstr); return (0); }