Commit 021c0221 authored by Josh Coalson's avatar Josh Coalson
Browse files

specialize getopt for FLAC

parent 8ba563d4
/*
NOTE:
I cannot get the vanilla getopt code to work (i.e. compile only what
is needed and not duplicate symbols found in the standard library)
on all the platforms that FLAC supports. In particular the gating
of code with the ELIDE_CODE #define is not accurate enough on systems
that are POSIX but not glibc. If someone has a patch that works on
GNU/Linux, Darwin, AND Solaris please submit it on the project page:
http://sourceforge.net/projects/flac
In the meantime I have munged the global symbols and remove gates
around code, while at the same time trying to touch the original as
little as possible.
*/
/* Declarations for getopt.
Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
This file is part of the GNU C Library.
......@@ -17,70 +31,71 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#ifndef _GETOPT_H
#ifndef FLAC__SHARE__GETOPT_H
#define FLAC__SHARE__GETOPT_H
#ifndef __need_getopt
# define _GETOPT_H 1
#endif
/*[JEC] was:#ifndef __need_getopt*/
/*[JEC] was:# define _GETOPT_H 1*/
/*[JEC] was:#endif*/
#ifdef __cplusplus
extern "C" {
#endif
/* For communication from `getopt' to the caller.
When `getopt' finds an option that takes an argument,
/* For communication from `FLAC__share__getopt' to the caller.
When `FLAC__share__getopt' finds an option that takes an argument,
the argument value is returned here.
Also, when `ordering' is RETURN_IN_ORDER,
each non-option ARGV-element is returned here. */
extern char *optarg;
extern char *FLAC__share__optarg;
/* Index in ARGV of the next element to be scanned.
This is used for communication to and from the caller
and for communication between successive calls to `getopt'.
and for communication between successive calls to `FLAC__share__getopt'.
On entry to `getopt', zero means this is the first call; initialize.
On entry to `FLAC__share__getopt', zero means this is the first call; initialize.
When `getopt' returns -1, this is the index of the first of the
When `FLAC__share__getopt' returns -1, this is the index of the first of the
non-option elements that the caller should itself scan.
Otherwise, `optind' communicates from one call to the next
Otherwise, `FLAC__share__optind' communicates from one call to the next
how much of ARGV has been scanned so far. */
extern int optind;
extern int FLAC__share__optind;
/* Callers store zero here to inhibit the error message `getopt' prints
/* Callers store zero here to inhibit the error message `FLAC__share__getopt' prints
for unrecognized options. */
extern int opterr;
extern int FLAC__share__opterr;
/* Set to an option character which was unrecognized. */
extern int optopt;
extern int FLAC__share__optopt;
#ifndef __need_getopt
/*[JEC] was:#ifndef __need_getopt */
/* Describe the long-named options requested by the application.
The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
of `struct option' terminated by an element containing a name which is
The LONG_OPTIONS argument to FLAC__share__getopt_long or FLAC__share__getopt_long_only is a vector
of `struct FLAC__share__option' terminated by an element containing a name which is
zero.
The field `has_arg' is:
no_argument (or 0) if the option does not take an argument,
required_argument (or 1) if the option requires an argument,
optional_argument (or 2) if the option takes an optional argument.
FLAC__share__no_argument (or 0) if the option does not take an argument,
FLAC__share__required_argument (or 1) if the option requires an argument,
FLAC__share__optional_argument (or 2) if the option takes an optional argument.
If the field `flag' is not NULL, it points to a variable that is set
to the value given in the field `val' when the option is found, but
left unchanged if the option is not found.
To have a long-named option do something other than set an `int' to
a compiled-in constant, such as set a value from `optarg', set the
a compiled-in constant, such as set a value from `FLAC__share__optarg', set the
option's `flag' field to zero and its `val' field to a nonzero
value (the equivalent single-letter option character, if there is
one). For long options that have a zero `flag' field, `getopt'
one). For long options that have a zero `flag' field, `FLAC__share__getopt'
returns the contents of the `val' field. */
struct option
struct FLAC__share__option
{
# if defined __STDC__ && __STDC__
const char *name;
......@@ -94,12 +109,12 @@ struct option
int val;
};
/* Names for the values of the `has_arg' field of `struct option'. */
/* Names for the values of the `has_arg' field of `struct FLAC__share__option'. */
# define no_argument 0
# define required_argument 1
# define optional_argument 2
#endif /* need getopt */
# define FLAC__share__no_argument 0
# define FLAC__share__required_argument 1
# define FLAC__share__optional_argument 2
/*[JEC] was:#endif*/ /* need getopt */
/* Get definitions and prototypes for functions to process the
......@@ -108,62 +123,62 @@ struct option
Return the option character from OPTS just read. Return -1 when
there are no more options. For unrecognized options, or options
missing arguments, `optopt' is set to the option letter, and '?' is
missing arguments, `FLAC__share__optopt' is set to the option letter, and '?' is
returned.
The OPTS string is a list of characters which are recognized option
letters, optionally followed by colons, specifying that that letter
takes an argument, to be placed in `optarg'.
takes an argument, to be placed in `FLAC__share__optarg'.
If a letter in OPTS is followed by two colons, its argument is
optional. This behavior is specific to the GNU `getopt'.
optional. This behavior is specific to the GNU `FLAC__share__getopt'.
The argument `--' causes premature termination of argument
scanning, explicitly telling `getopt' that there are no more
scanning, explicitly telling `FLAC__share__getopt' that there are no more
options.
If OPTS begins with `--', then non-option arguments are treated as
arguments to the option '\0'. This behavior is specific to the GNU
`getopt'. */
`FLAC__share__getopt'. */
#if defined __STDC__ && __STDC__
# ifdef __GNU_LIBRARY__
/*[JEC] was:#if defined __STDC__ && __STDC__*/
/*[JEC] was:# ifdef __GNU_LIBRARY__*/
/* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */
extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
# else /* not __GNU_LIBRARY__ */
extern int getopt ();
# endif /* __GNU_LIBRARY__ */
# ifndef __need_getopt
extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
const struct option *__longopts, int *__longind);
extern int getopt_long_only (int __argc, char *const *__argv,
extern int FLAC__share__getopt (int __argc, char *const *__argv, const char *__shortopts);
/*[JEC] was:# else*/ /* not __GNU_LIBRARY__ */
/*[JEC] was:extern int getopt ();*/
/*[JEC] was:# endif*/ /* __GNU_LIBRARY__ */
/*[JEC] was:# ifndef __need_getopt*/
extern int FLAC__share__getopt_long (int __argc, char *const *__argv, const char *__shortopts,
const struct FLAC__share__option *__longopts, int *__longind);
extern int FLAC__share__getopt_long_only (int __argc, char *const *__argv,
const char *__shortopts,
const struct option *__longopts, int *__longind);
const struct FLAC__share__option *__longopts, int *__longind);
/* Internal only. Users should not call this directly. */
extern int _getopt_internal (int __argc, char *const *__argv,
extern int FLAC__share___getopt_internal (int __argc, char *const *__argv,
const char *__shortopts,
const struct option *__longopts, int *__longind,
const struct FLAC__share__option *__longopts, int *__longind,
int __long_only);
# endif
#else /* not __STDC__ */
extern int getopt ();
# ifndef __need_getopt
extern int getopt_long ();
extern int getopt_long_only ();
/*[JEC] was:# endif*/
/*[JEC] was:#else*/ /* not __STDC__ */
/*[JEC] was:extern int getopt ();*/
/*[JEC] was:# ifndef __need_getopt*/
/*[JEC] was:extern int getopt_long ();*/
/*[JEC] was:extern int getopt_long_only ();*/
extern int _getopt_internal ();
# endif
#endif /* __STDC__ */
/*[JEC] was:extern int _getopt_internal ();*/
/*[JEC] was:# endif*/
/*[JEC] was:#endif*/ /* __STDC__ */
#ifdef __cplusplus
}
#endif
/* Make sure we later can get all the definitions and declarations. */
#undef __need_getopt
/*[JEC] was:#undef __need_getopt*/
#endif /* getopt.h */
......@@ -33,17 +33,19 @@ more powerful operations yet to add:
#include <stdlib.h>
#include <string.h>
#if HAVE_GETOPT_LONG
#if 0
/*[JEC] was:#if HAVE_GETOPT_LONG*/
/*[JEC] see flac/include/share/getopt.h as to why the change */
# include <getopt.h>
#else
# include "share/getopt.h"
#endif
/*
getopt format struct; note we don't use short options so we just
FLAC__share__getopt format struct; note we don't use short options so we just
set the 'val' field to 0 everywhere to indicate a valid option.
*/
static struct option long_options_[] = {
static struct FLAC__share__option long_options_[] = {
/* global options */
{ "preserve-modtime", 0, 0, 0 },
{ "with-filename", 0, 0, 0 },
......@@ -304,10 +306,10 @@ FLAC__bool parse_options(int argc, char *argv[], CommandLineOptions *options)
int option_index = 1;
FLAC__bool had_error = false;
while ((ret = getopt_long(argc, argv, "", long_options_, &option_index)) != -1) {
while ((ret = FLAC__share__getopt_long(argc, argv, "", long_options_, &option_index)) != -1) {
switch (ret) {
case 0:
had_error |= !parse_option(option_index, optarg, options);
had_error |= !parse_option(option_index, FLAC__share__optarg, options);
break;
case '?':
case ':':
......@@ -320,22 +322,22 @@ FLAC__bool parse_options(int argc, char *argv[], CommandLineOptions *options)
}
if(options->prefix_with_filename == 2)
options->prefix_with_filename = (argc - optind > 1);
options->prefix_with_filename = (argc - FLAC__share__optind > 1);
if(optind >= argc && !options->show_long_help) {
if(FLAC__share__optind >= argc && !options->show_long_help) {
fprintf(stderr,"ERROR: you must specify at least one FLAC file;\n");
fprintf(stderr," metaflac cannot be used as a pipe\n");
had_error = true;
}
options->num_files = argc - optind;
options->num_files = argc - FLAC__share__optind;
if(options->num_files > 0) {
unsigned i = 0;
if(0 == (options->filenames = malloc(sizeof(char *) * options->num_files)))
die("out of memory allocating space for file names list");
while(optind < argc)
options->filenames[i++] = local_strdup(argv[optind++]);
while(FLAC__share__optind < argc)
options->filenames[i++] = local_strdup(argv[FLAC__share__optind++]);
}
if(options->args.checks.num_major_ops > 0) {
......
This diff is collapsed.
/*
NOTE:
I cannot get the vanilla getopt code to work (i.e. compile only what
is needed and not duplicate symbols found in the standard library)
on all the platforms that FLAC supports. In particular the gating
of code with the ELIDE_CODE #define is not accurate enough on systems
that are POSIX but not glibc. If someone has a patch that works on
GNU/Linux, Darwin, AND Solaris please submit it on the project page:
http://sourceforge.net/projects/flac
In the meantime I have munged the global symbols and remove gates
around code, while at the same time trying to touch the original as
little as possible.
*/
/* getopt_long and getopt_long_only entry points for GNU getopt.
Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
Free Software Foundation, Inc.
......@@ -22,7 +36,7 @@
#include <config.h>
#endif
#include "getopt.h"
/*[JEC] was:#include "getopt.h"*/
#if !defined __STDC__ || !__STDC__
/* This is a separate conditional since some stdc systems
......@@ -50,7 +64,8 @@
#endif
#endif
#ifndef ELIDE_CODE
#if 1
/*[JEC] was:#ifndef ELIDE_CODE*/
/* This needs to come after some library #include
......@@ -64,30 +79,30 @@
#endif
int
getopt_long (argc, argv, options, long_options, opt_index)
FLAC__share__getopt_long (argc, argv, options, long_options, opt_index)
int argc;
char *const *argv;
const char *options;
const struct option *long_options;
const struct FLAC__share__option *long_options;
int *opt_index;
{
return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
return FLAC__share___getopt_internal (argc, argv, options, long_options, opt_index, 0);
}
/* Like getopt_long, but '-' as well as '--' can indicate a long option.
/* Like FLAC__share__getopt_long, but '-' as well as '--' can indicate a long option.
If an option that starts with '-' (not '--') doesn't match a long option,
but does match a short option, it is parsed as a short option
instead. */
int
getopt_long_only (argc, argv, options, long_options, opt_index)
FLAC__share__getopt_long_only (argc, argv, options, long_options, opt_index)
int argc;
char *const *argv;
const char *options;
const struct option *long_options;
const struct FLAC__share__option *long_options;
int *opt_index;
{
return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
return FLAC__share___getopt_internal (argc, argv, options, long_options, opt_index, 1);
}
......@@ -107,9 +122,9 @@ main (argc, argv)
while (1)
{
int this_option_optind = optind ? optind : 1;
int this_option_optind = FLAC__share__optind ? FLAC__share__optind : 1;
int option_index = 0;
static struct option long_options[] =
static struct FLAC__share__option long_options[] =
{
{"add", 1, 0, 0},
{"append", 0, 0, 0},
......@@ -120,7 +135,7 @@ main (argc, argv)
{0, 0, 0, 0}
};
c = getopt_long (argc, argv, "abc:d:0123456789",
c = FLAC__share__getopt_long (argc, argv, "abc:d:0123456789",
long_options, &option_index);
if (c == -1)
break;
......@@ -129,8 +144,8 @@ main (argc, argv)
{
case 0:
printf ("option %s", long_options[option_index].name);
if (optarg)
printf (" with arg %s", optarg);
if (FLAC__share__optarg)
printf (" with arg %s", FLAC__share__optarg);
printf ("\n");
break;
......@@ -159,11 +174,11 @@ main (argc, argv)
break;
case 'c':
printf ("option c with value `%s'\n", optarg);
printf ("option c with value `%s'\n", FLAC__share__optarg);
break;
case 'd':
printf ("option d with value `%s'\n", optarg);
printf ("option d with value `%s'\n", FLAC__share__optarg);
break;
case '?':
......@@ -174,11 +189,11 @@ main (argc, argv)
}
}
if (optind < argc)
if (FLAC__share__optind < argc)
{
printf ("non-option ARGV-elements: ");
while (optind < argc)
printf ("%s ", argv[optind++]);
while (FLAC__share__optind < argc)
printf ("%s ", argv[FLAC__share__optind++]);
printf ("\n");
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment