diff options
| author | wkendrick <wkendrick> | 2011-04-14 06:31:24 (GMT) |
|---|---|---|
| committer | wkendrick <wkendrick> | 2011-04-14 06:31:24 (GMT) |
| commit | e10ac949fc95e321d82480de5cf3abf128d5b0bb (patch) | |
| tree | 7e6414553c9628561bb89260b3fa08a8a331b8ec | |
| parent | 0a44ab9a2e48f343110aa7296e3e7bc21b5cef49 (diff) | |
Resurrecting informational options (--help, --usage, --version, --verbose-version)
| -rw-r--r-- | src/parse.gperf | 12 | ||||
| -rw-r--r-- | src/tuxpaint.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/parse.gperf b/src/parse.gperf index f5006fa..4c3f527 100644 --- a/src/parse.gperf +++ b/src/parse.gperf @@ -38,28 +38,28 @@ struct cfg static void imm_version(void) { -// show_version(0); + show_version(0); } static void imm_verbose_version(void) { -// show_version(1); + show_version(1); } static void imm_usage(void) { -// show_usage(0); + show_usage(0); } static void imm_help(void) { -// show_version(0); -// show_usage(0); + show_version(0); + show_usage(0); } static void imm_copying(void) { -// show_version(0); + show_version(0); printf("\n" "This program is free software; you can redistribute it\n" "and/or modify it under the terms of the GNU General Public\n" diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 55e4b11..43ba206 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -1617,7 +1617,7 @@ static void blit_brush(int x, int y, int direction); static void stamp_draw(int x, int y); static void rec_undo_buffer(void); -static void show_usage(int exitcode); +void show_usage(int exitcode); static char *progname; static SDL_Cursor *get_cursor(unsigned char *bits, unsigned char *mask_bits, @@ -6233,7 +6233,7 @@ static void rec_undo_buffer(void) /* Show program version: */ -static void show_version(int details) +void show_version(int details) { printf("\nTux Paint\n"); printf(" Version " VER_VERSION " (" VER_DATE ")\n"); @@ -6363,7 +6363,7 @@ static void show_version(int details) /* Show usage display: */ -static void show_usage(int exitcode) +void show_usage(int exitcode) { FILE *f = exitcode ? stderr : stdout; char *blank; @@ -20969,7 +20969,7 @@ static void parse_argv_options(struct cfginfo *restrict tmpcfg, char *argv[]) {"-h", "help"}, {"-u", "usage"}, {"-v", "version"}, - {"-vv", "version-verbose"}, + {"-vv", "verbose-version"}, {"-l", "lang"}, {"-L", "locale"}, {"-b", "startblank"}, |