getopt: remove useless functions and boiler plate, update licens

We only use getopt_long(). Also we don't care about pre-C89 compilers.

src/Makefile.am

@@ -429,6 +429,8 @@ SOURCES_libvlc_common = \
 	config/keys.c \
 	config/cmdline.c \
 	config/dirs.c \
+	config/getopt.c \
+	config/vlc_getopt.h \
 	misc/events.c \
 	misc/image.c \
 	misc/messages.c \
@@ -446,9 +448,6 @@ SOURCES_libvlc_common = \
 	misc/filter_chain.c \
 	misc/http_auth.c \
 	misc/sql.c \
-	extras/getopt.c \
-	extras/getopt.h \
-	extras/getopt1.c \
 	$(NULL)
 
 SOURCES_libvlc_httpd = \

src/config/cmdline.c

@@ -30,7 +30,7 @@
 #include <vlc_keys.h>
 #include <vlc_charset.h>
 
-#include "../extras/getopt.h"
+#include "vlc_getopt.h"
 
 #include "configuration.h"
 #include "modules/modules.h"

src/extras/getopt.h → src/config/vlc_getopt.h

-/* Declarations for getopt.
-   Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.  The master source lives in /gd/gnu/lib.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _GETOPT_H
-#define _GETOPT_H 1
-
-#ifdef    __cplusplus
-extern "C"
-{
-#endif
+/*****************************************************************************
+ * Declarations for getopt_long()
+ *****************************************************************************
+ * Copyright (C) 1987-1997 Free Software Foundation, Inc.
+ * Copyright (C) 2005-2010 the VideoLAN team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef VLC_GETOPT_H
+#define VLC_GETOPT_H 1
 
 /* For communication from `getopt' to the caller.
    When `getopt' finds an option that takes an argument,
@@ -81,11 +76,7 @@ extern "C"
 
     struct option
     {
-#if defined (__STDC__) && __STDC__
         const char *name;
-#else
-        char *name;
-#endif
         /* has_arg can't be an enum because some compilers complain about
            type mismatches in all the code that assumes it is an int.  */
         int has_arg;
@@ -99,36 +90,7 @@ extern "C"
 #define required_argument    1
 #define optional_argument    2
 
-#if defined (__STDC__) && __STDC__
-#ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
-    extern int getopt(int argc, char *const *argv, const char *shortopts);
-#else                /* not __GNU_LIBRARY__ */
-    extern int getopt();
-#endif                /* __GNU_LIBRARY__ */
     extern int vlc_getopt_long(int argc, char *const *argv, const char *shortopts,
                    const struct option *longopts, int *longind);
-    extern int getopt_long_only(int argc, char *const *argv,
-                    const char *shortopts,
-                   const struct option *longopts, int *longind);
-
-/* Internal only.  Users should not call this directly.  */
-    extern int _getopt_internal(int argc, char *const *argv,
-                    const char *shortopts,
-                const struct option *longopts, int *longind,
-                    int long_only);
-#else                /* not __STDC__ */
-    extern int getopt();
-    extern int vlc_getopt_long();
-    extern int getopt_long_only();
-
-    extern int _getopt_internal();
-#endif                /* __STDC__ */
-
-#ifdef    __cplusplus
-}
-#endif
 
-#endif                /* _GETOPT_H */
+#endif                /* VLC_GETOPT_H */

src/extras/getopt1.c

-/* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.  The master source lives in /gd/gnu/lib.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "getopt.h"
-
-#if !defined (__STDC__) || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2
-#include <gnu-versions.h>
-#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#define ELIDE_CODE
-#endif
-#endif
-
-/* This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef __GNU_LIBRARY__
-#include <stdlib.h>
-#endif
-
-#ifndef    NULL
-#define NULL 0
-#endif
-
-int
-    vlc_getopt_long(argc, argv, options, long_options, opt_index)
-     int argc;
-     char *const *argv;
-     const char *options;
-     const struct option *long_options;
-     int *opt_index;
-{
-    return _getopt_internal(argc, argv, options, long_options, opt_index, 0);
-}
-
-/* Like getopt_long, but '-' as well as '--' can indicate a long option.
-   If an option that starts with '-' (not '--') doesn't match a long option,
-   but does match a short option, it is parsed as a short option
-   instead.  */
-
-int
-    getopt_long_only(argc, argv, options, long_options, opt_index)
-     int argc;
-     char *const *argv;
-     const char *options;
-     const struct option *long_options;
-     int *opt_index;
-{
-    return _getopt_internal(argc, argv, options, long_options, opt_index, 1);
-}
-
-#ifdef TEST
-
-#include <stdio.h>
-
-int
-    main(argc, argv)
-     int argc;
-     char **argv;
-{
-    int c;
-    int digit_optind = 0;
-
-    while (1)
-    {
-        int this_option_optind = optind ? optind : 1;
-        int option_index = 0;
-        static const struct option long_options[] =
-        {
-            {"add", 1, 0, 0},
-            {"append", 0, 0, 0},
-            {"delete", 1, 0, 0},
-            {"verbose", 0, 0, 0},
-            {"create", 0, 0, 0},
-            {"file", 1, 0, 0},
-            {0, 0, 0, 0}
-        };
-
-        c = getopt_long(argc, argv, "abc:d:0123456789",
-                long_options, &option_index);
-        if (c == -1)
-            break;
-
-        switch (c)
-        {
-            case 0:
-                printf("option %s", long_options[option_index].name);
-                if (optarg)
-                    printf(" with arg %s", optarg);
-                printf("\n");
-                break;
-
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-                if (digit_optind != 0 && digit_optind != this_option_optind)
-                    printf("digits occur in two different argv-elements.\n");
-                digit_optind = this_option_optind;
-                printf("option %c\n", c);
-                break;
-
-            case 'a':
-                printf("option a\n");
-                break;
-
-            case 'b':
-                printf("option b\n");
-                break;
-
-            case 'c':
-                printf("option c with value `%s'\n", optarg);
-                break;
-
-            case 'd':
-                printf("option d with value `%s'\n", optarg);
-                break;
-
-            case '?':
-                break;
-
-            default:
-                printf("?? getopt returned character code 0%o ??\n", c);
-        }
-    }
-
-    if (optind < argc)
-    {
-        printf("non-option ARGV-elements: ");
-        while (optind < argc)
-            printf("%s ", argv[optind++]);
-        printf("\n");
-    }
-
-    exit(0);
-}
-
-#endif /* TEST */

src/libvlc.c

@@ -57,9 +57,7 @@
 #   include <io.h>
 #endif
 
-#ifdef WIN32                       /* optind, getopt(), included in unistd.h */
-#   include "extras/getopt.h"
-#endif
+#include "config/vlc_getopt.h"
 
 #ifdef HAVE_LOCALE_H
 #   include <locale.h>

src/win32/specific.c

@@ -30,7 +30,7 @@
 #include "../libvlc.h"
 #include <vlc_playlist.h>
 
-#include "../extras/getopt.h"
+#include "../config/vlc_getopt.h"
 
 #if !defined( UNDER_CE )
 #   include <io.h>