This patch adds -h and -V short options (to complement the usage).
It is based on a patch attached to Debian bug #466063, see
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=466063>.
Idea by Jari Aalto <jari.aalto@cante.net>,
patch adapted by Alexander Barton <alex@barton.de>.
(cherry picked from commit
818a206a4261f3d4153b0ab5c2025d77002290f5)
\fB\-t\fR, \fB\-\-configtest\fR
Read, validate and display the configuration; then exit.
.TP
\fB\-t\fR, \fB\-\-configtest\fR
Read, validate and display the configuration; then exit.
.TP
+\fB\-V\fR, \fB\-\-version\fR
Output version information and exit.
.TP
Output version information and exit.
.TP
+\fB\-h\fR, \fB\-\-help\fR
Display a brief help text and exit.
.SH FILES
.I :ETCDIR:/ngircd.conf
Display a brief help text and exit.
.SH FILES
.I :ETCDIR:/ngircd.conf
{
ok = false;
#ifdef DEBUG
{
ok = false;
#ifdef DEBUG
- if( argv[i][n] == 'd' )
- {
+ if (argv[i][n] == 'd') {
NGIRCd_Debug = true;
ok = true;
}
#endif
NGIRCd_Debug = true;
ok = true;
}
#endif
- if( argv[i][n] == 'f' )
- {
+ if (argv[i][n] == 'f') {
if(( ! argv[i][n + 1] ) && ( i + 1 < argc ))
{
/* Ok, next character is a blank */
if(( ! argv[i][n + 1] ) && ( i + 1 < argc ))
{
/* Ok, next character is a blank */
- if( argv[i][n] == 'n' )
- {
+
+ if (argv[i][n] == 'h') {
+ Show_Version();
+ puts(""); Show_Help(); puts("");
+ exit(1);
+ }
+
+ if (argv[i][n] == 'n') {
NGIRCd_NoDaemon = true;
ok = true;
}
NGIRCd_NoDaemon = true;
ok = true;
}
- if( argv[i][n] == 'p' )
- {
+ if (argv[i][n] == 'p') {
NGIRCd_Passive = true;
ok = true;
}
#ifdef SNIFFER
NGIRCd_Passive = true;
ok = true;
}
#ifdef SNIFFER
- if( argv[i][n] == 's' )
- {
+ if (argv[i][n] == 's') {
NGIRCd_Sniffer = true;
ok = true;
}
#endif
NGIRCd_Sniffer = true;
ok = true;
}
#endif
- if( argv[i][n] == 't' )
- {
+ if (argv[i][n] == 't') {
configtest = true;
ok = true;
}
configtest = true;
ok = true;
}
+ if (argv[i][n] == 'V') {
+ Show_Version();
+ exit(1);
+ }
+
+ if (! ok) {
printf( "%s: invalid option \"-%c\"!\n", PACKAGE_NAME, argv[i][n] );
printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME );
exit( 1 );
printf( "%s: invalid option \"-%c\"!\n", PACKAGE_NAME, argv[i][n] );
printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME );
exit( 1 );
puts( " -s, --sniffer enable network sniffer and display all IRC traffic" );
#endif
puts( " -t, --configtest read, validate and display configuration; then exit" );
puts( " -s, --sniffer enable network sniffer and display all IRC traffic" );
#endif
puts( " -t, --configtest read, validate and display configuration; then exit" );
- puts( " --version output version information and exit" );
- puts( " --help display this help and exit" );
+ puts( " -V, --version output version information and exit" );
+ puts( " -h, --help display this help and exit" );