projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "poll-win32"
[gnulib.git]
/
lib
/
argmatch.c
diff --git
a/lib/argmatch.c
b/lib/argmatch.c
index
e7c2575
..
925449b
100644
(file)
--- a/
lib/argmatch.c
+++ b/
lib/argmatch.c
@@
-1,12
+1,12
@@
/* argmatch.c -- find a match for a string in an array
/* argmatch.c -- find a match for a string in an array
- Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004
Free
- Software Foundation, Inc.
+ Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004
, 2005, 2006, 2007
+
Free
Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ This program is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,15
+14,12
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by David MacKenzie <djm@ai.mit.edu>
Modified by Akim Demaille <demaille@inf.enst.fr> */
/* Written by David MacKenzie <djm@ai.mit.edu>
Modified by Akim Demaille <demaille@inf.enst.fr> */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "argmatch.h"
/* Specification. */
#include "argmatch.h"
@@
-36,7
+33,6
@@
#define _(msgid) gettext (msgid)
#include "error.h"
#define _(msgid) gettext (msgid)
#include "error.h"
-#include "exit.h"
#include "quotearg.h"
#include "quote.h"
#include "quotearg.h"
#include "quote.h"
@@
-73,7
+69,7
@@
argmatch_exit_fn argmatch_die = __argmatch_die;
\f
/* If ARG is an unambiguous match for an element of the
\f
/* If ARG is an unambiguous match for an element of the
-
null
-terminated array ARGLIST, return the index in ARGLIST
+
NULL
-terminated array ARGLIST, return the index in ARGLIST
of the matched element, else -1 if it does not match any element
or -2 if it is ambiguous (is a prefix of more than one element).
of the matched element, else -1 if it does not match any element
or -2 if it is ambiguous (is a prefix of more than one element).