iReformat usage and separate version from it - st - Simple Terminal Err gopher.r-36.net 70 i Err gopher.r-36.net 70 1Log /scm/st//log.gph gopher.r-36.net 70 1Files /scm/st//files.gph gopher.r-36.net 70 1Refs /scm/st//refs.gph gopher.r-36.net 70 1README /scm/st//file/README.gph gopher.r-36.net 70 1LICENSE /scm/st//file/LICENSE.gph gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1commit bd5fdbe64c8abfb624ad59939ed9b221c8b04eef /scm/st//commit/bd5fdbe64c8abfb624ad59939ed9b221c8b04eef.gph gopher.r-36.net 70 1parent 504a165277c13797840c42c64807b59cd4e5f3a5 /scm/st//commit/504a165277c13797840c42c64807b59cd4e5f3a5.gph gopher.r-36.net 70 hAuthor: Quentin Rameau URL:mailto:quinq@fifth.space gopher.r-36.net 70 iDate: Fri, 29 Jan 2016 22:02:40 +0100 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iReformat usage and separate version from it Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iSigned-off-by: Christoph Lohmann <20h@r-36.net> Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i st.1 | 38 ++++++++++++++----------------- Err gopher.r-36.net 70 i st.c | 24 ++++++++++++++++-------- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i2 files changed, 33 insertions(+), 29 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/st.1 b/st.1 /scm/st//file/st.1.gph gopher.r-36.net 70 i@@ -3,47 +3,43 @@ Err gopher.r-36.net 70 i st \- simple terminal Err gopher.r-36.net 70 i .SH SYNOPSIS Err gopher.r-36.net 70 i .B st Err gopher.r-36.net 70 i-.RB [ \-a ] Err gopher.r-36.net 70 i+.RB [ \-aiv ] Err gopher.r-36.net 70 i .RB [ \-c Err gopher.r-36.net 70 i .IR class ] Err gopher.r-36.net 70 i .RB [ \-f Err gopher.r-36.net 70 i .IR font ] Err gopher.r-36.net 70 i .RB [ \-g Err gopher.r-36.net 70 i .IR geometry ] Err gopher.r-36.net 70 i-.RB [ \-i ] Err gopher.r-36.net 70 i .RB [ \-o Err gopher.r-36.net 70 i-.IR file ] Err gopher.r-36.net 70 i-.RB [ \-t Err gopher.r-36.net 70 i-.IR title ] Err gopher.r-36.net 70 i+.IR iofile ] Err gopher.r-36.net 70 i .RB [ \-T Err gopher.r-36.net 70 i .IR title ] Err gopher.r-36.net 70 i+.RB [ \-t Err gopher.r-36.net 70 i+.IR title ] Err gopher.r-36.net 70 i .RB [ \-l Err gopher.r-36.net 70 i .IR line ] Err gopher.r-36.net 70 i-.RB [ \-w Err gopher.r-36.net 70 i+.RB [ \-w Err gopher.r-36.net 70 i .IR windowid ] Err gopher.r-36.net 70 i-.RB [ \-v ] Err gopher.r-36.net 70 i-.RB [ \-e Err gopher.r-36.net 70 i-.IR command ...] Err gopher.r-36.net 70 i-.RI [ commands ...] Err gopher.r-36.net 70 i+.RB [[ \-e ] Err gopher.r-36.net 70 i+.IR command Err gopher.r-36.net 70 i+.RI [ arguments ...]] Err gopher.r-36.net 70 i .PP Err gopher.r-36.net 70 i .B st Err gopher.r-36.net 70 i-.RB [ \-a ] Err gopher.r-36.net 70 i+.RB [ \-aiv ] Err gopher.r-36.net 70 i .RB [ \-c Err gopher.r-36.net 70 i .IR class ] Err gopher.r-36.net 70 i .RB [ \-f Err gopher.r-36.net 70 i .IR font ] Err gopher.r-36.net 70 i .RB [ \-g Err gopher.r-36.net 70 i .IR geometry ] Err gopher.r-36.net 70 i-.RB [ \-i ] Err gopher.r-36.net 70 i .RB [ \-o Err gopher.r-36.net 70 i-.IR file ] Err gopher.r-36.net 70 i-.RB [ \-t Err gopher.r-36.net 70 i-.IR title ] Err gopher.r-36.net 70 i+.IR iofile ] Err gopher.r-36.net 70 i .RB [ \-T Err gopher.r-36.net 70 i .IR title ] Err gopher.r-36.net 70 i+.RB [ \-t Err gopher.r-36.net 70 i+.IR title ] Err gopher.r-36.net 70 i .RB [ \-w Err gopher.r-36.net 70 i .IR windowid ] Err gopher.r-36.net 70 i-.RB [ \-v ] Err gopher.r-36.net 70 i .RB \-l Err gopher.r-36.net 70 i .IR line Err gopher.r-36.net 70 i .RI [ stty_args ...] Err gopher.r-36.net 70 i@@ -78,14 +74,14 @@ writes all the I/O to Err gopher.r-36.net 70 i This feature is useful when recording st sessions. A value of "-" means Err gopher.r-36.net 70 i standard output. Err gopher.r-36.net 70 i .TP Err gopher.r-36.net 70 i-.BI \-t " title" Err gopher.r-36.net 70 i+.BI \-T " title" Err gopher.r-36.net 70 i defines the window title (default 'st'). Err gopher.r-36.net 70 i .TP Err gopher.r-36.net 70 i-.BI \-T " title" Err gopher.r-36.net 70 i+.BI \-t " title" Err gopher.r-36.net 70 i defines the window title (default 'st'). Err gopher.r-36.net 70 i .TP Err gopher.r-36.net 70 i .BI \-w " windowid" Err gopher.r-36.net 70 i-embeds st within the window identified by Err gopher.r-36.net 70 i+embeds st within the window identified by Err gopher.r-36.net 70 i .I windowid Err gopher.r-36.net 70 i .TP Err gopher.r-36.net 70 i .BI \-l " line" Err gopher.r-36.net 70 i@@ -111,9 +107,9 @@ for more arguments and cases. Err gopher.r-36.net 70 i .B \-v Err gopher.r-36.net 70 i prints version information to stderr, then exits. Err gopher.r-36.net 70 i .TP Err gopher.r-36.net 70 i-.BI \-e " program " [ " arguments " "... ]" Err gopher.r-36.net 70 i+.BI \-e " command " [ " arguments " "... ]" Err gopher.r-36.net 70 i st executes Err gopher.r-36.net 70 i-.I program Err gopher.r-36.net 70 i+.I command Err gopher.r-36.net 70 i instead of the shell. If this is used it Err gopher.r-36.net 70 i .B must be the last option Err gopher.r-36.net 70 i on the command line, as in xterm / rxvt. Err gopher.r-36.net 70 1diff --git a/st.c b/st.c /scm/st//file/st.c.gph gopher.r-36.net 70 i@@ -486,6 +486,7 @@ static void *xrealloc(void *, size_t); Err gopher.r-36.net 70 i static char *xstrdup(char *); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void usage(void); Err gopher.r-36.net 70 i+static void version(void); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void (*handler[LASTEvent])(XEvent *) = { Err gopher.r-36.net 70 i [KeyPress] = kpress, Err gopher.r-36.net 70 i@@ -4331,14 +4332,19 @@ run(void) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i usage(void) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- die("%s " VERSION " (c) 2010-2016 st engineers\n" Err gopher.r-36.net 70 i- "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n" Err gopher.r-36.net 70 i- " [-i] [-t title] [-T title] [-w windowid] [-e command ...]" Err gopher.r-36.net 70 i- " [command ...]\n" Err gopher.r-36.net 70 i- " st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n" Err gopher.r-36.net 70 i- " [-i] [-t title] [-T title] [-w windowid] -l line" Err gopher.r-36.net 70 i- " [stty_args ...]\n", Err gopher.r-36.net 70 i- argv0); Err gopher.r-36.net 70 i+ die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]" Err gopher.r-36.net 70 i+ " [-o file] [-T title]\n" Err gopher.r-36.net 70 i+ " [-t title] [-w windowid] [[-e] command [args ...]]\n" Err gopher.r-36.net 70 i+ " %s [-aiv] [-c class] [-f font] [-g geometry]" Err gopher.r-36.net 70 i+ " [-o file] [-T title]\n" Err gopher.r-36.net 70 i+ " [-t title] [-w windowid] -l line [stty_args ...]\n", Err gopher.r-36.net 70 i+ argv0, argv0); Err gopher.r-36.net 70 i+} Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+void Err gopher.r-36.net 70 i+version(void) Err gopher.r-36.net 70 i+{ Err gopher.r-36.net 70 i+ die("%s " VERSION " (c) 2010-2016 st engineers\n", argv0); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i int Err gopher.r-36.net 70 i@@ -4385,6 +4391,8 @@ main(int argc, char *argv[]) Err gopher.r-36.net 70 i opt_embed = EARGF(usage()); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'v': Err gopher.r-36.net 70 i+ version(); Err gopher.r-36.net 70 i+ break; Err gopher.r-36.net 70 i default: Err gopher.r-36.net 70 i usage(); Err gopher.r-36.net 70 i } ARGEND; Err gopher.r-36.net 70 .