Mercurial > hg
changeset 1257:05dc45e7c7bb
Add command line option -v
(Suggested by Wolfram Schlich)
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Tue, 26 Jun 2007 20:35:02 +0200 |
parents | ea679e3598a9 |
children | 7691eb8c8e55 |
files | mcabber/doc/mcabber.1 mcabber/doc/mcabber.1.html mcabber/doc/mcabber.1.txt mcabber/src/main.c |
diffstat | 4 files changed, 34 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/doc/mcabber.1 Tue Jun 26 19:16:15 2007 +0200 +++ b/mcabber/doc/mcabber.1 Tue Jun 26 20:35:02 2007 +0200 @@ -4,7 +4,7 @@ .\" Manual: .\" Source: .\" -.TH "MCABBER" "1" "06/17/2007" "" "" +.TH "MCABBER" "1" "06/26/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,7 @@ .SH "NAME" mcabber \- a simple Jabber console client .SH "SYNOPSIS" -\fImcabber\fR [ \-f configfile ] [ \-\-help | \-h ] +\fImcabber\fR [ \-h | \-v | \-f configfile ] .sp .SH "DESCRIPTION" mcabber(1) is a small Jabber console client. For now it needs a configuration file to start, so please copy the sample mcabberrc file and adapt your connection settings.
--- a/mcabber/doc/mcabber.1.html Tue Jun 26 19:16:15 2007 +0200 +++ b/mcabber/doc/mcabber.1.html Tue Jun 26 20:35:02 2007 +0200 @@ -17,7 +17,7 @@ </p> <div id="synopsis"> <h2>SYNOPSIS</h2> -<p><b>mcabber</b> [ -f configfile ] [ --help | -h ]</p> +<p><b>mcabber</b> [ -h | -v | -f configfile ]</p> </div> <h2>DESCRIPTION</h2> <p><tt>mcabber(1)</tt> is a small Jabber console client.<br /> @@ -1314,7 +1314,7 @@ <div id="footer"> <p> Version 0.9.4-dev<br /> -Last updated 17-Jun-2007 17:36:09 CEST +Last updated 26-Jun-2007 20:28:19 CEST </p> </div> </div>
--- a/mcabber/doc/mcabber.1.txt Tue Jun 26 19:16:15 2007 +0200 +++ b/mcabber/doc/mcabber.1.txt Tue Jun 26 20:35:02 2007 +0200 @@ -9,7 +9,7 @@ SYNOPSIS -------- -'mcabber' [ -f configfile ] [ --help | -h ] +'mcabber' [ -h | -v | -f configfile ] DESCRIPTION -----------
--- a/mcabber/src/main.c Tue Jun 26 19:16:15 2007 +0200 +++ b/mcabber/src/main.c Tue Jun 26 20:35:02 2007 +0200 @@ -247,7 +247,29 @@ g_free(v); } -void main_init_pgp(void) +static void compile_options(void) +{ + puts("Installation data directory: " DATA_DIR "\n"); +#ifdef HAVE_UNICODE + puts("Compiled with unicode support."); +#endif +#ifdef HAVE_OPENSSL + puts("Compiled with OpenSSL support."); +#elif defined HAVE_GNUTLS + puts("Compiled with GnuTLS support."); +#endif +#ifdef HAVE_GPGME + puts("Compiled with GPG support."); +#endif +#ifdef WITH_ASPELL + puts("Compiled with Aspell support."); +#endif +#ifdef DEBUG_ENABLE + puts("Compiled with debugging support."); +#endif +} + +static void main_init_pgp(void) { #ifdef HAVE_GPGME const char *pk, *pp; @@ -318,15 +340,18 @@ /* Parse command line options */ while (1) { - int c = getopt(argc, argv, "hf:"); + int c = getopt(argc, argv, "hvf:"); if (c == -1) { break; } else switch (c) { case 'h': case '?': - printf("Usage: %s [-f mcabberrc_file]\n\n", argv[0]); + printf("Usage: %s [-h|-v|-f mcabberrc_file]\n\n", argv[0]); return (c == 'h' ? 0 : -1); + case 'v': + compile_options(); + return 0; case 'f': configFile = g_strdup(optarg); break; @@ -334,7 +359,7 @@ } if (optind < argc) { - fprintf(stderr, "Usage: %s [-f mcabberrc_file]\n\n", argv[0]); + fprintf(stderr, "Usage: %s [-h|-v|-f mcabberrc_file]\n\n", argv[0]); return -1; }