diff options
| author | Jari Aalto <jari.aalto@cante.net> | 2008-02-15 21:29:24 +0200 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2008-05-18 16:19:41 +0200 |
| commit | 818a206a4261f3d4153b0ab5c2025d77002290f5 (patch) | |
| tree | dcaaba1e0089792ec2f5deaac1e60ecea8316451 /src | |
| parent | 1d9067b01921da446166e4dfb684e42a67a1a6bf (diff) | |
| download | ngircd-818a206a4261f3d4153b0ab5c2025d77002290f5.tar.gz ngircd-818a206a4261f3d4153b0ab5c2025d77002290f5.zip | |
Add option aliases -V (for --version) and -h (for --help).
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>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngircd/ngircd.c | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index d839618f..4cf4ff42 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -166,14 +166,12 @@ main( int argc, const char *argv[] ) { ok = false; #ifdef DEBUG - if( argv[i][n] == 'd' ) - { + if (argv[i][n] == 'd') { 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 */ @@ -185,31 +183,38 @@ main( int argc, const char *argv[] ) ok = true; } } - 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; } - if( argv[i][n] == 'p' ) - { + if (argv[i][n] == 'p') { NGIRCd_Passive = true; ok = true; } #ifdef SNIFFER - if( argv[i][n] == 's' ) - { + if (argv[i][n] == 's') { NGIRCd_Sniffer = true; ok = true; } #endif - if( argv[i][n] == 't' ) - { + if (argv[i][n] == 't') { configtest = true; ok = true; } - if( ! ok ) - { + 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 ); @@ -577,8 +582,8 @@ Show_Help( void ) 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" ); } /* Show_Help */ |