From: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Date: Thu, 29 Sep 2022 10:19:58 +0000 (+0530)
Subject: tools/cgset: use exit code 129 on invalid usage
X-Git-Tag: v3.1.0~301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7abb100847f94cdb1328a26f3b92627b2cbf38e;p=thirdparty%2Flibcgroup.git

tools/cgset: use exit code 129 on invalid usage

The exit code 1 refers to general error and using -1 wraps to
255, both codes do not signify bad arguments. Let's use exit code 129
(EXIT_BADARGS) for hinting to the users about invalid usage.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/src/tools/cgset.c b/src/tools/cgset.c
index efe68a53..77966165 100644
--- a/src/tools/cgset.c
+++ b/src/tools/cgset.c
@@ -88,7 +88,7 @@ STATIC int parse_r_flag(const char * const program_name, const char * const name
 	buf = strtok(copy, "=");
 	if (buf == NULL) {
 		err("%s: wrong parameter of option -r: %s\n", program_name, optarg);
-		ret = -1;
+		ret = EXIT_BADARGS;
 		goto err;
 	}
 
@@ -104,7 +104,7 @@ STATIC int parse_r_flag(const char * const program_name, const char * const name
 
 	if (strlen(buf) == 0) {
 		err("%s: wrong parameter of option -r: %s\n", program_name, optarg);
-		ret = -1;
+		ret = EXIT_BADARGS;
 		goto err;
 	}
 
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
 	/* no parameter on input */
 	if (argc < 2) {
 		err("Usage is %s -r <name=value> relative path to cgroup>\n", argv[0]);
-		return -1;
+		exit(EXIT_BADARGS);
 	}
 
 	/* parse arguments */
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
 		case 'r':
 			if ((flags &  FL_COPY) != 0) {
 				usage(1, argv[0]);
-				ret = -1;
+				ret = EXIT_BADARGS;
 				goto err;
 			}
 			flags |= FL_RULES;
@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
 		case COPY_FROM_OPTION:
 			if (flags != 0) {
 				usage(1, argv[0]);
-				ret = -1;
+				ret = EXIT_BADARGS;
 				goto err;
 			}
 			flags |= FL_COPY;
@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
 			break;
 		default:
 			usage(1, argv[0]);
-			ret = -1;
+			ret = EXIT_BADARGS;
 			goto err;
 		}
 	}
@@ -192,13 +192,13 @@ int main(int argc, char *argv[])
 	/* no cgroup name */
 	if (!argv[optind]) {
 		err("%s: no cgroup specified\n", argv[0]);
-		ret = -1;
+		ret = EXIT_BADARGS;
 		goto err;
 	}
 
 	if (flags == 0) {
 		err("%s: no name-value pair was set\n", argv[0]);
-		ret = -1;
+		ret = EXIT_BADARGS;
 		goto err;
 	}