aboutsummaryrefslogtreecommitdiff
path: root/st.c
diff options
context:
space:
mode:
authorQuentin Rameau <quinq@fifth.space>2016-01-29 22:02:40 +0100
committerChristoph Lohmann <20h@r-36.net>2016-01-30 09:44:41 +0100
commitbd5fdbe64c8abfb624ad59939ed9b221c8b04eef (patch)
tree4843d04341b6f0b4037af49b8ab34708ed7626f4 /st.c
parent504a165277c13797840c42c64807b59cd4e5f3a5 (diff)
downloadst-bd5fdbe64c8abfb624ad59939ed9b221c8b04eef.tar.gz
st-bd5fdbe64c8abfb624ad59939ed9b221c8b04eef.tar.bz2
Reformat usage and separate version from it
Signed-off-by: Christoph Lohmann <20h@r-36.net>
Diffstat (limited to 'st.c')
-rw-r--r--st.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/st.c b/st.c
index 3a0a519..2bbf484 100644
--- a/st.c
+++ b/st.c
@@ -486,6 +486,7 @@ static void *xrealloc(void *, size_t);
static char *xstrdup(char *);
static void usage(void);
+static void version(void);
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
@@ -4331,14 +4332,19 @@ run(void)
void
usage(void)
{
- die("%s " VERSION " (c) 2010-2016 st engineers\n"
- "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
- " [-i] [-t title] [-T title] [-w windowid] [-e command ...]"
- " [command ...]\n"
- " st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
- " [-i] [-t title] [-T title] [-w windowid] -l line"
- " [stty_args ...]\n",
- argv0);
+ die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
+ " [-o file] [-T title]\n"
+ " [-t title] [-w windowid] [[-e] command [args ...]]\n"
+ " %s [-aiv] [-c class] [-f font] [-g geometry]"
+ " [-o file] [-T title]\n"
+ " [-t title] [-w windowid] -l line [stty_args ...]\n",
+ argv0, argv0);
+}
+
+void
+version(void)
+{
+ die("%s " VERSION " (c) 2010-2016 st engineers\n", argv0);
}
int
@@ -4385,6 +4391,8 @@ main(int argc, char *argv[])
opt_embed = EARGF(usage());
break;
case 'v':
+ version();
+ break;
default:
usage();
} ARGEND;