projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add, forgotten in last commit.
[gnulib.git]
/
lib
/
argmatch.c
diff --git
a/lib/argmatch.c
b/lib/argmatch.c
index
ffc638c
..
36d5845
100644
(file)
--- a/
lib/argmatch.c
+++ b/
lib/argmatch.c
@@
-1,6
+1,6
@@
/* 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
+ Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004
, 2005
Free
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-15,12
+15,12
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* 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
+#if
def
HAVE_CONFIG_H
# include <config.h>
#endif
# include <config.h>
#endif
@@
-39,7
+39,10
@@
#include "exit.h"
#include "quotearg.h"
#include "quote.h"
#include "exit.h"
#include "quotearg.h"
#include "quote.h"
-#include "unlocked-io.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
/* When reporting an invalid argument, show nonprinting characters
by using the quoting style ARGMATCH_QUOTING_STYLE. Do not use
/* When reporting an invalid argument, show nonprinting characters
by using the quoting style ARGMATCH_QUOTING_STYLE. Do not use
@@
-70,7
+73,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).