--- branches/development/src/applications/simpleBuilder/simpleBuilderCmd.c 2010/07/09 23:08:25 1465 +++ branches/development/src/applications/simpleBuilder/simpleBuilderCmd.c 2011/09/14 21:40:12 1630 @@ -1,7 +1,7 @@ /* - File autogenerated by gengetopt version 2.16 + File autogenerated by gengetopt version 2.22.4 generated with the following command: - gengetopt -F simpleBuilderCmd --unamed-opts + gengetopt -F simpleBuilderCmd -u The developers of gengetopt consider the fixed text that goes in all gengetopt output files to be in the public domain: @@ -17,17 +17,45 @@ #include #include -#include "getopt.h" +#ifndef FIX_UNUSED +#define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */ +#endif +#include + #include "simpleBuilderCmd.h" +const char *gengetopt_args_info_purpose = ""; + +const char *gengetopt_args_info_usage = "Usage: simpleBuilder [OPTIONS]... [FILES]..."; + +const char *gengetopt_args_info_description = ""; + +const char *gengetopt_args_info_help[] = { + " -h, --help Print help and exit", + " -V, --version Print version and exit", + " -o, --output=STRING Output file name", + " --density=DOUBLE density (g/cm^3)", + " --nx=INT number of unit cells in x", + " --ny=INT number of unit cells in y", + " --nz=INT number of unit cells in z", + 0 +}; + +typedef enum {ARG_NO + , ARG_STRING + , ARG_INT + , ARG_DOUBLE +} cmdline_parser_arg_type; + static void clear_given (struct gengetopt_args_info *args_info); static void clear_args (struct gengetopt_args_info *args_info); static int -cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required, const char *additional_error); +cmdline_parser_internal (int argc, char **argv, struct gengetopt_args_info *args_info, + struct cmdline_parser_params *params, const char *additional_error); static int cmdline_parser_required2 (struct gengetopt_args_info *args_info, const char *prog_name, const char *additional_error); @@ -50,6 +78,7 @@ void clear_args (struct gengetopt_args_info *args_info static void clear_args (struct gengetopt_args_info *args_info) { + FIX_UNUSED (args_info); args_info->output_arg = NULL; args_info->output_orig = NULL; args_info->density_orig = NULL; @@ -59,25 +88,51 @@ void clear_args (struct gengetopt_args_info *args_info } +static +void init_args_info(struct gengetopt_args_info *args_info) +{ + + + args_info->help_help = gengetopt_args_info_help[0] ; + args_info->version_help = gengetopt_args_info_help[1] ; + args_info->output_help = gengetopt_args_info_help[2] ; + args_info->density_help = gengetopt_args_info_help[3] ; + args_info->nx_help = gengetopt_args_info_help[4] ; + args_info->ny_help = gengetopt_args_info_help[5] ; + args_info->nz_help = gengetopt_args_info_help[6] ; + +} + void cmdline_parser_print_version (void) { - printf ("%s %s\n", CMDLINE_PARSER_PACKAGE, CMDLINE_PARSER_VERSION); + printf ("%s %s\n", + (strlen(CMDLINE_PARSER_PACKAGE_NAME) ? CMDLINE_PARSER_PACKAGE_NAME : CMDLINE_PARSER_PACKAGE), + CMDLINE_PARSER_VERSION); } +static void print_help_common(void) { + cmdline_parser_print_version (); + + if (strlen(gengetopt_args_info_purpose) > 0) + printf("\n%s\n", gengetopt_args_info_purpose); + + if (strlen(gengetopt_args_info_usage) > 0) + printf("\n%s\n", gengetopt_args_info_usage); + + printf("\n"); + + if (strlen(gengetopt_args_info_description) > 0) + printf("%s\n\n", gengetopt_args_info_description); +} + void cmdline_parser_print_help (void) { - cmdline_parser_print_version (); - printf("\nUsage: simpleBuilder [OPTIONS]... [FILES]...\n\n"); - printf("%s\n"," -h, --help Print help and exit"); - printf("%s\n"," -V, --version Print version and exit"); - printf("%s\n"," -o, --output=STRING Output file name"); - printf("%s\n"," --density=DOUBLE density (g/cm^3)"); - printf("%s\n"," --nx=INT number of unit cells in x"); - printf("%s\n"," --ny=INT number of unit cells in y"); - printf("%s\n"," --nz=INT number of unit cells in z"); - + int i = 0; + print_help_common(); + while (gengetopt_args_info_help[i]) + printf("%s\n", gengetopt_args_info_help[i++]); } void @@ -85,57 +140,111 @@ cmdline_parser_init (struct gengetopt_args_info *args_ { clear_given (args_info); clear_args (args_info); + init_args_info (args_info); - args_info->inputs = NULL; + args_info->inputs = 0; args_info->inputs_num = 0; } +void +cmdline_parser_params_init(struct cmdline_parser_params *params) +{ + if (params) + { + params->override = 0; + params->initialize = 1; + params->check_required = 1; + params->check_ambiguity = 0; + params->print_errors = 1; + } +} + +struct cmdline_parser_params * +cmdline_parser_params_create(void) +{ + struct cmdline_parser_params *params = + (struct cmdline_parser_params *)malloc(sizeof(struct cmdline_parser_params)); + cmdline_parser_params_init(params); + return params; +} + static void -cmdline_parser_release (struct gengetopt_args_info *args_info) +free_string_field (char **s) { - - unsigned int i; - if (args_info->output_arg) + if (*s) { - free (args_info->output_arg); /* free previous argument */ - args_info->output_arg = 0; + free (*s); + *s = 0; } - if (args_info->output_orig) - { - free (args_info->output_orig); /* free previous argument */ - args_info->output_orig = 0; - } - if (args_info->density_orig) - { - free (args_info->density_orig); /* free previous argument */ - args_info->density_orig = 0; - } - if (args_info->nx_orig) - { - free (args_info->nx_orig); /* free previous argument */ - args_info->nx_orig = 0; - } - if (args_info->ny_orig) - { - free (args_info->ny_orig); /* free previous argument */ - args_info->ny_orig = 0; - } - if (args_info->nz_orig) - { - free (args_info->nz_orig); /* free previous argument */ - args_info->nz_orig = 0; - } +} + + +static void +cmdline_parser_release (struct gengetopt_args_info *args_info) +{ + unsigned int i; + free_string_field (&(args_info->output_arg)); + free_string_field (&(args_info->output_orig)); + free_string_field (&(args_info->density_orig)); + free_string_field (&(args_info->nx_orig)); + free_string_field (&(args_info->ny_orig)); + free_string_field (&(args_info->nz_orig)); + for (i = 0; i < args_info->inputs_num; ++i) free (args_info->inputs [i]); - + if (args_info->inputs_num) free (args_info->inputs); - + clear_given (args_info); } + +static void +write_into_file(FILE *outfile, const char *opt, const char *arg, const char *values[]) +{ + FIX_UNUSED (values); + if (arg) { + fprintf(outfile, "%s=\"%s\"\n", opt, arg); + } else { + fprintf(outfile, "%s\n", opt); + } +} + + int +cmdline_parser_dump(FILE *outfile, struct gengetopt_args_info *args_info) +{ + int i = 0; + + if (!outfile) + { + fprintf (stderr, "%s: cannot dump options to stream\n", CMDLINE_PARSER_PACKAGE); + return EXIT_FAILURE; + } + + if (args_info->help_given) + write_into_file(outfile, "help", 0, 0 ); + if (args_info->version_given) + write_into_file(outfile, "version", 0, 0 ); + if (args_info->output_given) + write_into_file(outfile, "output", args_info->output_orig, 0); + if (args_info->density_given) + write_into_file(outfile, "density", args_info->density_orig, 0); + if (args_info->nx_given) + write_into_file(outfile, "nx", args_info->nx_orig, 0); + if (args_info->ny_given) + write_into_file(outfile, "ny", args_info->ny_orig, 0); + if (args_info->nz_given) + write_into_file(outfile, "nz", args_info->nz_orig, 0); + + + i = EXIT_SUCCESS; + return i; +} + +int cmdline_parser_file_save(const char *filename, struct gengetopt_args_info *args_info) { FILE *outfile; @@ -149,51 +258,9 @@ cmdline_parser_file_save(const char *filename, struct return EXIT_FAILURE; } - if (args_info->help_given) { - fprintf(outfile, "%s\n", "help"); - } - if (args_info->version_given) { - fprintf(outfile, "%s\n", "version"); - } - if (args_info->output_given) { - if (args_info->output_orig) { - fprintf(outfile, "%s=\"%s\"\n", "output", args_info->output_orig); - } else { - fprintf(outfile, "%s\n", "output"); - } - } - if (args_info->density_given) { - if (args_info->density_orig) { - fprintf(outfile, "%s=\"%s\"\n", "density", args_info->density_orig); - } else { - fprintf(outfile, "%s\n", "density"); - } - } - if (args_info->nx_given) { - if (args_info->nx_orig) { - fprintf(outfile, "%s=\"%s\"\n", "nx", args_info->nx_orig); - } else { - fprintf(outfile, "%s\n", "nx"); - } - } - if (args_info->ny_given) { - if (args_info->ny_orig) { - fprintf(outfile, "%s=\"%s\"\n", "ny", args_info->ny_orig); - } else { - fprintf(outfile, "%s\n", "ny"); - } - } - if (args_info->nz_given) { - if (args_info->nz_orig) { - fprintf(outfile, "%s=\"%s\"\n", "nz", args_info->nz_orig); - } else { - fprintf(outfile, "%s\n", "nz"); - } - } - + i = cmdline_parser_dump(outfile, args_info); fclose (outfile); - i = EXIT_SUCCESS; return i; } @@ -203,13 +270,11 @@ cmdline_parser_free (struct gengetopt_args_info *args_ cmdline_parser_release (args_info); } - -/* gengetopt_strdup() */ -/* strdup.c replacement of strdup, which is not standard */ +/** @brief replacement of strdup, which is not standard */ char * gengetopt_strdup (const char *s) { - char *result = NULL; + char *result = 0; if (!s) return result; @@ -221,18 +286,41 @@ int } int -cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info) +cmdline_parser (int argc, char **argv, struct gengetopt_args_info *args_info) { return cmdline_parser2 (argc, argv, args_info, 0, 1, 1); } int -cmdline_parser2 (int argc, char * const *argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required) +cmdline_parser_ext (int argc, char **argv, struct gengetopt_args_info *args_info, + struct cmdline_parser_params *params) { int result; + result = cmdline_parser_internal (argc, argv, args_info, params, 0); - result = cmdline_parser_internal (argc, argv, args_info, override, initialize, check_required, NULL); + if (result == EXIT_FAILURE) + { + cmdline_parser_free (args_info); + exit (EXIT_FAILURE); + } + + return result; +} +int +cmdline_parser2 (int argc, char **argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required) +{ + int result; + struct cmdline_parser_params params; + + params.override = override; + params.initialize = initialize; + params.check_required = check_required; + params.check_ambiguity = 0; + params.print_errors = 1; + + result = cmdline_parser_internal (argc, argv, args_info, ¶ms, 0); + if (result == EXIT_FAILURE) { cmdline_parser_free (args_info); @@ -247,7 +335,7 @@ cmdline_parser_required (struct gengetopt_args_info *a { int result = EXIT_SUCCESS; - if (cmdline_parser_required2(args_info, prog_name, NULL) > 0) + if (cmdline_parser_required2(args_info, prog_name, 0) > 0) result = EXIT_FAILURE; if (result == EXIT_FAILURE) @@ -263,43 +351,183 @@ cmdline_parser_required2 (struct gengetopt_args_info * cmdline_parser_required2 (struct gengetopt_args_info *args_info, const char *prog_name, const char *additional_error) { int error = 0; + FIX_UNUSED (additional_error); + /* checks for required options */ if (! args_info->output_given) { fprintf (stderr, "%s: '--output' ('-o') option required%s\n", prog_name, (additional_error ? additional_error : "")); error = 1; } + if (! args_info->density_given) { fprintf (stderr, "%s: '--density' option required%s\n", prog_name, (additional_error ? additional_error : "")); error = 1; } + if (! args_info->nx_given) { fprintf (stderr, "%s: '--nx' option required%s\n", prog_name, (additional_error ? additional_error : "")); error = 1; } + if (! args_info->ny_given) { fprintf (stderr, "%s: '--ny' option required%s\n", prog_name, (additional_error ? additional_error : "")); error = 1; } + if (! args_info->nz_given) { fprintf (stderr, "%s: '--nz' option required%s\n", prog_name, (additional_error ? additional_error : "")); error = 1; } + + + /* checks for dependences among options */ return error; } + +static char *package_name = 0; + +/** + * @brief updates an option + * @param field the generic pointer to the field to update + * @param orig_field the pointer to the orig field + * @param field_given the pointer to the number of occurrence of this option + * @param prev_given the pointer to the number of occurrence already seen + * @param value the argument for this option (if null no arg was specified) + * @param possible_values the possible values for this option (if specified) + * @param default_value the default value (in case the option only accepts fixed values) + * @param arg_type the type of this option + * @param check_ambiguity @see cmdline_parser_params.check_ambiguity + * @param override @see cmdline_parser_params.override + * @param no_free whether to free a possible previous value + * @param multiple_option whether this is a multiple option + * @param long_opt the corresponding long option + * @param short_opt the corresponding short option (or '-' if none) + * @param additional_error possible further error specification + */ +static +int update_arg(void *field, char **orig_field, + unsigned int *field_given, unsigned int *prev_given, + char *value, const char *possible_values[], + const char *default_value, + cmdline_parser_arg_type arg_type, + int check_ambiguity, int override, + int no_free, int multiple_option, + const char *long_opt, char short_opt, + const char *additional_error) +{ + char *stop_char = 0; + const char *val = value; + int found; + char **string_field; + FIX_UNUSED (field); + + stop_char = 0; + found = 0; + + if (!multiple_option && prev_given && (*prev_given || (check_ambiguity && *field_given))) + { + if (short_opt != '-') + fprintf (stderr, "%s: `--%s' (`-%c') option given more than once%s\n", + package_name, long_opt, short_opt, + (additional_error ? additional_error : "")); + else + fprintf (stderr, "%s: `--%s' option given more than once%s\n", + package_name, long_opt, + (additional_error ? additional_error : "")); + return 1; /* failure */ + } + + FIX_UNUSED (default_value); + + if (field_given && *field_given && ! override) + return 0; + if (prev_given) + (*prev_given)++; + if (field_given) + (*field_given)++; + if (possible_values) + val = possible_values[found]; + + switch(arg_type) { + case ARG_INT: + if (val) *((int *)field) = strtol (val, &stop_char, 0); + break; + case ARG_DOUBLE: + if (val) *((double *)field) = strtod (val, &stop_char); + break; + case ARG_STRING: + if (val) { + string_field = (char **)field; + if (!no_free && *string_field) + free (*string_field); /* free previous string */ + *string_field = gengetopt_strdup (val); + } + break; + default: + break; + }; + + /* check numeric conversion */ + switch(arg_type) { + case ARG_INT: + case ARG_DOUBLE: + if (val && !(stop_char && *stop_char == '\0')) { + fprintf(stderr, "%s: invalid numeric value: %s\n", package_name, val); + return 1; /* failure */ + } + break; + default: + ; + }; + + /* store the original value */ + switch(arg_type) { + case ARG_NO: + break; + default: + if (value && orig_field) { + if (no_free) { + *orig_field = value; + } else { + if (*orig_field) + free (*orig_field); /* free previous string */ + *orig_field = gengetopt_strdup (value); + } + } + }; + + return 0; /* OK */ +} + + int -cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required, const char *additional_error) +cmdline_parser_internal ( + int argc, char **argv, struct gengetopt_args_info *args_info, + struct cmdline_parser_params *params, const char *additional_error) { int c; /* Character of the parsed option. */ int error = 0; struct gengetopt_args_info local_args_info; + + int override; + int initialize; + int check_required; + int check_ambiguity; + + package_name = argv[0]; + + override = params->override; + initialize = params->initialize; + check_required = params->check_required; + check_ambiguity = params->check_ambiguity; if (initialize) cmdline_parser_init (args_info); @@ -308,13 +536,12 @@ cmdline_parser_internal (int argc, char * const *argv, optarg = 0; optind = 0; - opterr = 1; + opterr = params->print_errors; optopt = '?'; while (1) { int option_index = 0; - char *stop_char; static struct option long_options[] = { { "help", 0, NULL, 'h' }, @@ -324,10 +551,9 @@ cmdline_parser_internal (int argc, char * const *argv, { "nx", 1, NULL, 0 }, { "ny", 1, NULL, 0 }, { "nz", 1, NULL, 0 }, - { NULL, 0, NULL, 0 } + { 0, 0, 0, 0 } }; - stop_char = 0; c = getopt_long (argc, argv, "hVo:", long_options, &option_index); if (c == -1) break; /* Exit from `while (1)' loop. */ @@ -345,108 +571,74 @@ cmdline_parser_internal (int argc, char * const *argv, exit (EXIT_SUCCESS); case 'o': /* Output file name. */ - if (local_args_info.output_given) - { - fprintf (stderr, "%s: `--output' (`-o') option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); - goto failure; - } - if (args_info->output_given && ! override) - continue; - local_args_info.output_given = 1; - args_info->output_given = 1; - if (args_info->output_arg) - free (args_info->output_arg); /* free previous string */ - args_info->output_arg = gengetopt_strdup (optarg); - if (args_info->output_orig) - free (args_info->output_orig); /* free previous string */ - args_info->output_orig = gengetopt_strdup (optarg); + + + if (update_arg( (void *)&(args_info->output_arg), + &(args_info->output_orig), &(args_info->output_given), + &(local_args_info.output_given), optarg, 0, 0, ARG_STRING, + check_ambiguity, override, 0, 0, + "output", 'o', + additional_error)) + goto failure; + break; - case 0: /* Long option with no short option */ /* density (g/cm^3). */ if (strcmp (long_options[option_index].name, "density") == 0) { - if (local_args_info.density_given) - { - fprintf (stderr, "%s: `--density' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); - goto failure; - } - if (args_info->density_given && ! override) - continue; - local_args_info.density_given = 1; - args_info->density_given = 1; - args_info->density_arg = strtod (optarg, &stop_char); - if (!(stop_char && *stop_char == '\0')) { - fprintf(stderr, "%s: invalid numeric value: %s\n", argv[0], optarg); + + + if (update_arg( (void *)&(args_info->density_arg), + &(args_info->density_orig), &(args_info->density_given), + &(local_args_info.density_given), optarg, 0, 0, ARG_DOUBLE, + check_ambiguity, override, 0, 0, + "density", '-', + additional_error)) goto failure; - } - if (args_info->density_orig) - free (args_info->density_orig); /* free previous string */ - args_info->density_orig = gengetopt_strdup (optarg); + } /* number of unit cells in x. */ else if (strcmp (long_options[option_index].name, "nx") == 0) { - if (local_args_info.nx_given) - { - fprintf (stderr, "%s: `--nx' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); - goto failure; - } - if (args_info->nx_given && ! override) - continue; - local_args_info.nx_given = 1; - args_info->nx_given = 1; - args_info->nx_arg = strtol (optarg, &stop_char, 0); - if (!(stop_char && *stop_char == '\0')) { - fprintf(stderr, "%s: invalid numeric value: %s\n", argv[0], optarg); + + + if (update_arg( (void *)&(args_info->nx_arg), + &(args_info->nx_orig), &(args_info->nx_given), + &(local_args_info.nx_given), optarg, 0, 0, ARG_INT, + check_ambiguity, override, 0, 0, + "nx", '-', + additional_error)) goto failure; - } - if (args_info->nx_orig) - free (args_info->nx_orig); /* free previous string */ - args_info->nx_orig = gengetopt_strdup (optarg); + } /* number of unit cells in y. */ else if (strcmp (long_options[option_index].name, "ny") == 0) { - if (local_args_info.ny_given) - { - fprintf (stderr, "%s: `--ny' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); - goto failure; - } - if (args_info->ny_given && ! override) - continue; - local_args_info.ny_given = 1; - args_info->ny_given = 1; - args_info->ny_arg = strtol (optarg, &stop_char, 0); - if (!(stop_char && *stop_char == '\0')) { - fprintf(stderr, "%s: invalid numeric value: %s\n", argv[0], optarg); + + + if (update_arg( (void *)&(args_info->ny_arg), + &(args_info->ny_orig), &(args_info->ny_given), + &(local_args_info.ny_given), optarg, 0, 0, ARG_INT, + check_ambiguity, override, 0, 0, + "ny", '-', + additional_error)) goto failure; - } - if (args_info->ny_orig) - free (args_info->ny_orig); /* free previous string */ - args_info->ny_orig = gengetopt_strdup (optarg); + } /* number of unit cells in z. */ else if (strcmp (long_options[option_index].name, "nz") == 0) { - if (local_args_info.nz_given) - { - fprintf (stderr, "%s: `--nz' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); - goto failure; - } - if (args_info->nz_given && ! override) - continue; - local_args_info.nz_given = 1; - args_info->nz_given = 1; - args_info->nz_arg = strtol (optarg, &stop_char, 0); - if (!(stop_char && *stop_char == '\0')) { - fprintf(stderr, "%s: invalid numeric value: %s\n", argv[0], optarg); + + + if (update_arg( (void *)&(args_info->nz_arg), + &(args_info->nz_orig), &(args_info->nz_given), + &(local_args_info.nz_given), optarg, 0, 0, ARG_INT, + check_ambiguity, override, 0, 0, + "nz", '-', + additional_error)) goto failure; - } - if (args_info->nz_orig) - free (args_info->nz_orig); /* free previous string */ - args_info->nz_orig = gengetopt_strdup (optarg); + } break; @@ -475,12 +667,25 @@ cmdline_parser_internal (int argc, char * const *argv, if (optind < argc) { int i = 0 ; + int found_prog_name = 0; + /* whether program name, i.e., argv[0], is in the remaining args + (this may happen with some implementations of getopt, + but surely not with the one included by gengetopt) */ - args_info->inputs_num = argc - optind ; + i = optind; + while (i < argc) + if (argv[i++] == argv[0]) { + found_prog_name = 1; + break; + } + i = 0; + + args_info->inputs_num = argc - optind - found_prog_name; args_info->inputs = (char **)(malloc ((args_info->inputs_num)*sizeof(char *))) ; while (optind < argc) - args_info->inputs[ i++ ] = gengetopt_strdup (argv[optind++]) ; + if (argv[optind++] != argv[0]) + args_info->inputs[ i++ ] = gengetopt_strdup (argv[optind-1]) ; } return 0;