summaryrefslogtreecommitdiff
path: root/lib/argmatch.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1997-05-27 09:39:25 +0000
committerJim Meyering <jim@meyering.net>1997-05-27 09:39:25 +0000
commit168eb7758eaf5d60f777c459cc97aa25c3a844c5 (patch)
tree04b2c3a8e4e7813229f51b11e6a09c66a655419c /lib/argmatch.c
parent96c4c010193fee5c0e6cc3b2c692e168c69383b6 (diff)
downloadcoreutils-168eb7758eaf5d60f777c459cc97aa25c3a844c5.tar.xz
Update from FSF via patch-2.2.93.
Diffstat (limited to 'lib/argmatch.c')
-rw-r--r--lib/argmatch.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/argmatch.c b/lib/argmatch.c
index c0708bfbb..aa5593329 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -1,5 +1,5 @@
/* argmatch.c -- find a match for a string in an array
- Copyright (C) 1990 Free Software Foundation, Inc.
+ Copyright (C) 1990, 1997 Free Software Foundation, Inc.
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
@@ -12,24 +12,27 @@
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; see the file COPYING.
+ If not, write to the Free Software Foundation,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* Written by David MacKenzie <djm@ai.mit.edu> */
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
# include <config.h>
#endif
+#include <argmatch.h>
+
#include <sys/types.h>
#include <stdio.h>
-#ifdef STDC_HEADERS
+#if HAVE_STRING_H
# include <string.h>
+#else
+# include <strings.h>
#endif
-extern char *program_name;
-
/* If ARG is an unambiguous match for an element of the
null-terminated array OPTLIST, return the index in OPTLIST
of the matched element, else -1 if it does not match any element