notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

show_usage takes exit code, and knows what to do

Browse source
This commit is contained in:
Albert Cahalan 2009-11-21 05:10:44 +00:00
parent 034d5c9fb9
commit a9b8f6ea1c
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/parse.gperf
View file

@ -47,13 +47,13 @@ static void imm_verbose_version(void)
static void imm_usage(void) static void imm_usage(void)
{ {
// show_usage(stdout,"tuxpaint"); // show_usage(0);
} }
static void imm_help(void) static void imm_help(void)
{ {
// show_version(0); // show_version(0);
// show_usage(stdout,"tuxpaint"); // show_usage(0);
} }
static void imm_copying(void) static void imm_copying(void)

16
src/tuxpaint.c
View file

@ -1506,7 +1506,10 @@ static void brush_draw(int x1, int y1, int x2, int y2, int update);
static void blit_brush(int x, int y, int direction); static void blit_brush(int x, int y, int direction);
static void stamp_draw(int x, int y); static void stamp_draw(int x, int y);
static void rec_undo_buffer(void); static void rec_undo_buffer(void);
static void show_usage(FILE * f, char *prg);
static void show_usage(int exitcode);
static char *progname;
static SDL_Cursor *get_cursor(unsigned char *bits, unsigned char *mask_bits, static SDL_Cursor *get_cursor(unsigned char *bits, unsigned char *mask_bits,
unsigned int w, unsigned int h, unsigned int w, unsigned int h,
unsigned int x, unsigned int y); unsigned int x, unsigned int y);
@ -5491,12 +5494,13 @@ static void show_version(int details)
/* Show usage display: */ /* Show usage display: */
static void show_usage(FILE * f, char *prg) static void show_usage(int exitcode)
{ {
FILE *f = exitcode ? stderr : stdout;
char *blank; char *blank;
unsigned i; unsigned i;
blank = strdup(prg); blank = strdup(progname);
for (i = 0; i < strlen(blank); i++) for (i = 0; i < strlen(blank); i++)
blank[i] = ' '; blank[i] = ' ';
@ -5548,7 +5552,7 @@ static void show_usage(FILE * f, char *prg)
" %s [--nolockfile]\n" " %s [--nolockfile]\n"
" %s [--colorfile FILE]\n" " %s [--colorfile FILE]\n"
"\n", "\n",
prg, prg, progname, progname,
blank, blank, blank, blank, blank, blank, blank, blank,
blank, blank, blank, blank, blank, blank, blank, blank,
blank, blank, blank, blank, blank, blank, blank, blank,
@ -18926,8 +18930,7 @@ static void parse_argv_options(struct cfginfo *restrict tmpcfg, char *argv[])
continue; continue;
} }
fprintf(stderr, "%s is not understood\n", *argv); fprintf(stderr, "%s is not understood\n", *argv);
show_usage(stderr, (char *) getfilename(progname)); show_usage(63);
exit(1);
} }
} }
@ -20458,6 +20461,7 @@ int main(int argc, char *argv[])
CLOCK_ASM(time1); CLOCK_ASM(time1);
// do not add code (slowness) here unless required for scanning fonts // do not add code (slowness) here unless required for scanning fonts
progname = argv[0];
chdir_to_binary(argv[0]); chdir_to_binary(argv[0]);
setup_config(argv); setup_config(argv);
setup_language(getfilename(argv[0]), &button_label_y_nudge); setup_language(getfilename(argv[0]), &button_label_y_nudge);