Chewing_Bever
/
stj
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reformat usage and separate version from it 

Signed-off-by: Christoph Lohmann <20h@r-36.net>
master
Quentin Rameau 2016-01-29 22:02:40 +01:00 committed by Christoph Lohmann
parent 504a165277
commit bd5fdbe64c
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
st.1
View File

@ -3,47 +3,43 @@
st \- simple terminal
.SH SYNOPSIS
.B st
.RB [ \-a ]
.RB [ \-aiv ]
.RB [ \-c
.IR class ]
.RB [ \-f
.IR font ]
.RB [ \-g
.IR geometry ]
.RB [ \-i ]
.RB [ \-o
.IR file ]
.RB [ \-t
.IR title ]
.IR iofile ]
.RB [ \-T
.IR title ]
.RB [ \-t
.IR title ]
.RB [ \-l
.IR line ]
.RB [ \-w
.RB [ \-w
.IR windowid ]
.RB [ \-v ]
.RB [ \-e
.IR command ...]
.RI [ commands ...]
.RB [[ \-e ]
.IR command
.RI [ arguments ...]]
.PP
.B st
.RB [ \-a ]
.RB [ \-aiv ]
.RB [ \-c
.IR class ]
.RB [ \-f
.IR font ]
.RB [ \-g
.IR geometry ]
.RB [ \-i ]
.RB [ \-o
.IR file ]
.RB [ \-t
.IR title ]
.IR iofile ]
.RB [ \-T
.IR title ]
.RB [ \-t
.IR title ]
.RB [ \-w
.IR windowid ]
.RB [ \-v ]
.RB \-l
.IR line
.RI [ stty_args ...]
@ -78,14 +74,14 @@ writes all the I/O to
This feature is useful when recording st sessions. A value of "-" means
standard output.
.TP
.BI \-t " title"
defines the window title (default 'st').
.TP
.BI \-T " title"
defines the window title (default 'st').
.TP
.BI \-t " title"
defines the window title (default 'st').
.TP
.BI \-w " windowid"
embeds st within the window identified by
embeds st within the window identified by
.I windowid
.TP
.BI \-l " line"
@ -111,9 +107,9 @@ for more arguments and cases.
.B \-v
prints version information to stderr, then exits.
.TP
.BI \-e " program " [ " arguments " "... ]"
.BI \-e " command " [ " arguments " "... ]"
st executes
.I program
.I command
instead of the shell. If this is used it
.B must be the last option
on the command line, as in xterm / rxvt.

24
st.c
View File

@ -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;