summaryrefslogtreecommitdiff
path: root/gnulib/argp-parse.c
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2012-02-07 11:37:31 +0400
committerIgor Pashev <pashev.igor@gmail.com>2012-02-07 11:37:31 +0400
commitcfada5b8f2faeb7b2353e5c8339b9bb3d3a7dd8e (patch)
treec89b2c1617be2915d0f4e0161e1b350c2ef6fe78 /gnulib/argp-parse.c
parenta1ac12249d01d47e01fde86c871b85ca4d30bfe0 (diff)
downloadutil-linux-old-cfada5b8f2faeb7b2353e5c8339b9bb3d3a7dd8e.tar.gz
Updated (downgraded ;-) GNUlib, added mising files
Diffstat (limited to 'gnulib/argp-parse.c')
-rw-r--r--gnulib/argp-parse.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/gnulib/argp-parse.c b/gnulib/argp-parse.c
index 09558b4f..64360bea 100644
--- a/gnulib/argp-parse.c
+++ b/gnulib/argp-parse.c
@@ -1,5 +1,5 @@
/* Hierarchial argument parsing, layered over getopt
- Copyright (C) 1995-2000, 2002-2004, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 1995-2000, 2002-2004, 2009-2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
@@ -154,9 +154,8 @@ argp_version_parser (int key, char *arg, struct argp_state *state)
else if (argp_program_version)
fprintf (state->out_stream, "%s\n", argp_program_version);
else
- __argp_error (state, "%s",
- dgettext (state->root_argp->argp_domain,
- "(PROGRAM ERROR) No version known!?"));
+ __argp_error (state, dgettext (state->root_argp->argp_domain,
+ "(PROGRAM ERROR) No version known!?"));
if (! (state->flags & ARGP_NO_EXIT))
exit (0);
break;
@@ -188,7 +187,7 @@ find_long_option (struct option *long_options, const char *name)
}
-/* The state of a "group" during parsing. Each group corresponds to a
+/* The state of a `group' during parsing. Each group corresponds to a
particular argp structure from the tree of such descending from the top
level argp passed to argp_parse. */
struct group
@@ -440,7 +439,7 @@ calc_sizes (const struct argp *argp, struct parser_sizes *szs)
int num_opts = 0;
while (!__option_is_end (opt++))
num_opts++;
- szs->short_len += num_opts * 3; /* opt + up to 2 ':'s */
+ szs->short_len += num_opts * 3; /* opt + up to 2 `:'s */
szs->long_len += num_opts;
}
}
@@ -782,7 +781,7 @@ parser_parse_next (struct parser *parser, int *arg_ebadkey)
if (parser->state.quoted && parser->state.next < parser->state.quoted)
/* The next argument pointer has been moved to before the quoted
- region, so pretend we never saw the quoting "--", and give getopt
+ region, so pretend we never saw the quoting `--', and give getopt
another chance. If the user hasn't removed it, getopt will just
process it again. */
parser->state.quoted = 0;
@@ -814,7 +813,7 @@ parser_parse_next (struct parser *parser, int *arg_ebadkey)
&& strcmp (parser->state.argv[parser->state.next - 1], QUOTE)
== 0)
/* Not only is this the end of the options, but it's a
- "quoted" region, which may have args that *look* like
+ `quoted' region, which may have args that *look* like
options, so we definitely shouldn't try to use getopt past
here, whatever happens. */
parser->state.quoted = parser->state.next;