commit a0501c526f4846d49745b09e08daf3a2d6c1fe75
parent 45a5bdf82366bcf90b53554c78885d876d24aeaa
Author: Anselm R. Garbe <garbeam@wmii.de>
Date: Sat, 4 Feb 2006 16:31:52 +0200
shortened usage strings to one liners, read the man pages
Diffstat:
8 files changed, 21 insertions(+), 71 deletions(-)
diff --git a/cmd/wm/wm.c b/cmd/wm/wm.c
@@ -43,19 +43,12 @@ Action wm_acttbl[] = {
{0, 0}
};
-char *version[] = {
- "wmiiwm - window manager improved 2 - " VERSION "\n"
- " (C)opyright MMIV-MMVI Anselm R. Garbe\n", 0
-};
+static char version[] = "wmiiwm - " VERSION ", (C)opyright MMIV-MMVI Anselm R. Garbe\n";
static void
usage()
{
- fprintf(stderr, "%s",
- "usage: wmiiwm -a <address> [-c] [-v]\n"
- " -a address\n"
- " -c checks if another WM is already running\n"
- " -v version info\n");
+ fprintf(stderr, "%s", "usage: wmiiwm -a <address> [-c] [-v]\n");
exit(1);
}
@@ -650,7 +643,7 @@ main(int argc, char *argv[])
for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
switch (argv[i][1]) {
case 'v':
- fprintf(stdout, "%s", version[0]);
+ fprintf(stdout, "%s", version);
exit(0);
break;
case 'c':
diff --git a/cmd/wmiibar.c b/cmd/wmiibar.c
@@ -83,18 +83,12 @@ static Pixmap pmap;
static void do_pend_fcall(char *event);
-static char *version[] = {
- "wmiibar - window manager improved bar - " VERSION "\n"
- " (C)opyright MMIV-MMVI Anselm R. Garbe\n", 0
-};
+static char version[] = "wmiibar - " VERSION ", (C)opyright MMIV-MMVI Anselm R. Garbe\n";
static void
usage()
{
- fprintf(stderr, "%s",
- "usage: wmiibar -a <server address> [-v]\n"
- " -a server address \n"
- " -v version info\n");
+ fprintf(stderr, "%s", "usage: wmiibar -a <address> [-v]\n");
exit(1);
}
@@ -845,7 +839,7 @@ main(int argc, char *argv[])
for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
switch (argv[i][1]) {
case 'v':
- fprintf(stdout, "%s", version[0]);
+ fprintf(stdout, "%s", version);
exit(0);
break;
case 'a':
diff --git a/cmd/wmiifs.c b/cmd/wmiifs.c
@@ -47,17 +47,12 @@ static Action acttbl[] = {
{0, 0}
};
-static char *version[] = {
- "wmiifs - window manager improved filesystem - " VERSION "\n"
- " (C)opyright MMVI Anselm R. Garbe\n", 0
-};
+static char version[] = "wmiifs - " VERSION ", (C)opyright MMIV-MMVI Anselm R. Garbe\n";
static void
usage()
{
- fprintf(stderr,
- "usage: wmiifs -s <socket file> [-v]\n"
- " -s socket file\n" " -v version info\n");
+ fprintf(stderr, "usage: wmiifs -a <address> [-v]\n");
exit(1);
}
diff --git a/cmd/wmiikeys.c b/cmd/wmiikeys.c
@@ -66,18 +66,12 @@ static Action acttbl[] = {
{0, 0}
};
-static char *version[] = {
- "wmiikeys - window manager improved keys - " VERSION "\n"
- " (C)opyright MMIV-MMVI Anselm R. Garbe\n", 0
-};
+static char version[] = "wmiikeys - " VERSION ", (C)opyright MMIV-MMVI Anselm R. Garbe\n";
static void
usage()
{
- fprintf(stderr, "%s",
- "usage: wmiikeys [-s <socket file>] [-v]\n"
- " -s socket file (default: /tmp/.ixp-$USER/wmiikeys-$WMII_IDENT)\n"
- " -v version info\n");
+ fprintf(stderr, "%s", "usage: wmiikeys [-a <address>] [-v]\n");
exit(1);
}
diff --git a/cmd/wmiimenu.c b/cmd/wmiimenu.c
@@ -82,18 +82,12 @@ static Action acttbl[2] = {
{"display", display}
};
-static char *version[] = {
- "wmiimenu - window manager improved menu - " VERSION "\n"
- " (C)opyright MMIV-MMVI Anselm R. Garbe\n", 0
-};
+static char version[] = "wmiimenu - " VERSION ", (C)opyright MMIV-MMVI Anselm R. Garbe\n";
static void
usage()
{
- fprintf(stderr, "%s",
- "usage: wmiimenu [-s <socket file>] [-r] [-v]\n"
- " -s socket file (default: /tmp/.ixp-$USER/wmiimenu-%s-%s)\n"
- " -v version info\n");
+ fprintf(stderr, "%s", "usage: wmiimenu [-a <address>] [-r] [-v]\n");
exit(1);
}
diff --git a/cmd/wmiiplumb.c b/cmd/wmiiplumb.c
@@ -10,16 +10,12 @@
#include <X11/Xlib.h>
#include <X11/Xatom.h>
-static char *version[] = {
- "wmiiplumb - window manager improved plumb - " VERSION "\n"
- " (C)opyright MMIV-MMVI Anselm R. Garbe\n", 0
-};
+static char version[] = "wmiiplumb - " VERSION ", (C)opyright MMIV-MMVI Anselm R. Garbe\n";
static void
usage()
{
- fprintf(stderr, "%s\n",
- "usage: wmiiplumb [-v]\n" " -v version info\n");
+ fprintf(stderr, "%s\n", "usage: wmiiplumb [-v]\n");
exit(1);
}
@@ -56,7 +52,7 @@ main(int argc, char **argv)
/* command line args */
if(argc > 1) {
if(!strncmp(argv[1], "-v", 3)) {
- fprintf(stdout, "%s", version[0]);
+ fprintf(stdout, "%s", version);
exit(0);
} else
usage();
diff --git a/cmd/wmiir.c b/cmd/wmiir.c
@@ -14,23 +14,12 @@
static IXPClient c = { 0 };
-static char *version[] = {
- "wmiir - window manager improved remote - " VERSION "\n"
- " (C)opyright MMIV-MMVI Anselm R. Garbe\n", 0
-};
+static char version[] = "wmiir - " VERSION ", (C)opyright MMIV-MMVI Anselm R. Garbe\n";
static void
usage()
{
- fprintf(stderr, "%s",
- "usage: wmiir [-a <server address>] [-v] <command>\n"
- " -a server address (default: $WMII_ADDRESS)\n"
- " -v version info\n"
- "valid commands:\n"
- " create <file> -- creates file and writes data from stdin to file\n"
- " read <file/dir> -- prints file/directory contents\n"
- " write <file> -- writes data from stdin to file\n"
- " remove <file> -- removes file\n");
+ fprintf(stderr, "%s", "usage: wmiir [-a <address>] [-v] <command>\n");
exit(1);
}
@@ -190,7 +179,7 @@ main(int argc, char *argv[])
for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
switch (argv[i][1]) {
case 'v':
- fprintf(stderr, "%s", version[0]);
+ fprintf(stderr, "%s", version);
exit(0);
break;
case 'a':
diff --git a/cmd/wmiiwarp.c b/cmd/wmiiwarp.c
@@ -13,17 +13,12 @@
#include "cext.h"
-static char *version[] = {
- "wmiiwarp - window manager improved warp - " VERSION "\n"
- " (C)opyright MMIV-MMVI Anselm R. Garbe\n", 0
-};
+static char version[] = "wmiiwarp - " VERSION ", (C)opyright MMIV-MMVI Anselm R. Garbe\n";
static void
usage()
{
- fprintf(stderr,
- "usage: wmiiwarp [-v] <x> <y>\n"
- " -v version info\n");
+ fprintf(stderr, "%s", "usage: wmiiwarp <x> <y> [-v]\n");
exit(1);
}
@@ -38,7 +33,7 @@ main(int argc, char **argv)
if(argc < 2)
usage();
if(!strncmp(argv[1], "-v", 2)) {
- fprintf(stdout, "%s", version[0]);
+ fprintf(stdout, "%s", version);
exit(0);
}
dpy = XOpenDisplay(0);
