mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

harmonize help messages

Browse Source
This commit is contained in:
marschap
2006-09-30 20:32:14 +00:00
parent 6afc277273
commit 3a57ecfda0
4 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/lcdexec/lcdexec.c
+14 -12
View File
@@ -31,18 +31,20 @@
char * help_text =
"lcdexec - LCDproc client to execute commands from the LCDd menu.\n"
"Copyright (c) 2002, Joris Robijn\n"
"This file is released under the GNU General Public License. Refer to the\n"
"COPYING file distributed with this package.\n"
"Options:\n"
" -c <file>\tSpecify configuration file ["DEFAULT_CONFIGFILE"]\n"
" -a <address>\tDNS name or IP address of the LCDd server [localhost]\n"
" -p <port>\tport of the LCDd server [13666]\n"
" -f \t\tRun in foreground\n"
" -r <level>\tSet reporting level (0-5) [2: errors and warnings]\n"
" -s <0|1>\tReport to syslog (1) or stderr (0, default)\n"
" -h\t\tShow this help\n";
"lcdexec - LCDproc client to execute commands from the LCDd menu\n"
"\n"
"Copyright (c) 2002, Joris Robijn, 2006 Peter Marschall.\n"
"This program is released under the terms of the GNU General Public License.\n"
"\n"
"Usage: lcdexec [<options>]\n"
" where <options> are:\n"
" -c <file> Specify configuration file ["DEFAULT_CONFIGFILE"]\n"
" -a <address> DNS name or IP address of the LCDd server [localhost]\n"
" -p <port> port of the LCDd server [13666]\n"
" -f Run in foreground\n"
" -r <level> Set reporting level (0-5) [2: errors and warnings]\n"
" -s <0|1> Report to syslog (1) or stderr (0, default)\n"
" -h Show this help\n";
char * progname = "lcdexec";
clients/lcdproc/main.c
+27 -22
View File
@@ -401,31 +401,36 @@ void
HelpScreen (int exit_state)
{
fprintf(stderr,
"lcdproc - LCDproc system status information viewer\n"
"\n"
"Copyright (c) 1999-2006 Scott Scriven, William Ferrell, and misc. contributors.\n"
"This program is released under the terms of the GNU General Public License.\n"
"\n"
"Usage: lcdproc [<options>] [<screens> ...]\n"
" where <options> are\n"
" -s <host> connect to LCDd daemon on <host>\n"
" -p <port> connect to LCDd daemon using <port>\n"
" -f run in foreground\n"
" -e <delay> slow down initial announcement of modes (in 1/100s)\n"
" -c <config> use a configuration file other than %s\n"
" -h show this help screen\n"
" -v display program version\n"
" -s <host> connect to LCDd daemon on <host>\n"
" -p <port> connect to LCDd daemon using <port>\n"
" -f run in foreground\n"
" -e <delay> slow down initial announcement of screens (in 1/100s)\n"
" -c <config> use a configuration file other than %s\n"
" -h show this help screen\n"
" -v display program version\n"
" and <screens> are\n"
" C CPU detailed CPU usage\n"
" P SMP-CPU CPU usage overview (one line per CPU)\n"
" G CPUGraph CPU usage histogram\n"
" L Load load histogram\n"
" M Memory memory & swap usage\n"
" S ProcSize biggest processes size\n"
" D Disk filling level of mounted file systems\n"
" I Iface network interface usage\n"
" B Battery battery status\n"
" T TimeDate time & date information\n"
" O OldTime old time screen\n"
" U Uptime uptime screen\n"
" K BigClock big clock\n"
" N MiniClock minimal clock\n"
" A About credits page\n"
" C CPU detailed CPU usage\n"
" P SMP-CPU CPU usage overview (one line per CPU)\n"
" G CPUGraph CPU usage histogram\n"
" L Load load histogram\n"
" M Memory memory & swap usage\n"
" S ProcSize biggest processes size\n"
" D Disk filling level of mounted file systems\n"
" I Iface network interface usage\n"
" B Battery battery status\n"
" T TimeDate time & date information\n"
" O OldTime old time screen\n"
" U Uptime uptime screen\n"
" K BigClock big clock\n"
" N MiniClock minimal clock\n"
" A About credits page\n"
"\n"
"Example:\n"
" lcdproc -s my.lcdproc.server.com -p 13666 C M L\n"
clients/lcdvc/lcdvc.c
+15 -13
View File
@@ -6,7 +6,7 @@
* COPYING file distributed with this package.
*
* Copyright (c) 2002, Joris Robijn
*
* Copyright (c) 2006, Peter Marschall
*/
#include <stdio.h>
@@ -35,18 +35,20 @@
char * help_text =
"lcdvc - LCDproc virtual console displayer.\n"
"Copyright (c) 2002, Joris Robijn\n"
"This file is released under the GNU General Public License. Refer to the\n"
"COPYING file distributed with this package.\n"
"Options:\n"
" -c <file>\tSpecify a configfile to load ["DEFAULT_CONFIGFILE"]\n"
" -a <address>\tDNS name or IP address of the LCDd server [localhost]\n"
" -p <port>\tPort of the LCDd server [13666]\n"
" -f \tRun in foreground\n"
" -r <level>\tSet reporting level (0-5) [2: errors and warnings]\n"
" -s <0|1>\tReport to 1=syslog or 0=stderr\n"
" -h\t\tShow this help\n";
"lcdvc - LCDproc virtual console\n"
"\n"
"Copyright (c) 2002, Joris Robijn, 2006 Peter Marschall.\n"
"This program is released under the terms of the GNU General Public License.\n"
"\n"
"Usage: lcdvc [<options>]\n"
" where <options> are:\n"
" -c <file> Specify configuration file ["DEFAULT_CONFIGFILE"]\n"
" -a <address> DNS name or IP address of the LCDd server [localhost]\n"
" -p <port> port of the LCDd server [13666]\n"
" -f Run in foreground\n"
" -r <level> Set reporting level (0-5) [2: errors and warnings]\n"
" -s <0|1> Report to syslog (1) or stderr (0, default)\n"
" -h Show this help\n";
char *progname = "lcdvc";
char *configfile = UNSET_STR;
server/main.c
+21 -15
View File
@@ -11,7 +11,7 @@
* 2002, Mike Patnode
* 2002, Guillaume Filion
* 2003, Benjamin Tse (Win32 support)
* 2005, Peter Marschall (cleanup)
* 2005-2006, Peter Marschall (cleanup)
*
* Contains main(), plus signal callback functions and a help screen.
*
@@ -1001,23 +1001,29 @@ output_help_screen(void)
*/
debug( RPT_DEBUG, "%s()", __FUNCTION__ );
fprintf(stdout, "LCDd: LCDproc Server Daemon, %s\n", version);
fprintf(stdout, "LCDd - LCDproc Server Daemon, %s\n\n", version);
fprintf(stdout, "Copyright (c) 1999-2006 Scott Scriven, William Ferrell, and misc. contributors.\n");
fprintf(stdout, "This program is freely redistributable under the terms of the GNU Public License.\n\n");
fprintf(stdout, "This program is released under the terms of the GNU General Public License.\n\n");
fprintf(stdout, "Usage: LCDd [<options>]\n");
fprintf(stdout, " where <options> are:\n");
fprintf(stdout, "\t-h\t\tDisplay this help screen\n");
fprintf(stdout, "\t-c <config>\tUse a configuration file other than %s\n", DEFAULT_CONFIGFILE);
fprintf(stdout, "\t-d <driver>\tAdd a driver to use (overrides drivers in config file) [%s]\n", DEFAULT_DRIVER);
fprintf(stdout, "\t-f\t\tRun in the foreground\n");
fprintf(stdout, "\t-a <addr>\tNetwork (IP) address to bind to [%s]\n", DEFAULT_BIND_ADDR);
fprintf(stdout, "\t-p <port>\tNetwork port to listen for connections on [%i]\n", DEFAULT_BIND_PORT);
fprintf(stdout, "\t-u <user>\tUser to run as [%s]\n", DEFAULT_USER);
fprintf(stdout, "\t-w <waittime>\tTime to pause at each screen (in seconds) [%d]\n", DEFAULT_SCREEN_DURATION/RENDER_FREQ);
fprintf(stdout, "\t-s <bool>\tIf set, reporting will be done using syslog\n");
fprintf(stdout, "\t-r <level>\tReport level [%d]\n", DEFAULT_REPORTLEVEL);
fprintf(stdout, "\t-i <bool>\tWhether to rotate the server info screen\n");
fprintf(stdout, "\n");
fprintf(stdout, " -h Display this help screen\n");
fprintf(stdout, " -c <config> Use a configuration file other than %s\n",
DEFAULT_CONFIGFILE);
fprintf(stdout, " -d <driver> Add a driver to use (overrides drivers in config file) [%s]\n",
DEFAULT_DRIVER);
fprintf(stdout, " -f Run in the foreground\n");
fprintf(stdout, " -a <addr> Network (IP) address to bind to [%s]\n",
DEFAULT_BIND_ADDR);
fprintf(stdout, " -p <port> Network port to listen for connections on [%i]\n",
DEFAULT_BIND_PORT);
fprintf(stdout, " -u <user> User to run as [%s]\n",
DEFAULT_USER);
fprintf(stdout, " -w <waittime> Time to pause at each screen (in seconds) [%d]\n",
DEFAULT_SCREEN_DURATION/RENDER_FREQ);
fprintf(stdout, " -s <bool> If set, reporting will be done using syslog\n");
fprintf(stdout, " -r <level> Report level [%d]\n",
DEFAULT_REPORTLEVEL);
fprintf(stdout, " -i <bool> Whether to rotate the server info screen\n");
/* Error messages will be flushed to the configured output after this
* help message.