th-libs: th_args.c annotate

annotate th_args.c @ 138:dab546dfb9b4

Oops, fix the new option handling options.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 25 Sep 2014 03:47:48 +0300
parents	0f43a94516f4
children	4ca0af6dbcf8

rev	line source
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * Simple commandline argument processing
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Programmed and designed by Matti 'ccr' Hamalainen
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	4 * (C) Copyright 2002-2008 Tecnic Software productions (TNSP)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 *
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 * Please read file 'COPYING' for information on license and distribution.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 */
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 /*
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 Description
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 ===========
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 Structures and functions for simple commandline argument processing,
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 option argument handling (short and long forms supported).
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 Output function for printing out short on-line help for said options
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15 and program commandline usage.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18 Format for typical commandline:
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20 $ program -a -b -c --long-d -e argument-for-e --long-f="argument for f"
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22 where -a, -b and -c are short options without required arguments;
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23 --long-d is a long option without argument; -e is short option with
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24 argument and finally --long-f is long option with argument.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27 Introduction
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 ============
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	29 Handling of commandline options in th_args_process() has various
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30 options, which effect how an option is handled. Also the error
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 situations (unknown option/no required argument) can be handled
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 in different ways.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34 Typically th_args_process() is called as follows:
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 BOOL optionHandlerCallback(int optionNumber, char optionArgument, char optionName)
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 {
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38 if (option is OK)
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 return TRUE;
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 else
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41 return FALSE;
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 BOOL nonoptionHandlerCallback(char *argumentString)
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 {
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46 // return value same as in optionHandlerCallback
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 int main(int argc, char *argv[])
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	51 {
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52 if (th_args_process(argc, argv, optList, optListN,
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 optionHandlerCallback, nonoptionHandlerCallback)) {
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54 ... arguments OK ...
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55 } else {
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	56 ... arguments invalid or required arguments missing ...
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	57 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	58 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	59
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	60
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	61 NOTICE!
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62 -------
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	63 The return value from handler callbacks affects the return value of
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	64 th_args_process(). Additionally, a failure in callback (returns FALSE)
137 0f43a94516f4 Improve argument handling module. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	65 effects the argument processing if OPTH_BAILOUT flag for th_args_process()
0f43a94516f4 Improve argument handling module. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	66 is set.
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67
137 0f43a94516f4 Improve argument handling module. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	68 If OPTH_BAILOUT is set, any error/failure in argument processing (including
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 callbacks) immediately stops the argument processing and FALSE is
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 returned from th_args_process().
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71
137 0f43a94516f4 Improve argument handling module. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	72 If OPTH_BAILOUT is NOT set, most errors are "ignored", but FALSE is still
0f43a94516f4 Improve argument handling module. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	73 returned if any errors occured.
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	75
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76 NOTICE #2!
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	77 ----------
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78 A small temporary buffer of N*sizeof(BOOL) (where N is number of
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79 options in optList[]) is allocated for processing required options.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80 If this allocation fails, the program is immediately exited with
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81 code 128.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84 Examples
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85 ========
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86 Example of different options, in a fictional optionlist struct:
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 optarg_t optList[] = {
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 // Option without arguments
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90 { 0, '?', "help", "Show this help", OPT_NONE },
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 // Option with a required argument
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93 { 1, 'o', "output", "Output file name", OPT_ARGREQ },
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95 // Option with only long form
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96 { 0, 0, "only-long", "Long option", OPT_NONE },
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98 // Option with only short form
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 { 0, 's', NULL, "Short option", OPT_NONE },
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101 };
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102
2 efaa9e3a8446 Typofix. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	103 const int optListN = (sizeof(optList) / sizeof(optarg_t));
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	104
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106 */
50 1fa969d0f551 Sync changes. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	107 #ifndef TH_EXTERNAL
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108 #include "th_util.h"
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 #include "th_args.h"
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110 #include "th_string.h"
49 598609fb49b0 Change how "config.h" is included, etc. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	111 #endif
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114 /* Check if option requires an argument
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115 */
47 c811c952d21d Constify. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	116 static BOOL th_args_check_arg(const optarg_t o, const char optArg)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117 {
46 5f73c8cd333a Change some structure member names in optarg_t. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	118 if ((o->flags & OPT_ARGMASK) == OPT_ARGREQ && optArg == NULL)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	119 {
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	120 if (o->optShort != 0 && o->optLong != NULL)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	121 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	122 THERR("Option '-%c ARG' (--%s=ARG) requires an argument!\n",
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	123 o->optShort, o->optLong);
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	124 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	125 else if (o->optShort != 0)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	126 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	127 THERR("Option '-%c ARG' requires an argument!\n", o->optShort);
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	128 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	129 else if (o->optLong != NULL)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	130 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	131 THERR("Option --%s=ARG requires an argument!\n", o->optLong);
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	132 }
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	133
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	134 return FALSE;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	135 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	136 else
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	137 return TRUE;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 /* Handle short options
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 */
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 static BOOL th_args_process_short(char currArg, int newArgIndex,
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	144 int argc, char *argv[],
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	145 optarg_t optList[], int optListN,
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	146 BOOL (handleOpt)(int, char , char *))
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	148 char tmpArg = currArg, optArg;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	149 int optN;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	150 BOOL isFound;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	151
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	152 // Short options can be combined: -a -b -c == -abc
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	153 while (*tmpArg)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	154 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	155 for (optN = 0, isFound = FALSE; (optN < optListN) && !isFound; optN++)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	156 if (*tmpArg == optList[optN].optShort)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	157 {
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	158 // Get possible option argument, if needed
46 5f73c8cd333a Change some structure member names in optarg_t. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	159 if ((optList[optN].flags & OPT_ARGMASK) != 0
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	160 && (++(*newArgIndex) < argc))
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	161 optArg = argv[*newArgIndex];
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	162 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	163 optArg = NULL;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	164
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	165 // Check if option argument is required
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	166 if (!th_args_check_arg(&optList[optN], optArg))
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	167 return FALSE;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	168 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	169 {
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	170 char tmpStr[2] = { 0, 0 };
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	172 // Option was given succesfully, try to handle it
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	173 tmpStr[0] = *tmpArg;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	174
46 5f73c8cd333a Change some structure member names in optarg_t. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	175 if (!handleOpt(optList[optN].id, optArg, tmpStr))
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	176 return FALSE;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	177 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	178
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	179 isFound = TRUE;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	180 }
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	181
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	182 if (!isFound)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	183 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	184 THERR("Unknown short option '%c' in argument '-%s'\n",
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	185 *tmpArg, currArg);
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	186 return FALSE;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	187 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	189 tmpArg++;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	190 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	192 return TRUE;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	194
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196 /* Handle long options
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197 */
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198 static BOOL th_args_process_long(char currArg, int newArgIndex,
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	199 int argc, char *argv[],
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	200 optarg_t optList[], int optListN,
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	201 BOOL (handleOpt)(int, char , char *))
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	203 int optN, optLen, i;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	204 char *optArg;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	205
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	206 (void) argc;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	207 (void) argv;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	208 (void) newArgIndex;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	209
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	210 // Long option
c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	211 for (optN = -1, optLen = i = 0; i < optListN && optN < 0; i++)
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	212 {
286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	213 optarg_t *opt = &optList[i];
286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	214 if (opt->optLong)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	215 {
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	216 optLen = strlen(opt->optLong);
286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	217 if (strncmp(currArg, opt->optLong, optLen) == 0)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	218 optN = i;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	219 }
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	220 }
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	221
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	222 // Get possible option argument, if needed
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	223 if (optN >= 0)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	224 {
46 5f73c8cd333a Change some structure member names in optarg_t. Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	225 if ((optList[optN].flags & OPT_ARGMASK) != 0)
127 37bf3d8766b7 Fix long option parsing. I wonder how long that has been broken. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	226 optArg = (currArg[optLen] == '=') ? &currArg[optLen + 1] : NULL;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	227 else
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	228 optArg = NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	229
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	230 // Check if option argument is required
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	231 if (!th_args_check_arg(&optList[optN], optArg))
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	232 return FALSE;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	233 else
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	234 // Option was given succesfully, try to handle it
286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	235 if (!handleOpt(optList[optN].id, optArg, currArg))
286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	236 return FALSE;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	237 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	238 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	239 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	240 THERR("Unknown long option '--%s'\n", currArg);
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	241 return FALSE;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	242 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	243
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	244 return TRUE;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	245 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	247
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	248 /* Process arguments, handling short and long options by
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249 * calling the given callback functions.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	250 */
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	251 BOOL th_args_process(int argc, char *argv[],
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	252 optarg_t optList[], int optListN,
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	253 BOOL(handleOpt) (int, char , char *),
137 0f43a94516f4 Improve argument handling module. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	254 BOOL(handleNonOption) (char ), int flags)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	255 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	256 BOOL endOptions, optionsOK;
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	257 int argIndex, newArgIndex;
137 0f43a94516f4 Improve argument handling module. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	258 int handle = flags & OPTH_ONLY_MASK;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	260 // Parse arguments
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	261 argIndex = 1;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	262 optionsOK = TRUE;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	263 endOptions = FALSE;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	264 while (argIndex < argc)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	265 {
137 0f43a94516f4 Improve argument handling module. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	266 char *currArg = argv[argIndex];
138 dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	267 if (*currArg == '-' && !endOptions)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	268 {
138 dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	269 if (handle == OPTH_ONLY_OPTS \|\| handle == 0)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	270 {
138 dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	271 newArgIndex = argIndex;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	272 currArg++;
138 dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	273 if (*currArg == '-')
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	274 {
138 dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	275 // Check for "--", which ends the options-list
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	276 currArg++;
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	277 if (*currArg == 0)
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	278 {
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	279 endOptions = TRUE;
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	280 continue;
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	281 }
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	282
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	283 // Long options
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	284 if (!th_args_process_long(currArg, &newArgIndex,
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	285 argc, argv, optList,
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	286 optListN, handleOpt))
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	287 optionsOK = FALSE;
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	288 }
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	289 else
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	290 {
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	291 // Short options
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	292 if (!th_args_process_short(currArg, &newArgIndex,
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	293 argc, argv, optList,
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	294 optListN, handleOpt))
dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	295 optionsOK = FALSE;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	296 }
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	297
138 dab546dfb9b4 Oops, fix the new option handling options. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	298 argIndex = newArgIndex;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	299 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	300 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	301 else
137 0f43a94516f4 Improve argument handling module. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	302 if (handle == OPTH_ONLY_OTHER \|\| handle == 0)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	303 {
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	304 // Was not option argument
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	305 if (handleNonOption == NULL
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	306 \|\| (handleNonOption != NULL && !handleNonOption(currArg)))
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	307 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	308 THERR("Invalid argument '%s'\n", currArg);
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	309 optionsOK = FALSE;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	310 }
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	311 }
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	312
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	313 // Check if we bail out on invalid argument
137 0f43a94516f4 Improve argument handling module. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	314 if (!optionsOK && (flags & OPTH_BAILOUT))
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	315 return FALSE;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	316
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	317 argIndex++;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	318 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	319
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	320 return optionsOK;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	322
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	323
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	324 /* Print help for commandline arguments/options
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325 */
50 1fa969d0f551 Sync changes. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	326 void th_args_help(FILE *outFile, optarg_t optList[], int optListN)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327 {
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	328 int index;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	329
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	330 for (index = 0; index < optListN; index++)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	331 {
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	332 optarg_t *opt = &optList[index];
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	333
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	334 // Print short option
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	335 if (opt->optShort != 0)
286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	336 fprintf(outFile, " -%c, ", opt->optShort);
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	337 else
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	338 fprintf(outFile, " ");
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	339
128 c22caa6e3fcb Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	340 // Print long option
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	341 if (opt->optLong)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	342 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	343 char tmpStr[64], *p;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	344
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	345 if ((opt->flags & OPT_ARGMASK) == OPT_ARGREQ)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	346 {
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	347 snprintf(tmpStr, sizeof(tmpStr), "%s=ARG",
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	348 opt->optLong);
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	349 p = tmpStr;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	350 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	351 else
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	352 p = opt->optLong;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	353
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	354 fprintf(outFile, "--%-15s", p);
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	355 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	356 else
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	357 fprintf(outFile, " ");
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358
136 286b2249c5d2 Clean up th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	359 fprintf(outFile, " %s.\n", opt->desc);
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	360 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361 }

Mercurial > hg > th-libs

annotate th_args.c @ 138:dab546dfb9b4