From: Sebastian Rasmussen <sebras@gmail.com>
Date: Sun, 20 Mar 2016 12:50:59 +0000 (+0100)
Subject: fuser/killall/pstree: Mention all flags in usage
X-Git-Tag: v23.0rc1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3126b45701ea883b918adc2d8769dcf353777c57;p=psmisc

fuser/killall/pstree: Mention all flags in usage

Make sure that all flags are mentioned in each tool and
also sort out stray whitespace and improper linebreaking.
---

diff --git a/src/fuser.c b/src/fuser.c
index 5e63de7..ce8f9db 100644
--- a/src/fuser.c
+++ b/src/fuser.c
@@ -121,15 +121,18 @@ static void usage(const char *errormsg)
 
 	fprintf(stderr,
 		_
-		("Usage: fuser [-fMuvw] [-a|-s] [-4|-6] [-c|-m|-n SPACE] [-k [-i] [-SIGNAL]] NAME...\n"
-		 "       fuser -l\n" "       fuser -V\n"
+		("Usage: fuser [-fIMuvw] [-a|-s] [-4|-6] [-c|-m|-n SPACE]\n"
+		 "             [-k [-i] [-SIGNAL]] NAME...\n"
+		 "       fuser -l\n"
+		 "       fuser -V\n"
 		 "Show which processes use the named files, sockets, or filesystems.\n\n"
 		 "  -a,--all              display unused files too\n"
 		 "  -i,--interactive      ask before killing (ignored without -k)\n"
 		 "  -I,--inode            use always inodes to compare files\n"
 		 "  -k,--kill             kill processes accessing the named file\n"
 		 "  -l,--list-signals     list available signal names\n"
-		 "  -m,--mount            show all processes using the named filesystems or block device\n"
+		 "  -m,--mount            show all processes using the named filesystems or\n"
+		 "                        block device\n"
 		 "  -M,--ismountpoint     fulfill request only if NAME is a mount point\n"
 		 "  -n,--namespace SPACE  search in this name space (file, udp, or tcp)\n"
 		 "  -s,--silent           silent operation\n"
diff --git a/src/killall.c b/src/killall.c
index 617b38b..3b1e0dc 100644
--- a/src/killall.c
+++ b/src/killall.c
@@ -661,7 +661,8 @@ usage (const char *msg)
     fprintf(stderr, "%s\n", msg);
 #ifdef WITH_SELINUX
    fprintf(stderr, _(
-     "Usage: killall [-Z CONTEXT] [-u USER] [ -eIgiqrvw ] [ -SIGNAL ] NAME...\n"));
+    "Usage: killall [ -Z CONTEXT ] [ -u USER ] [ -y TIME ] [ -o TIME ] [ -eIgiqrvw ]\n"
+    "               [ -s SIGNAL | -SIGNAL ] NAME...\n"));
 #else  /*WITH_SELINUX*/
   fprintf(stderr, _(
     "Usage: killall [OPTION]... [--] NAME...\n"));
@@ -673,7 +674,7 @@ usage (const char *msg)
     "  -I,--ignore-case    case insensitive process name match\n"
     "  -g,--process-group  kill process group instead of process\n"
     "  -y,--younger-than   kill processes younger than TIME\n"
-    "  -o,--older-than     kill processes older than TIME\n"		    
+    "  -o,--older-than     kill processes older than TIME\n"
     "  -i,--interactive    ask for confirmation before killing\n"
     "  -l,--list           list all known signal names\n"
     "  -q,--quiet          don't print complaints\n"
diff --git a/src/pstree.c b/src/pstree.c
index a8c24f1..ca8efb4 100644
--- a/src/pstree.c
+++ b/src/pstree.c
@@ -1013,7 +1013,12 @@ static void usage(void)
 {
     fprintf(stderr,
             _
-            ("Usage: pstree [ -a ] [ -c ] [ -h | -H PID ] [ -l ] [ -n ] [ -p ] [ -g ] [ -u ]\n"
+            (
+#ifdef WITH_SELINUX
+             "Usage: pstree [-acglpsStuZ] [ -h | -H PID ] [ -n | -N type ]\n"
+#else                                 /*WITH_SELINUX */
+             "Usage: pstree [-acglpsStu] [ -h | -H PID ] [ -n | -N type ]\n"
+#endif                                /*WITH_SELINUX */
              "              [ -A | -G | -U ] [ PID | USER ]\n"
              "       pstree -V\n" "Display a tree of processes.\n\n"
              "  -a, --arguments     show command line arguments\n"
@@ -1037,7 +1042,8 @@ static void usage(void)
              "  -V, --version       display version information\n"));
 #ifdef WITH_SELINUX
     fprintf(stderr,
-            _("  -Z     show         SELinux security contexts\n"));
+            _("  -Z, --security-context\n"
+              "                      show SELinux security contexts\n"));
 #endif                                /*WITH_SELINUX */
     fprintf(stderr, _("  PID    start at this PID; default is 1 (init)\n"
                       "  USER   show only trees rooted at processes of this user\n\n"));