Removed getopt checking and getopt() from lib/contrib.

diff --git a/configure.ad b/configure.ad
index 0e53cfa9d44d7b26b45f2869eea5c7f6e4945dff..bd4251f4931c2ea2f8b9d0f22235c42bebe2d1b9 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -224,7 +224,7 @@ AC_HEADER_STAT
 
 # More header checking
 #
-AC_CHECK_HEADERS(unistd.h string.h getopt.h errno.h fcntl.h assert.h)
+AC_CHECK_HEADERS(unistd.h string.h errno.h fcntl.h assert.h)
 AC_CHECK_HEADERS(sys/types.h sys/stat.h sys/time.h stddef.h)
 AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h xti.h netdb.h sys/resource.h)
 AC_CHECK_HEADERS(pwd.h grp.h termcap.h paths.h)
@@ -298,13 +298,6 @@ AC_CHECK_FUNC(getopt_long,
   ], have_getopt_long=0
 )
 
-AC_CHECK_FUNC(getopt,
-  [
-    AC_DEFINE([HAVE_GETOPT], [], [HAVE_GETOPT])
-    have_getopt=1
-  ], have_getopt=0
-)
-
 ##
 ##  Enable/disable checking
 ##

diff --git a/includes/silc.h.in b/includes/silc.h.in
index 8ef23141d5824e57248c277da9e9b868e0621abb..14f63c1cdc2f9fe7744e84cc444b876dd87d0617 100644 (file)
--- a/includes/silc.h.in
+++ b/includes/silc.h.in
@@ -158,14 +158,6 @@ extern "C" {
 #include <grp.h>
 #endif
 
-#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT)
-#include <getopt.h>
-#else
-#if defined(HAVE_SILCDEFS_H)
-#include "getopti.h"
-#endif /* HAVE_SILCDEFS_H */
-#endif
-
 #ifdef SOCKS5
 #include "socks.h"
 #endif

diff --git a/lib/contrib/Makefile.ad b/lib/contrib/Makefile.ad
index 960a37478f0655bec55ee73e2de2868360212394..e12bafeeaa3704bce9cb92b07250ec17954da0fa 100644 (file)
--- a/lib/contrib/Makefile.ad
+++ b/lib/contrib/Makefile.ad
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2005 Pekka Riikonen
+#  Copyright (C) 2000 - 2005, 2007 Pekka Riikonen
 #
 #  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
@@ -27,7 +27,7 @@ endif
 
 STRINGPREP = nfkc.c rfc3454.c stringprep.c
 
-libcontrib_la_SOURCES = getopti.c $(STRINGPREP) $(REGEX)
+libcontrib_la_SOURCES = $(STRINGPREP) $(REGEX)
 
 EXTRA_DIST = *.c *.h
 

diff --git a/lib/contrib/getopti.c b/lib/contrib/getopti.c
deleted file mode 100644 (file)
index 9cd7a21..0000000
--- a/lib/contrib/getopti.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Our own convenience getopt.  Public Domain. */
-#include "silc.h"
-
-#ifndef SILC_SYMBIAN
-#if !defined(HAVE_GETOPT) && !defined(HAVE_GETOPT_H)
-int    opterr = 1;
-int    optind = 1;
-int    optopt;
-char   *optarg;
-
-#define GETOPT_ERR(s, c)                       \
-do {                                           \
-  if (opterr) {                                        \
-    char errbuf[2];                            \
-    errbuf[0] = c;                             \
-    errbuf[1] = '\n';                          \
-    (void) write(2, argv[0], strlen(argv[0])); \
-    (void) write(2, s, strlen(s));             \
-    (void) write(2, errbuf, 2);                        \
-  }                                            \
-} while(0)
-
-int getopt(int argc, char * const *argv, const char *optstring)
-{
-  static int sp = 1;
-  register int c;
-  register char *cp;
-
-  if (sp == 1) {
-    if (optind >= argc ||
-       argv[optind][0] != '-' || argv[optind][1] == '\0') {
-      return EOF;
-    } else if (strcmp(argv[optind], "--") == 0) {
-      optind++;
-      return EOF;
-    }
-  }
-  optopt = c = argv[optind][sp];
-
-  if (c == ':' || (cp=strchr(optstring, c)) == NULL) {
-    GETOPT_ERR(": illegal option -- ", c);
-    if (argv[optind][++sp] == '\0') {
-      optind++;
-      sp = 1;
-    }
-    return '?';
-  }
-
-  if (*++cp == ':') {
-    if (argv[optind][sp+1] != '\0')
-      optarg = &argv[optind++][sp+1];
-    else if (++optind >= argc) {
-      GETOPT_ERR(": option requires an argument -- ", c);
-      sp = 1;
-      return '?';
-    } else
-      optarg = argv[optind++];
-    sp = 1;
-  } else {
-    if (argv[optind][++sp] == '\0') {
-      sp = 1;
-      optind++;
-    }
-    optarg = NULL;
-  }
-
-  return c;
-}
-#endif /* !HAVE_GETOPT && !HAVE_GETOPT_H */
-#endif /* !SILC_SYMBIAN */

diff --git a/lib/contrib/getopti.h b/lib/contrib/getopti.h
deleted file mode 100644 (file)
index aeec6a2..0000000
--- a/lib/contrib/getopti.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef GETOPTI_H
-#define GETOPTI_H
-
-#ifndef SILC_SYMBIAN
-#if !defined(HAVE_GETOPT) && !defined(HAVE_GETOPT_H)
-/* Our own convenience getopt. */
-extern int opterr;
-extern int optind;
-extern int optopt;
-extern char *optarg;
-int getopt(int argc, char * const *argv, const char *optstring);
-#endif /* !HAVE_GETOPT && !HAVE_GETOPT_H */
-#endif /* !SILC_SYMBIAN */
-
-#endif /* GETOPTI_H */