[PATCH 5/9] cp: -Z: wrap/clarify/isolate --help messages

[Pádraig Brady]

wrap all --help to less that 80 chars
s/security context/SELinux security context/
Isolate -Z help text from other/existing help strings
---
 src/cp.c      |    5 ++++-
 src/install.c |    3 ++-
 src/mkdir.c   |    2 +-
 src/mkfifo.c  |    3 ++-
 src/mknod.c   |    3 ++-
 src/mv.c      |    3 ++-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/cp.c b/src/cp.c
index cddef7c..b22e668 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -229,7 +229,10 @@ Mandatory arguments to long options are mandatory for 
short options too.\n\
                                  destination file is missing\n\
   -v, --verbose                explain what is being done\n\
   -x, --one-file-system        stay on this file system\n\
-  -Z, --context[=CTX]      set security context of destination file to default 
type or to CTX if specified\n\
+"), stdout);
+      fputs (_("\
+  -Z, --context[=CTX]          set SELinux security context of destination\n\
+                                 file to default type, or to CTX if 
specified\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
diff --git a/src/install.c b/src/install.c
index 2c1ca34..98c2ead 100644
--- a/src/install.c
+++ b/src/install.c
@@ -642,7 +642,8 @@ Mandatory arguments to long options are mandatory for short 
options too.\n\
 "), stdout);
       fputs (_("\
       --preserve-context  preserve SELinux security context\n\
-  -Z, --context[=CTX]      set security context of destination file to default 
type or to CTX if specified\n\
+  -Z, --context[=CTX]     set SELinux security context of destination file 
to\n\
+                            default type, or to CTX if specified\n\
 "), stdout);
 
       fputs (HELP_OPTION_DESCRIPTION, stdout);
diff --git a/src/mkdir.c b/src/mkdir.c
index 94ec3f6..2f8ffc2 100644
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -67,7 +67,7 @@ Mandatory arguments to long options are mandatory for short 
options too.\n\
   -p, --parents     no error if existing, make parent directories as needed\n\
   -v, --verbose     print a message for each created directory\n\
   -Z, --context[=CTX]  set the SELinux security context of each created\n\
-                      directory to default type or to CTX if specified\n\
+                         directory to default type or to CTX if specified\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
diff --git a/src/mkfifo.c b/src/mkfifo.c
index f657ca0..9e80a20 100644
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -61,7 +61,8 @@ Mandatory arguments to long options are mandatory for short 
options too.\n\
   -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n\
 "), stdout);
       fputs (_("\
-  -Z, --context[=CTX]  set the SELinux security context of each NAME to 
default type or CTX if specified\n\
+  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n\
+                         default type, or CTX if specified\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
diff --git a/src/mknod.c b/src/mknod.c
index 404385a..210c89d 100644
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -63,7 +63,8 @@ Mandatory arguments to long options are mandatory for short 
options too.\n\
   -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n\
 "), stdout);
       fputs (_("\
-  -Z, --context[=CTX]  set the SELinux security context of NAME to default 
type or to CTX if specified\n\
+  -Z, --context[=CTX]  set the SELinux security context of NAME to\n\
+                         default type, or to CTX if specified\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
diff --git a/src/mv.c b/src/mv.c
index da9009f..65000b1 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -319,7 +319,8 @@ If you specify more than one of -i, -f, -n, only the final 
one takes effect.\n\
                                  than the destination file or when the\n\
                                  destination file is missing\n\
   -v, --verbose                explain what is being done\n\
-  -Z, --context                set security context of destination file to 
default type\n \
+  -Z, --context                set SELinux security context of destination\n\
+                                 file to default type\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-- 
1.7.6.4