svn commit: r365994 - stable/12/usr.bin/posixshmcontrol

[Mark Johnston]

Author: markj
Date: Tue Sep 22 12:14:46 2020
New Revision: 365994
URL: https://svnweb.freebsd.org/changeset/base/365994

Log:
  MFC r365749:
  Fix some posixshmcontrol nits.

Modified:
  stable/12/usr.bin/posixshmcontrol/posixshmcontrol.1
  stable/12/usr.bin/posixshmcontrol/posixshmcontrol.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.bin/posixshmcontrol/posixshmcontrol.1
==============================================================================
--- stable/12/usr.bin/posixshmcontrol/posixshmcontrol.1	Tue Sep 22 04:16:40 2020	(r365993)
+++ stable/12/usr.bin/posixshmcontrol/posixshmcontrol.1	Tue Sep 22 12:14:46 2020	(r365994)
@@ -120,7 +120,7 @@ using name-switch services, instead the raw numeric va
 To show content of the shared memory segment with the path
 .Pa /1 ,
 use the command
-.Dl "posixshmcontrol dump /q | hexdump -C"
+.Dl "posixshmcontrol dump /1 | hexdump -C"
 .It
 To create a segment with the path
 .Pa /2

Modified: stable/12/usr.bin/posixshmcontrol/posixshmcontrol.c
==============================================================================
--- stable/12/usr.bin/posixshmcontrol/posixshmcontrol.c	Tue Sep 22 04:16:40 2020	(r365993)
+++ stable/12/usr.bin/posixshmcontrol/posixshmcontrol.c	Tue Sep 22 12:14:46 2020	(r365994)
@@ -96,9 +96,14 @@ create_shm(int argc, char **argv)
 			return (2);
 		}
 	}
-
 	argc -= optind;
 	argv += optind;
+
+	if (argc == 0) {
+		usage();
+		return (2);
+	}
+
 	ret = 0;
 	for (i = 0; i < argc; i++) {
 		ret1 = create_one_shm(argv[i], mode);
@@ -128,6 +133,11 @@ delete_shm(int argc, char **argv)
 {
 	int i, ret, ret1;
 
+	if (argc == 1) {
+		usage();
+		return (2);
+	}
+
 	ret = 0;
 	for (i = 1; i < argc; i++) {
 		ret1 = delete_one_shm(argv[i]);
@@ -296,6 +306,11 @@ read_shm(int argc, char **argv)
 {
 	int i, ret, ret1;
 
+	if (argc == 1) {
+		usage();
+		return (2);
+	}
+
 	ret = 0;
 	for (i = 1; i < argc; i++) {
 		ret1 = read_one_shm(argv[i]);
@@ -379,6 +394,11 @@ stat_shm(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
+	if (argc == 0) {
+		usage();
+		return (2);
+	}
+
 	ret = 0;
 	for (i = 0; i < argc; i++) {
 		ret1 = stat_one_shm(argv[i], hsize, uname);
@@ -419,16 +439,21 @@ truncate_shm(int argc, char **argv)
 		switch (c) {
 		case 's':
 			if (expand_number(optarg, &newsize) == -1)
-				err(1, "size:");
+				err(1, "size");
 			break;
 		case '?':
 		default:
 			return (2);
 		}
 	}
-
 	argc -= optind;
 	argv += optind;
+
+	if (argc == 0) {
+		usage();
+		return (2);
+	}
+
 	ret = 0;
 	for (i = 0; i < argc; i++) {
 		ret1 = truncate_one_shm(argv[i], newsize);