Don't use strings directly in calls to usage(). This is in preparation

for their extraction to a separate file.


git-svn-id: svn://busybox.net/trunk/busybox@863 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 21 insertions, 13 deletions

diff --git a/cp_mv.c b/cp_mv.c
index a0d677c45..72ba537c5 100644
--- a/cp_mv.c
+++ b/cp_mv.c
@@ -46,25 +46,33 @@
 #define is_cp 0
 #define is_mv 1
 static int         dz_i;                /* index into cp_mv_usage */
-static const char *cp_mv_usage[] =      /* .rodata */
-{
+
+const char cp_usage[] =
         "cp [OPTION]... SOURCE DEST\n"
-                "   or: cp [OPTION]... SOURCE... DIRECTORY\n"
+        "   or: cp [OPTION]... SOURCE... DIRECTORY\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-                "\nCopies SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
-                "\n"
-                "\t-a\tSame as -dpR\n"
-                "\t-d\tPreserves links\n"
-                "\t-p\tPreserves file attributes if possible\n"
-                "\t-f\tforce (implied; ignored) - always set\n"
-                "\t-R\tCopies directories recursively\n"
+        "\nCopies SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
+        "\n"
+        "\t-a\tSame as -dpR\n"
+        "\t-d\tPreserves links\n"
+        "\t-p\tPreserves file attributes if possible\n"
+        "\t-f\tforce (implied; ignored) - always set\n"
+        "\t-R\tCopies directories recursively\n"
 #endif
-                ,
+        ;
+
+const char mv_usage[] =
         "mv SOURCE DEST\n"
-                "   or: mv SOURCE... DIRECTORY\n"
+        "   or: mv SOURCE... DIRECTORY\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-                "\nRename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
+        "\nRename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 #endif
+        ;
+
+static const char *cp_mv_usage[] =      /* .rodata */
+{
+        cp_usage,
+        mv_usage
 };
 
 static int recursiveFlag;