remove trailing whitespace

16 files changed, 1847 insertions, 1847 deletions

diff --git a/include/speex/speex.h b/include/speex/speex.h
index 2e2698b..28c4b44 100644
--- a/include/speex/speex.h
+++ b/include/speex/speex.h
@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -246,14 +246,14 @@ typedef int (*decoder_ctl_func)(void *state, int request, void *ptr);
 /** Query function for a mode */
 typedef int (*mode_query_func)(const void *mode, int request, void *ptr);
 
-/** Struct defining a Speex mode */ 
+/** Struct defining a Speex mode */
 typedef struct SpeexMode {
    /** Pointer to the low-level mode data */
    const void *mode;
 
    /** Pointer to the mode query function */
    mode_query_func query;
-   
+
    /** The name of the mode (you should not rely on this to identify the mode)*/
    const char *modeName;
 
@@ -291,25 +291,25 @@ typedef struct SpeexMode {
 } SpeexMode;
 
 /**
- * Returns a handle to a newly created Speex encoder state structure. For now, 
- * the "mode" argument can be &nb_mode or &wb_mode . In the future, more modes 
- * may be added. Note that for now if you have more than one channels to 
+ * Returns a handle to a newly created Speex encoder state structure. For now,
+ * the "mode" argument can be &nb_mode or &wb_mode . In the future, more modes
+ * may be added. Note that for now if you have more than one channels to
  * encode, you need one state per channel.
  *
- * @param mode The mode to use (either speex_nb_mode or speex_wb.mode) 
+ * @param mode The mode to use (either speex_nb_mode or speex_wb.mode)
  * @return A newly created encoder state or NULL if state allocation fails
  */
 void *speex_encoder_init(const SpeexMode *mode);
 
-/** Frees all resources associated to an existing Speex encoder state. 
+/** Frees all resources associated to an existing Speex encoder state.
  * @param state Encoder state to be destroyed */
 void speex_encoder_destroy(void *state);
 
 /** Uses an existing encoder state to encode one frame of speech pointed to by
     "in". The encoded bit-stream is saved in "bits".
  @param state Encoder state
- @param in Frame that will be encoded with a +-2^15 range. This data MAY be 
-        overwritten by the encoder and should be considered uninitialised 
+ @param in Frame that will be encoded with a +-2^15 range. This data MAY be
+        overwritten by the encoder and should be considered uninitialised
         after the call.
  @param bits Bit-stream where the data will be written
  @return 0 if frame needs not be transmitted (DTX only), 1 otherwise
@@ -335,14 +335,14 @@ int speex_encode_int(void *state, spx_int16_t *in, SpeexBits *bits);
 int speex_encoder_ctl(void *state, int request, void *ptr);
 
 
-/** Returns a handle to a newly created decoder state structure. For now, 
+/** Returns a handle to a newly created decoder state structure. For now,
  * the mode argument can be &nb_mode or &wb_mode . In the future, more modes
  * may be added.  Note that for now if you have more than one channels to
  * decode, you need one state per channel.
  *
  * @param mode Speex mode (one of speex_nb_mode or speex_wb_mode)
  * @return A newly created decoder state or NULL if state allocation fails
- */ 
+ */
 void *speex_decoder_init(const SpeexMode *mode);
 
 /** Frees all resources associated to an existing decoder state.
diff --git a/include/speex/speex_bits.h b/include/speex/speex_bits.h
index 234ec53..f98b826 100644
--- a/include/speex/speex_bits.h
+++ b/include/speex/speex_bits.h
@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -80,7 +80,7 @@ void speex_bits_rewind(SpeexBits *bits);
 void speex_bits_read_from(SpeexBits *bits, const char *bytes, int len);
 
 /** Append bytes to the bit-stream
- * 
+ *
  * @param bits Bit-stream to operate on
  * @param bytes pointer to the bytes what will be appended
  * @param len Number of bytes of append
@@ -88,7 +88,7 @@ void speex_bits_read_from(SpeexBits *bits, const char *bytes, int len);
 void speex_bits_read_whole_bytes(SpeexBits *bits, const char *bytes, int len);
 
 /** Write the content of a bit-stream to an area of memory
- * 
+ *
  * @param bits Bit-stream to operate on
  * @param bytes Memory location where to write the bits
  * @param max_len Maximum number of bytes to write (i.e. size of the "bytes" buffer)
@@ -129,8 +129,8 @@ unsigned int speex_bits_unpack_unsigned(SpeexBits *bits, int nbBits);
  */
 int speex_bits_nbytes(SpeexBits *bits);
 
-/** Same as speex_bits_unpack_unsigned, but without modifying the cursor position 
- * 
+/** Same as speex_bits_unpack_unsigned, but without modifying the cursor position
+ *
  * @param bits Bit-stream to operate on
  * @param nbBits Number of bits to look for
  * @return Value of the bits peeked, interpreted as unsigned
@@ -138,14 +138,14 @@ int speex_bits_nbytes(SpeexBits *bits);
 unsigned int speex_bits_peek_unsigned(SpeexBits *bits, int nbBits);
 
 /** Get the value of the next bit in the stream, without modifying the
- * "cursor" position 
- * 
+ * "cursor" position
+ *
  * @param bits Bit-stream to operate on
  * @return Value of the bit peeked (one bit only)
  */
 int speex_bits_peek(SpeexBits *bits);
 
-/** Advances the position of the "bit cursor" in the stream 
+/** Advances the position of the "bit cursor" in the stream
  *
  * @param bits Bit-stream to operate on
  * @param n Number of bits to advance
@@ -159,8 +159,8 @@ void speex_bits_advance(SpeexBits *bits, int n);
  */
 int speex_bits_remaining(SpeexBits *bits);
 
-/** Insert a terminator so that the data can be sent as a packet while auto-detecting 
- * the number of frames in each packet 
+/** Insert a terminator so that the data can be sent as a packet while auto-detecting
+ * the number of frames in each packet
  *
  * @param bits Bit-stream to operate on
  */
diff --git a/include/speex/speex_callbacks.h b/include/speex/speex_callbacks.h
index 6f450b3..3928c34 100644
--- a/include/speex/speex_callbacks.h
+++ b/include/speex/speex_callbacks.h
@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
diff --git a/include/speex/speex_header.h b/include/speex/speex_header.h
index f8e36db..ffe8c47 100644
--- a/include/speex/speex_header.h
+++ b/include/speex/speex_header.h
@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -58,7 +58,7 @@ struct SpeexMode;
 /** Speex header info for file-based formats */
 typedef struct SpeexHeader {
    char speex_string[SPEEX_HEADER_STRING_LENGTH];   /**< Identifies a Speex bit-stream, always set to "Speex   " */
-   char speex_version[SPEEX_HEADER_VERSION_LENGTH]; /**< Speex version */ 
+   char speex_version[SPEEX_HEADER_VERSION_LENGTH]; /**< Speex version */
    spx_int32_t speex_version_id;       /**< Version for Speex (for checking compatibility) */
    spx_int32_t header_size;            /**< Total size of the header ( sizeof(SpeexHeader) ) */
    spx_int32_t rate;                   /**< Sampling rate used */
diff --git a/include/speex/speex_stereo.h b/include/speex/speex_stereo.h
index 8abb523..5844f5a 100644
--- a/include/speex/speex_stereo.h
+++ b/include/speex/speex_stereo.h
@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
diff --git a/include/speex/speex_types.h b/include/speex/speex_types.h
index 17ea2b2..bdc6329 100644
--- a/include/speex/speex_types.h
+++ b/include/speex/speex_types.h
@@ -22,7 +22,7 @@
 #ifndef _SPEEX_TYPES_H
 #define _SPEEX_TYPES_H
 
-#if defined(_WIN32) 
+#if defined(_WIN32)
 
 #  if defined(__CYGWIN__)
 #    include <_G_config.h>
diff --git a/src/getopt.c b/src/getopt.c
index 33d299b..f10bcd7 100644
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -1,1047 +1,1047 @@
-/* Getopt for GNU.

-   NOTE: getopt is now part of the C library, so if you don't know what

-   "Keep this file name-space clean" means, talk to drepper@gnu.org

-   before changing it!

-

-   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99

-   	Free Software Foundation, Inc.

-

-   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.  */

-

-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.

-   Ditto for AIX 3.2 and <stdlib.h>.  */

-#ifndef _NO_PROTO

-# define _NO_PROTO

-#endif

-

-#ifdef HAVE_CONFIG_H

-# include "config.h"

-#endif

-

-#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

-

-#ifndef ELIDE_CODE

-

-

-/* This needs to come after some library #include

-   to get __GNU_LIBRARY__ defined.  */

-#ifdef	__GNU_LIBRARY__

-/* Don't include stdlib.h for non-GNU C libraries because some of them

-   contain conflicting prototypes for getopt.  */

-# include <stdlib.h>

-# include <unistd.h>

-#endif	/* GNU C library.  */

-

-#ifdef VMS

-# include <unixlib.h>

-# if HAVE_STRING_H - 0

-#  include <string.h>

-# endif

-#endif

-

-#ifndef _

-/* This is for other GNU distributions with internationalized messages.

-   When compiling libc, the _ macro is predefined.  */

-# ifdef HAVE_LIBINTL_H

-#  include <libintl.h>

-#  define _(msgid)	gettext (msgid)

-# else

-#  define _(msgid)	(msgid)

-# endif

-#endif

-

-/* This version of `getopt' appears to the caller like standard Unix `getopt'

-   but it behaves differently for the user, since it allows the user

-   to intersperse the options with the other arguments.

-

-   As `getopt' works, it permutes the elements of ARGV so that,

-   when it is done, all the options precede everything else.  Thus

-   all application programs are extended to handle flexible argument order.

-

-   Setting the environment variable POSIXLY_CORRECT disables permutation.

-   Then the behavior is completely standard.

-

-   GNU application programs can use a third alternative mode in which

-   they can distinguish the relative order of options and other arguments.  */

-

-#include "getopt_win.h"

-

-/* For communication from `getopt' to the caller.

-   When `getopt' finds an option that takes an argument,

-   the argument value is returned here.

-   Also, when `ordering' is RETURN_IN_ORDER,

-   each non-option ARGV-element is returned here.  */

-

-char *optarg;

-

-/* Index in ARGV of the next element to be scanned.

-   This is used for communication to and from the caller

-   and for communication between successive calls to `getopt'.

-

-   On entry to `getopt', zero means this is the first call; initialize.

-

-   When `getopt' returns -1, this is the index of the first of the

-   non-option elements that the caller should itself scan.

-

-   Otherwise, `optind' communicates from one call to the next

-   how much of ARGV has been scanned so far.  */

-

-/* 1003.2 says this must be 1 before any call.  */

-int optind = 1;

-

-/* Formerly, initialization of getopt depended on optind==0, which

-   causes problems with re-calling getopt as programs generally don't

-   know that. */

-

-int __getopt_initialized;

-

-/* The next char to be scanned in the option-element

-   in which the last option character we returned was found.

-   This allows us to pick up the scan where we left off.

-

-   If this is zero, or a null string, it means resume the scan

-   by advancing to the next ARGV-element.  */

-

-static char *nextchar;

-

-/* Callers store zero here to inhibit the error message

-   for unrecognized options.  */

-

-int opterr = 1;

-

-/* Set to an option character which was unrecognized.

-   This must be initialized on some systems to avoid linking in the

-   system's own getopt implementation.  */

-

-int optopt = '?';

-

-/* Describe how to deal with options that follow non-option ARGV-elements.

-

-   If the caller did not specify anything,

-   the default is REQUIRE_ORDER if the environment variable

-   POSIXLY_CORRECT is defined, PERMUTE otherwise.

-

-   REQUIRE_ORDER means don't recognize them as options;

-   stop option processing when the first non-option is seen.

-   This is what Unix does.

-   This mode of operation is selected by either setting the environment

-   variable POSIXLY_CORRECT, or using `+' as the first character

-   of the list of option characters.

-

-   PERMUTE is the default.  We permute the contents of ARGV as we scan,

-   so that eventually all the non-options are at the end.  This allows options

-   to be given in any order, even with programs that were not written to

-   expect this.

-

-   RETURN_IN_ORDER is an option available to programs that were written

-   to expect options and other ARGV-elements in any order and that care about

-   the ordering of the two.  We describe each non-option ARGV-element

-   as if it were the argument of an option with character code 1.

-   Using `-' as the first character of the list of option characters

-   selects this mode of operation.

-

-   The special argument `--' forces an end of option-scanning regardless

-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only

-   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */

-

-static enum

-{

-  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER

-} ordering;

-

-/* Value of POSIXLY_CORRECT environment variable.  */

-static char *posixly_correct;

-

-#ifdef	__GNU_LIBRARY__

-/* We want to avoid inclusion of string.h with non-GNU libraries

-   because there are many ways it can cause trouble.

-   On some systems, it contains special magic macros that don't work

-   in GCC.  */

-# include <string.h>

-# define my_index	strchr

-#else

-

-#include <string.h>

-

-/* Avoid depending on library functions or files

-   whose names are inconsistent.  */

-

-#ifndef getenv

-extern char *getenv ();

-#endif

-

-static char *

-my_index (str, chr)

-     const char *str;

-     int chr;

-{

-  while (*str)

-    {

-      if (*str == chr)

-	return (char *) str;

-      str++;

-    }

-  return 0;

-}

-

-/* If using GCC, we can safely declare strlen this way.

-   If not using GCC, it is ok not to declare it.  */

-#ifdef __GNUC__

-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.

-   That was relevant to code that was here before.  */

-# if (!defined __STDC__ || !__STDC__) && !defined strlen

-/* gcc with -traditional declares the built-in strlen to return int,

-   and has done so at least since version 2.4.5. -- rms.  */

-extern int strlen (const char *);

-# endif /* not __STDC__ */

-#endif /* __GNUC__ */

-

-#endif /* not __GNU_LIBRARY__ */

-

-/* Handle permutation of arguments.  */

-

-/* Describe the part of ARGV that contains non-options that have

-   been skipped.  `first_nonopt' is the index in ARGV of the first of them;

-   `last_nonopt' is the index after the last of them.  */

-

-static int first_nonopt;

-static int last_nonopt;

-

-#ifdef _LIBC

-/* Bash 2.0 gives us an environment variable containing flags

-   indicating ARGV elements that should not be considered arguments.  */

-

-/* Defined in getopt_init.c  */

-extern char *__getopt_nonoption_flags;

-

-static int nonoption_flags_max_len;

-static int nonoption_flags_len;

-

-static int original_argc;

-static char *const *original_argv;

-

-/* Make sure the environment variable bash 2.0 puts in the environment

-   is valid for the getopt call we must make sure that the ARGV passed

-   to getopt is that one passed to the process.  */

-static void

-__attribute__ ((unused))

-store_args_and_env (int argc, char *const *argv)

-{

-  /* XXX This is no good solution.  We should rather copy the args so

-     that we can compare them later.  But we must not use malloc(3).  */

-  original_argc = argc;

-  original_argv = argv;

-}

-# ifdef text_set_element

-text_set_element (__libc_subinit, store_args_and_env);

-# endif /* text_set_element */

-

-# define SWAP_FLAGS(ch1, ch2) \

-  if (nonoption_flags_len > 0)						      \

-    {									      \

-      char __tmp = __getopt_nonoption_flags[ch1];			      \

-      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \

-      __getopt_nonoption_flags[ch2] = __tmp;				      \

-    }

-#else	/* !_LIBC */

-# define SWAP_FLAGS(ch1, ch2)

-#endif	/* _LIBC */

-

-/* Exchange two adjacent subsequences of ARGV.

-   One subsequence is elements [first_nonopt,last_nonopt)

-   which contains all the non-options that have been skipped so far.

-   The other is elements [last_nonopt,optind), which contains all

-   the options processed since those non-options were skipped.

-

-   `first_nonopt' and `last_nonopt' are relocated so that they describe

-   the new indices of the non-options in ARGV after they are moved.  */

-

-#if defined __STDC__ && __STDC__

-static void exchange (char **);

-#endif

-

-static void

-exchange (argv)

-     char **argv;

-{

-  int bottom = first_nonopt;

-  int middle = last_nonopt;

-  int top = optind;

-  char *tem;

-

-  /* Exchange the shorter segment with the far end of the longer segment.

-     That puts the shorter segment into the right place.

-     It leaves the longer segment in the right place overall,

-     but it consists of two parts that need to be swapped next.  */

-

-#ifdef _LIBC

-  /* First make sure the handling of the `__getopt_nonoption_flags'

-     string can work normally.  Our top argument must be in the range

-     of the string.  */

-  if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)

-    {

-      /* We must extend the array.  The user plays games with us and

-	 presents new arguments.  */

-      char *new_str = malloc (top + 1);

-      if (new_str == NULL)

-	nonoption_flags_len = nonoption_flags_max_len = 0;

-      else

-	{

-	  memset (__mempcpy (new_str, __getopt_nonoption_flags,

-			     nonoption_flags_max_len),

-		  '\0', top + 1 - nonoption_flags_max_len);

-	  nonoption_flags_max_len = top + 1;

-	  __getopt_nonoption_flags = new_str;

-	}

-    }

-#endif

-

-  while (top > middle && middle > bottom)

-    {

-      if (top - middle > middle - bottom)

-	{

-	  /* Bottom segment is the short one.  */

-	  int len = middle - bottom;

-	  register int i;

-

-	  /* Swap it with the top part of the top segment.  */

-	  for (i = 0; i < len; i++)

-	    {

-	      tem = argv[bottom + i];

-	      argv[bottom + i] = argv[top - (middle - bottom) + i];

-	      argv[top - (middle - bottom) + i] = tem;

-	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);

-	    }

-	  /* Exclude the moved bottom segment from further swapping.  */

-	  top -= len;

-	}

-      else

-	{

-	  /* Top segment is the short one.  */

-	  int len = top - middle;

-	  register int i;

-

-	  /* Swap it with the bottom part of the bottom segment.  */

-	  for (i = 0; i < len; i++)

-	    {

-	      tem = argv[bottom + i];

-	      argv[bottom + i] = argv[middle + i];

-	      argv[middle + i] = tem;

-	      SWAP_FLAGS (bottom + i, middle + i);

-	    }

-	  /* Exclude the moved top segment from further swapping.  */

-	  bottom += len;

-	}

-    }

-

-  /* Update records for the slots the non-options now occupy.  */

-

-  first_nonopt += (optind - last_nonopt);

-  last_nonopt = optind;

-}

-

-/* Initialize the internal data when the first call is made.  */

-

-#if defined __STDC__ && __STDC__

-static const char *_getopt_initialize (int, char *const *, const char *);

-#endif

-static const char *

-_getopt_initialize (argc, argv, optstring)

-     int argc;

-     char *const *argv;

-     const char *optstring;

-{

-  /* Start processing options with ARGV-element 1 (since ARGV-element 0

-     is the program name); the sequence of previously skipped

-     non-option ARGV-elements is empty.  */

-

-  first_nonopt = last_nonopt = optind;

-

-  nextchar = NULL;

-

-  posixly_correct = getenv ("POSIXLY_CORRECT");

-

-  /* Determine how to handle the ordering of options and nonoptions.  */

-

-  if (optstring[0] == '-')

-    {

-      ordering = RETURN_IN_ORDER;

-      ++optstring;

-    }

-  else if (optstring[0] == '+')

-    {

-      ordering = REQUIRE_ORDER;

-      ++optstring;

-    }

-  else if (posixly_correct != NULL)

-    ordering = REQUIRE_ORDER;

-  else

-    ordering = PERMUTE;

-

-#ifdef _LIBC

-  if (posixly_correct == NULL

-      && argc == original_argc && argv == original_argv)

-    {

-      if (nonoption_flags_max_len == 0)

-	{

-	  if (__getopt_nonoption_flags == NULL

-	      || __getopt_nonoption_flags[0] == '\0')

-	    nonoption_flags_max_len = -1;

-	  else

-	    {

-	      const char *orig_str = __getopt_nonoption_flags;

-	      int len = nonoption_flags_max_len = strlen (orig_str);

-	      if (nonoption_flags_max_len < argc)

-		nonoption_flags_max_len = argc;

-	      __getopt_nonoption_flags =

-		(char *) malloc (nonoption_flags_max_len);

-	      if (__getopt_nonoption_flags == NULL)

-		nonoption_flags_max_len = -1;

-	      else

-		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),

-			'\0', nonoption_flags_max_len - len);

-	    }

-	}

-      nonoption_flags_len = nonoption_flags_max_len;

-    }

-  else

-    nonoption_flags_len = 0;

-#endif

-

-  return optstring;

-}

-

-/* Scan elements of ARGV (whose length is ARGC) for option characters

-   given in OPTSTRING.

-

-   If an element of ARGV starts with '-', and is not exactly "-" or "--",

-   then it is an option element.  The characters of this element

-   (aside from the initial '-') are option characters.  If `getopt'

-   is called repeatedly, it returns successively each of the option characters

-   from each of the option elements.

-

-   If `getopt' finds another option character, it returns that character,

-   updating `optind' and `nextchar' so that the next call to `getopt' can

-   resume the scan with the following option character or ARGV-element.

-

-   If there are no more option characters, `getopt' returns -1.

-   Then `optind' is the index in ARGV of the first ARGV-element

-   that is not an option.  (The ARGV-elements have been permuted

-   so that those that are not options now come last.)

-

-   OPTSTRING is a string containing the legitimate option characters.

-   If an option character is seen that is not listed in OPTSTRING,

-   return '?' after printing an error message.  If you set `opterr' to

-   zero, the error message is suppressed but we still return '?'.

-

-   If a char in OPTSTRING is followed by a colon, that means it wants an arg,

-   so the following text in the same ARGV-element, or the text of the following

-   ARGV-element, is returned in `optarg'.  Two colons mean an option that

-   wants an optional arg; if there is text in the current ARGV-element,

-   it is returned in `optarg', otherwise `optarg' is set to zero.

-

-   If OPTSTRING starts with `-' or `+', it requests different methods of

-   handling the non-option ARGV-elements.

-   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.

-

-   Long-named options begin with `--' instead of `-'.

-   Their names may be abbreviated as long as the abbreviation is unique

-   or is an exact match for some defined option.  If they have an

-   argument, it follows the option name in the same ARGV-element, separated

-   from the option name by a `=', or else the in next ARGV-element.

-   When `getopt' finds a long-named option, it returns 0 if that option's

-   `flag' field is nonzero, the value of the option's `val' field

-   if the `flag' field is zero.

-

-   The elements of ARGV aren't really const, because we permute them.

-   But we pretend they're const in the prototype to be compatible

-   with other systems.

-

-   LONGOPTS is a vector of `struct option' terminated by an

-   element containing a name which is zero.

-

-   LONGIND returns the index in LONGOPT of the long-named option found.

-   It is only valid when a long-named option has been found by the most

-   recent call.

-

-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce

-   long-named options.  */

-

-int

-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)

-     int argc;

-     char *const *argv;

-     const char *optstring;

-     const struct option *longopts;

-     int *longind;

-     int long_only;

-{

-  optarg = NULL;

-

-  if (optind == 0 || !__getopt_initialized)

-    {

-      if (optind == 0)

-	optind = 1;	/* Don't scan ARGV[0], the program name.  */

-      optstring = _getopt_initialize (argc, argv, optstring);

-      __getopt_initialized = 1;

-    }

-

-  /* Test whether ARGV[optind] points to a non-option argument.

-     Either it does not have option syntax, or there is an environment flag

-     from the shell indicating it is not an option.  The later information

-     is only used when the used in the GNU libc.  */

-#ifdef _LIBC

-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \

-		      || (optind < nonoption_flags_len			      \

-			  && __getopt_nonoption_flags[optind] == '1'))

-#else

-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')

-#endif

-

-  if (nextchar == NULL || *nextchar == '\0')

-    {

-      /* Advance to the next ARGV-element.  */

-

-      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been

-	 moved back by the user (who may also have changed the arguments).  */

-      if (last_nonopt > optind)

-	last_nonopt = optind;

-      if (first_nonopt > optind)

-	first_nonopt = optind;

-

-      if (ordering == PERMUTE)

-	{

-	  /* If we have just processed some options following some non-options,

-	     exchange them so that the options come first.  */

-

-	  if (first_nonopt != last_nonopt && last_nonopt != optind)

-	    exchange ((char **) argv);

-	  else if (last_nonopt != optind)

-	    first_nonopt = optind;

-

-	  /* Skip any additional non-options

-	     and extend the range of non-options previously skipped.  */

-

-	  while (optind < argc && NONOPTION_P)

-	    optind++;

-	  last_nonopt = optind;

-	}

-

-      /* The special ARGV-element `--' means premature end of options.

-	 Skip it like a null option,

-	 then exchange with previous non-options as if it were an option,

-	 then skip everything else like a non-option.  */

-

-      if (optind != argc && !strcmp (argv[optind], "--"))

-	{

-	  optind++;

-

-	  if (first_nonopt != last_nonopt && last_nonopt != optind)

-	    exchange ((char **) argv);

-	  else if (first_nonopt == last_nonopt)

-	    first_nonopt = optind;

-	  last_nonopt = argc;

-

-	  optind = argc;

-	}

-

-      /* If we have done all the ARGV-elements, stop the scan

-	 and back over any non-options that we skipped and permuted.  */

-

-      if (optind == argc)

-	{

-	  /* Set the next-arg-index to point at the non-options

-	     that we previously skipped, so the caller will digest them.  */

-	  if (first_nonopt != last_nonopt)

-	    optind = first_nonopt;

-	  return -1;

-	}

-

-      /* If we have come to a non-option and did not permute it,

-	 either stop the scan or describe it to the caller and pass it by.  */

-

-      if (NONOPTION_P)

-	{

-	  if (ordering == REQUIRE_ORDER)

-	    return -1;

-	  optarg = argv[optind++];

-	  return 1;

-	}

-

-      /* We have found another option-ARGV-element.

-	 Skip the initial punctuation.  */

-

-      nextchar = (argv[optind] + 1

-		  + (longopts != NULL && argv[optind][1] == '-'));

-    }

-

-  /* Decode the current option-ARGV-element.  */

-

-  /* Check whether the ARGV-element is a long option.

-

-     If long_only and the ARGV-element has the form "-f", where f is

-     a valid short option, don't consider it an abbreviated form of

-     a long option that starts with f.  Otherwise there would be no

-     way to give the -f short option.

-

-     On the other hand, if there's a long option "fubar" and

-     the ARGV-element is "-fu", do consider that an abbreviation of

-     the long option, just like "--fu", and not "-f" with arg "u".

-

-     This distinction seems to be the most useful approach.  */

-

-  if (longopts != NULL

-      && (argv[optind][1] == '-'

-	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))

-    {

-      char *nameend;

-      const struct option *p;

-      const struct option *pfound = NULL;

-      int exact = 0;

-      int ambig = 0;

-      int indfound = -1;

-      int option_index;

-

-      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)

-	/* Do nothing.  */ ;

-

-      /* Test all long options for either exact match

-	 or abbreviated matches.  */

-      for (p = longopts, option_index = 0; p->name; p++, option_index++)

-	if (!strncmp (p->name, nextchar, nameend - nextchar))

-	  {

-	    if ((unsigned int) (nameend - nextchar)

-		== (unsigned int) strlen (p->name))

-	      {

-		/* Exact match found.  */

-		pfound = p;

-		indfound = option_index;

-		exact = 1;

-		break;

-	      }

-	    else if (pfound == NULL)

-	      {

-		/* First nonexact match found.  */

-		pfound = p;

-		indfound = option_index;

-	      }

-	    else

-	      /* Second or later nonexact match found.  */

-	      ambig = 1;

-	  }

-

-      if (ambig && !exact)

-	{

-	  if (opterr)

-	    fprintf (stderr, _("%s: option `%s' is ambiguous\n"),

-		     argv[0], argv[optind]);

-	  nextchar += strlen (nextchar);

-	  optind++;

-	  optopt = 0;

-	  return '?';

-	}

-

-      if (pfound != NULL)

-	{

-	  option_index = indfound;

-	  optind++;

-	  if (*nameend)

-	    {

-	      /* Don't test has_arg with >, because some C compilers don't

-		 allow it to be used on enums.  */

-	      if (pfound->has_arg)

-		optarg = nameend + 1;

-	      else

-		{

-		  if (opterr)

-		    {

-		      if (argv[optind - 1][1] == '-')

-			/* --option */

-			fprintf (stderr,

-				 _("%s: option `--%s' doesn't allow an argument\n"),

-				 argv[0], pfound->name);

-		      else

-			/* +option or -option */

-			fprintf (stderr,

-				 _("%s: option `%c%s' doesn't allow an argument\n"),

-				 argv[0], argv[optind - 1][0], pfound->name);

-		    }

-

-		  nextchar += strlen (nextchar);

-

-		  optopt = pfound->val;

-		  return '?';

-		}

-	    }

-	  else if (pfound->has_arg == 1)

-	    {

-	      if (optind < argc)

-		optarg = argv[optind++];

-	      else

-		{

-		  if (opterr)

-		    fprintf (stderr,

-			   _("%s: option `%s' requires an argument\n"),

-			   argv[0], argv[optind - 1]);

-		  nextchar += strlen (nextchar);

-		  optopt = pfound->val;

-		  return optstring[0] == ':' ? ':' : '?';

-		}

-	    }

-	  nextchar += strlen (nextchar);

-	  if (longind != NULL)

-	    *longind = option_index;

-	  if (pfound->flag)

-	    {

-	      *(pfound->flag) = pfound->val;

-	      return 0;

-	    }

-	  return pfound->val;

-	}

-

-      /* Can't find it as a long option.  If this is not getopt_long_only,

-	 or the option starts with '--' or is not a valid short

-	 option, then it's an error.

-	 Otherwise interpret it as a short option.  */

-      if (!long_only || argv[optind][1] == '-'

-	  || my_index (optstring, *nextchar) == NULL)

-	{

-	  if (opterr)

-	    {

-	      if (argv[optind][1] == '-')

-		/* --option */

-		fprintf (stderr, _("%s: unrecognized option `--%s'\n"),

-			 argv[0], nextchar);

-	      else

-		/* +option or -option */

-		fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),

-			 argv[0], argv[optind][0], nextchar);

-	    }

-	  nextchar = (char *) "";

-	  optind++;

-	  optopt = 0;

-	  return '?';

-	}

-    }

-

-  /* Look at and handle the next short option-character.  */

-

-  {

-    char c = *nextchar++;

-    char *temp = my_index (optstring, c);

-

-    /* Increment `optind' when we start to process its last character.  */

-    if (*nextchar == '\0')

-      ++optind;

-

-    if (temp == NULL || c == ':')

-      {

-	if (opterr)

-	  {

-	    if (posixly_correct)

-	      /* 1003.2 specifies the format of this message.  */

-	      fprintf (stderr, _("%s: illegal option -- %c\n"),

-		       argv[0], c);

-	    else

-	      fprintf (stderr, _("%s: invalid option -- %c\n"),

-		       argv[0], c);

-	  }

-	optopt = c;

-	return '?';

-      }

-    /* Convenience. Treat POSIX -W foo same as long option --foo */

-    if (temp[0] == 'W' && temp[1] == ';')

-      {

-	char *nameend;

-	const struct option *p;

-	const struct option *pfound = NULL;

-	int exact = 0;

-	int ambig = 0;

-	int indfound = 0;

-	int option_index;

-

-	/* This is an option that requires an argument.  */

-	if (*nextchar != '\0')

-	  {

-	    optarg = nextchar;

-	    /* If we end this ARGV-element by taking the rest as an arg,

-	       we must advance to the next element now.  */

-	    optind++;

-	  }

-	else if (optind == argc)

-	  {

-	    if (opterr)

-	      {

-		/* 1003.2 specifies the format of this message.  */

-		fprintf (stderr, _("%s: option requires an argument -- %c\n"),

-			 argv[0], c);

-	      }

-	    optopt = c;

-	    if (optstring[0] == ':')

-	      c = ':';

-	    else

-	      c = '?';

-	    return c;

-	  }

-	else

-	  /* We already incremented `optind' once;

-	     increment it again when taking next ARGV-elt as argument.  */

-	  optarg = argv[optind++];

-

-	/* optarg is now the argument, see if it's in the

-	   table of longopts.  */

-

-	for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)

-	  /* Do nothing.  */ ;

-

-	/* Test all long options for either exact match

-	   or abbreviated matches.  */

-	for (p = longopts, option_index = 0; p->name; p++, option_index++)

-	  if (!strncmp (p->name, nextchar, nameend - nextchar))

-	    {

-	      if ((unsigned int) (nameend - nextchar) == strlen (p->name))

-		{

-		  /* Exact match found.  */

-		  pfound = p;

-		  indfound = option_index;

-		  exact = 1;

-		  break;

-		}

-	      else if (pfound == NULL)

-		{

-		  /* First nonexact match found.  */

-		  pfound = p;

-		  indfound = option_index;

-		}

-	      else

-		/* Second or later nonexact match found.  */

-		ambig = 1;

-	    }

-	if (ambig && !exact)

-	  {

-	    if (opterr)

-	      fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),

-		       argv[0], argv[optind]);

-	    nextchar += strlen (nextchar);

-	    optind++;

-	    return '?';

-	  }

-	if (pfound != NULL)

-	  {

-	    option_index = indfound;

-	    if (*nameend)

-	      {

-		/* Don't test has_arg with >, because some C compilers don't

-		   allow it to be used on enums.  */

-		if (pfound->has_arg)

-		  optarg = nameend + 1;

-		else

-		  {

-		    if (opterr)

-		      fprintf (stderr, _("\

-%s: option `-W %s' doesn't allow an argument\n"),

-			       argv[0], pfound->name);

-

-		    nextchar += strlen (nextchar);

-		    return '?';

-		  }

-	      }

-	    else if (pfound->has_arg == 1)

-	      {

-		if (optind < argc)

-		  optarg = argv[optind++];

-		else

-		  {

-		    if (opterr)

-		      fprintf (stderr,

-			       _("%s: option `%s' requires an argument\n"),

-			       argv[0], argv[optind - 1]);

-		    nextchar += strlen (nextchar);

-		    return optstring[0] == ':' ? ':' : '?';

-		  }

-	      }

-	    nextchar += strlen (nextchar);

-	    if (longind != NULL)

-	      *longind = option_index;

-	    if (pfound->flag)

-	      {

-		*(pfound->flag) = pfound->val;

-		return 0;

-	      }

-	    return pfound->val;

-	  }

-	  nextchar = NULL;

-	  return 'W';	/* Let the application handle it.   */

-      }

-    if (temp[1] == ':')

-      {

-	if (temp[2] == ':')

-	  {

-	    /* This is an option that accepts an argument optionally.  */

-	    if (*nextchar != '\0')

-	      {

-		optarg = nextchar;

-		optind++;

-	      }

-	    else

-	      optarg = NULL;

-	    nextchar = NULL;

-	  }

-	else

-	  {

-	    /* This is an option that requires an argument.  */

-	    if (*nextchar != '\0')

-	      {

-		optarg = nextchar;

-		/* If we end this ARGV-element by taking the rest as an arg,

-		   we must advance to the next element now.  */

-		optind++;

-	      }

-	    else if (optind == argc)

-	      {

-		if (opterr)

-		  {

-		    /* 1003.2 specifies the format of this message.  */

-		    fprintf (stderr,

-			   _("%s: option requires an argument -- %c\n"),

-			   argv[0], c);

-		  }

-		optopt = c;

-		if (optstring[0] == ':')

-		  c = ':';

-		else

-		  c = '?';

-	      }

-	    else

-	      /* We already incremented `optind' once;

-		 increment it again when taking next ARGV-elt as argument.  */

-	      optarg = argv[optind++];

-	    nextchar = NULL;

-	  }

-      }

-    return c;

-  }

-}

-

-int

-getopt (argc, argv, optstring)

-     int argc;

-     char *const *argv;

-     const char *optstring;

-{

-  return _getopt_internal (argc, argv, optstring,

-			   (const struct option *) 0,

-			   (int *) 0,

-			   0);

-}

-

-#endif	/* Not ELIDE_CODE.  */

-

-#ifdef TEST

-

-/* Compile with -DTEST to make an executable for use in testing

-   the above definition of `getopt'.  */

-

-int

-main (argc, argv)

-     int argc;

-     char **argv;

-{

-  int c;

-  int digit_optind = 0;

-

-  while (1)

-    {

-      int this_option_optind = optind ? optind : 1;

-

-      c = getopt (argc, argv, "abc:d:0123456789");

-      if (c == -1)

-	break;

-

-      switch (c)

-	{

-	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 '?':

-	  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 */

+/* Getopt for GNU.
+   NOTE: getopt is now part of the C library, so if you don't know what
+   "Keep this file name-space clean" means, talk to drepper@gnu.org
+   before changing it!
+
+   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
+   	Free Software Foundation, Inc.
+
+   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.  */
+
+/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
+   Ditto for AIX 3.2 and <stdlib.h>.  */
+#ifndef _NO_PROTO
+# define _NO_PROTO
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#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
+
+#ifndef ELIDE_CODE
+
+
+/* This needs to come after some library #include
+   to get __GNU_LIBRARY__ defined.  */
+#ifdef	__GNU_LIBRARY__
+/* Don't include stdlib.h for non-GNU C libraries because some of them
+   contain conflicting prototypes for getopt.  */
+# include <stdlib.h>
+# include <unistd.h>
+#endif	/* GNU C library.  */
+
+#ifdef VMS
+# include <unixlib.h>
+# if HAVE_STRING_H - 0
+#  include <string.h>
+# endif
+#endif
+
+#ifndef _
+/* This is for other GNU distributions with internationalized messages.
+   When compiling libc, the _ macro is predefined.  */
+# ifdef HAVE_LIBINTL_H
+#  include <libintl.h>
+#  define _(msgid)	gettext (msgid)
+# else
+#  define _(msgid)	(msgid)
+# endif
+#endif
+
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
+   but it behaves differently for the user, since it allows the user
+   to intersperse the options with the other arguments.
+
+   As `getopt' works, it permutes the elements of ARGV so that,
+   when it is done, all the options precede everything else.  Thus
+   all application programs are extended to handle flexible argument order.
+
+   Setting the environment variable POSIXLY_CORRECT disables permutation.
+   Then the behavior is completely standard.
+
+   GNU application programs can use a third alternative mode in which
+   they can distinguish the relative order of options and other arguments.  */
+
+#include "getopt_win.h"
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+/* 1003.2 says this must be 1 before any call.  */
+int optind = 1;
+
+/* Formerly, initialization of getopt depended on optind==0, which
+   causes problems with re-calling getopt as programs generally don't
+   know that. */
+
+int __getopt_initialized;
+
+/* The next char to be scanned in the option-element
+   in which the last option character we returned was found.
+   This allows us to pick up the scan where we left off.
+
+   If this is zero, or a null string, it means resume the scan
+   by advancing to the next ARGV-element.  */
+
+static char *nextchar;
+
+/* Callers store zero here to inhibit the error message
+   for unrecognized options.  */
+
+int opterr = 1;
+
+/* Set to an option character which was unrecognized.
+   This must be initialized on some systems to avoid linking in the
+   system's own getopt implementation.  */
+
+int optopt = '?';
+
+/* Describe how to deal with options that follow non-option ARGV-elements.
+
+   If the caller did not specify anything,
+   the default is REQUIRE_ORDER if the environment variable
+   POSIXLY_CORRECT is defined, PERMUTE otherwise.
+
+   REQUIRE_ORDER means don't recognize them as options;
+   stop option processing when the first non-option is seen.
+   This is what Unix does.
+   This mode of operation is selected by either setting the environment
+   variable POSIXLY_CORRECT, or using `+' as the first character
+   of the list of option characters.
+
+   PERMUTE is the default.  We permute the contents of ARGV as we scan,
+   so that eventually all the non-options are at the end.  This allows options
+   to be given in any order, even with programs that were not written to
+   expect this.
+
+   RETURN_IN_ORDER is an option available to programs that were written
+   to expect options and other ARGV-elements in any order and that care about
+   the ordering of the two.  We describe each non-option ARGV-element
+   as if it were the argument of an option with character code 1.
+   Using `-' as the first character of the list of option characters
+   selects this mode of operation.
+
+   The special argument `--' forces an end of option-scanning regardless
+   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
+
+static enum
+{
+  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+} ordering;
+
+/* Value of POSIXLY_CORRECT environment variable.  */
+static char *posixly_correct;
+
+#ifdef	__GNU_LIBRARY__
+/* We want to avoid inclusion of string.h with non-GNU libraries
+   because there are many ways it can cause trouble.
+   On some systems, it contains special magic macros that don't work
+   in GCC.  */
+# include <string.h>
+# define my_index	strchr
+#else
+
+#include <string.h>
+
+/* Avoid depending on library functions or files
+   whose names are inconsistent.  */
+
+#ifndef getenv
+extern char *getenv ();
+#endif
+
+static char *
+my_index (str, chr)
+     const char *str;
+     int chr;
+{
+  while (*str)
+    {
+      if (*str == chr)
+	return (char *) str;
+      str++;
+    }
+  return 0;
+}
+
+/* If using GCC, we can safely declare strlen this way.
+   If not using GCC, it is ok not to declare it.  */
+#ifdef __GNUC__
+/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
+   That was relevant to code that was here before.  */
+# if (!defined __STDC__ || !__STDC__) && !defined strlen
+/* gcc with -traditional declares the built-in strlen to return int,
+   and has done so at least since version 2.4.5. -- rms.  */
+extern int strlen (const char *);
+# endif /* not __STDC__ */
+#endif /* __GNUC__ */
+
+#endif /* not __GNU_LIBRARY__ */
+
+/* Handle permutation of arguments.  */
+
+/* Describe the part of ARGV that contains non-options that have
+   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
+   `last_nonopt' is the index after the last of them.  */
+
+static int first_nonopt;
+static int last_nonopt;
+
+#ifdef _LIBC
+/* Bash 2.0 gives us an environment variable containing flags
+   indicating ARGV elements that should not be considered arguments.  */
+
+/* Defined in getopt_init.c  */
+extern char *__getopt_nonoption_flags;
+
+static int nonoption_flags_max_len;
+static int nonoption_flags_len;
+
+static int original_argc;
+static char *const *original_argv;
+
+/* Make sure the environment variable bash 2.0 puts in the environment
+   is valid for the getopt call we must make sure that the ARGV passed
+   to getopt is that one passed to the process.  */
+static void
+__attribute__ ((unused))
+store_args_and_env (int argc, char *const *argv)
+{
+  /* XXX This is no good solution.  We should rather copy the args so
+     that we can compare them later.  But we must not use malloc(3).  */
+  original_argc = argc;
+  original_argv = argv;
+}
+# ifdef text_set_element
+text_set_element (__libc_subinit, store_args_and_env);
+# endif /* text_set_element */
+
+# define SWAP_FLAGS(ch1, ch2) \
+  if (nonoption_flags_len > 0)						      \
+    {									      \
+      char __tmp = __getopt_nonoption_flags[ch1];			      \
+      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
+      __getopt_nonoption_flags[ch2] = __tmp;				      \
+    }
+#else	/* !_LIBC */
+# define SWAP_FLAGS(ch1, ch2)
+#endif	/* _LIBC */
+
+/* Exchange two adjacent subsequences of ARGV.
+   One subsequence is elements [first_nonopt,last_nonopt)
+   which contains all the non-options that have been skipped so far.
+   The other is elements [last_nonopt,optind), which contains all
+   the options processed since those non-options were skipped.
+
+   `first_nonopt' and `last_nonopt' are relocated so that they describe
+   the new indices of the non-options in ARGV after they are moved.  */
+
+#if defined __STDC__ && __STDC__
+static void exchange (char **);
+#endif
+
+static void
+exchange (argv)
+     char **argv;
+{
+  int bottom = first_nonopt;
+  int middle = last_nonopt;
+  int top = optind;
+  char *tem;
+
+  /* Exchange the shorter segment with the far end of the longer segment.
+     That puts the shorter segment into the right place.
+     It leaves the longer segment in the right place overall,
+     but it consists of two parts that need to be swapped next.  */
+
+#ifdef _LIBC
+  /* First make sure the handling of the `__getopt_nonoption_flags'
+     string can work normally.  Our top argument must be in the range
+     of the string.  */
+  if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
+    {
+      /* We must extend the array.  The user plays games with us and
+	 presents new arguments.  */
+      char *new_str = malloc (top + 1);
+      if (new_str == NULL)
+	nonoption_flags_len = nonoption_flags_max_len = 0;
+      else
+	{
+	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
+			     nonoption_flags_max_len),
+		  '\0', top + 1 - nonoption_flags_max_len);
+	  nonoption_flags_max_len = top + 1;
+	  __getopt_nonoption_flags = new_str;
+	}
+    }
+#endif
+
+  while (top > middle && middle > bottom)
+    {
+      if (top - middle > middle - bottom)
+	{
+	  /* Bottom segment is the short one.  */
+	  int len = middle - bottom;
+	  register int i;
+
+	  /* Swap it with the top part of the top segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[top - (middle - bottom) + i];
+	      argv[top - (middle - bottom) + i] = tem;
+	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
+	    }
+	  /* Exclude the moved bottom segment from further swapping.  */
+	  top -= len;
+	}
+      else
+	{
+	  /* Top segment is the short one.  */
+	  int len = top - middle;
+	  register int i;
+
+	  /* Swap it with the bottom part of the bottom segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[middle + i];
+	      argv[middle + i] = tem;
+	      SWAP_FLAGS (bottom + i, middle + i);
+	    }
+	  /* Exclude the moved top segment from further swapping.  */
+	  bottom += len;
+	}
+    }
+
+  /* Update records for the slots the non-options now occupy.  */
+
+  first_nonopt += (optind - last_nonopt);
+  last_nonopt = optind;
+}
+
+/* Initialize the internal data when the first call is made.  */
+
+#if defined __STDC__ && __STDC__
+static const char *_getopt_initialize (int, char *const *, const char *);
+#endif
+static const char *
+_getopt_initialize (argc, argv, optstring)
+     int argc;
+     char *const *argv;
+     const char *optstring;
+{
+  /* Start processing options with ARGV-element 1 (since ARGV-element 0
+     is the program name); the sequence of previously skipped
+     non-option ARGV-elements is empty.  */
+
+  first_nonopt = last_nonopt = optind;
+
+  nextchar = NULL;
+
+  posixly_correct = getenv ("POSIXLY_CORRECT");
+
+  /* Determine how to handle the ordering of options and nonoptions.  */
+
+  if (optstring[0] == '-')
+    {
+      ordering = RETURN_IN_ORDER;
+      ++optstring;
+    }
+  else if (optstring[0] == '+')
+    {
+      ordering = REQUIRE_ORDER;
+      ++optstring;
+    }
+  else if (posixly_correct != NULL)
+    ordering = REQUIRE_ORDER;
+  else
+    ordering = PERMUTE;
+
+#ifdef _LIBC
+  if (posixly_correct == NULL
+      && argc == original_argc && argv == original_argv)
+    {
+      if (nonoption_flags_max_len == 0)
+	{
+	  if (__getopt_nonoption_flags == NULL
+	      || __getopt_nonoption_flags[0] == '\0')
+	    nonoption_flags_max_len = -1;
+	  else
+	    {
+	      const char *orig_str = __getopt_nonoption_flags;
+	      int len = nonoption_flags_max_len = strlen (orig_str);
+	      if (nonoption_flags_max_len < argc)
+		nonoption_flags_max_len = argc;
+	      __getopt_nonoption_flags =
+		(char *) malloc (nonoption_flags_max_len);
+	      if (__getopt_nonoption_flags == NULL)
+		nonoption_flags_max_len = -1;
+	      else
+		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+			'\0', nonoption_flags_max_len - len);
+	    }
+	}
+      nonoption_flags_len = nonoption_flags_max_len;
+    }
+  else
+    nonoption_flags_len = 0;
+#endif
+
+  return optstring;
+}
+
+/* Scan elements of ARGV (whose length is ARGC) for option characters
+   given in OPTSTRING.
+
+   If an element of ARGV starts with '-', and is not exactly "-" or "--",
+   then it is an option element.  The characters of this element
+   (aside from the initial '-') are option characters.  If `getopt'
+   is called repeatedly, it returns successively each of the option characters
+   from each of the option elements.
+
+   If `getopt' finds another option character, it returns that character,
+   updating `optind' and `nextchar' so that the next call to `getopt' can
+   resume the scan with the following option character or ARGV-element.
+
+   If there are no more option characters, `getopt' returns -1.
+   Then `optind' is the index in ARGV of the first ARGV-element
+   that is not an option.  (The ARGV-elements have been permuted
+   so that those that are not options now come last.)
+
+   OPTSTRING is a string containing the legitimate option characters.
+   If an option character is seen that is not listed in OPTSTRING,
+   return '?' after printing an error message.  If you set `opterr' to
+   zero, the error message is suppressed but we still return '?'.
+
+   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+   so the following text in the same ARGV-element, or the text of the following
+   ARGV-element, is returned in `optarg'.  Two colons mean an option that
+   wants an optional arg; if there is text in the current ARGV-element,
+   it is returned in `optarg', otherwise `optarg' is set to zero.
+
+   If OPTSTRING starts with `-' or `+', it requests different methods of
+   handling the non-option ARGV-elements.
+   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
+
+   Long-named options begin with `--' instead of `-'.
+   Their names may be abbreviated as long as the abbreviation is unique
+   or is an exact match for some defined option.  If they have an
+   argument, it follows the option name in the same ARGV-element, separated
+   from the option name by a `=', or else the in next ARGV-element.
+   When `getopt' finds a long-named option, it returns 0 if that option's
+   `flag' field is nonzero, the value of the option's `val' field
+   if the `flag' field is zero.
+
+   The elements of ARGV aren't really const, because we permute them.
+   But we pretend they're const in the prototype to be compatible
+   with other systems.
+
+   LONGOPTS is a vector of `struct option' terminated by an
+   element containing a name which is zero.
+
+   LONGIND returns the index in LONGOPT of the long-named option found.
+   It is only valid when a long-named option has been found by the most
+   recent call.
+
+   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
+   long-named options.  */
+
+int
+_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
+     int argc;
+     char *const *argv;
+     const char *optstring;
+     const struct option *longopts;
+     int *longind;
+     int long_only;
+{
+  optarg = NULL;
+
+  if (optind == 0 || !__getopt_initialized)
+    {
+      if (optind == 0)
+	optind = 1;	/* Don't scan ARGV[0], the program name.  */
+      optstring = _getopt_initialize (argc, argv, optstring);
+      __getopt_initialized = 1;
+    }
+
+  /* Test whether ARGV[optind] points to a non-option argument.
+     Either it does not have option syntax, or there is an environment flag
+     from the shell indicating it is not an option.  The later information
+     is only used when the used in the GNU libc.  */
+#ifdef _LIBC
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
+		      || (optind < nonoption_flags_len			      \
+			  && __getopt_nonoption_flags[optind] == '1'))
+#else
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+#endif
+
+  if (nextchar == NULL || *nextchar == '\0')
+    {
+      /* Advance to the next ARGV-element.  */
+
+      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
+	 moved back by the user (who may also have changed the arguments).  */
+      if (last_nonopt > optind)
+	last_nonopt = optind;
+      if (first_nonopt > optind)
+	first_nonopt = optind;
+
+      if (ordering == PERMUTE)
+	{
+	  /* If we have just processed some options following some non-options,
+	     exchange them so that the options come first.  */
+
+	  if (first_nonopt != last_nonopt && last_nonopt != optind)
+	    exchange ((char **) argv);
+	  else if (last_nonopt != optind)
+	    first_nonopt = optind;
+
+	  /* Skip any additional non-options
+	     and extend the range of non-options previously skipped.  */
+
+	  while (optind < argc && NONOPTION_P)
+	    optind++;
+	  last_nonopt = optind;
+	}
+
+      /* The special ARGV-element `--' means premature end of options.
+	 Skip it like a null option,
+	 then exchange with previous non-options as if it were an option,
+	 then skip everything else like a non-option.  */
+
+      if (optind != argc && !strcmp (argv[optind], "--"))
+	{
+	  optind++;
+
+	  if (first_nonopt != last_nonopt && last_nonopt != optind)
+	    exchange ((char **) argv);
+	  else if (first_nonopt == last_nonopt)
+	    first_nonopt = optind;
+	  last_nonopt = argc;
+
+	  optind = argc;
+	}
+
+      /* If we have done all the ARGV-elements, stop the scan
+	 and back over any non-options that we skipped and permuted.  */
+
+      if (optind == argc)
+	{
+	  /* Set the next-arg-index to point at the non-options
+	     that we previously skipped, so the caller will digest them.  */
+	  if (first_nonopt != last_nonopt)
+	    optind = first_nonopt;
+	  return -1;
+	}
+
+      /* If we have come to a non-option and did not permute it,
+	 either stop the scan or describe it to the caller and pass it by.  */
+
+      if (NONOPTION_P)
+	{
+	  if (ordering == REQUIRE_ORDER)
+	    return -1;
+	  optarg = argv[optind++];
+	  return 1;
+	}
+
+      /* We have found another option-ARGV-element.
+	 Skip the initial punctuation.  */
+
+      nextchar = (argv[optind] + 1
+		  + (longopts != NULL && argv[optind][1] == '-'));
+    }
+
+  /* Decode the current option-ARGV-element.  */
+
+  /* Check whether the ARGV-element is a long option.
+
+     If long_only and the ARGV-element has the form "-f", where f is
+     a valid short option, don't consider it an abbreviated form of
+     a long option that starts with f.  Otherwise there would be no
+     way to give the -f short option.
+
+     On the other hand, if there's a long option "fubar" and
+     the ARGV-element is "-fu", do consider that an abbreviation of
+     the long option, just like "--fu", and not "-f" with arg "u".
+
+     This distinction seems to be the most useful approach.  */
+
+  if (longopts != NULL
+      && (argv[optind][1] == '-'
+	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
+    {
+      char *nameend;
+      const struct option *p;
+      const struct option *pfound = NULL;
+      int exact = 0;
+      int ambig = 0;
+      int indfound = -1;
+      int option_index;
+
+      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
+	/* Do nothing.  */ ;
+
+      /* Test all long options for either exact match
+	 or abbreviated matches.  */
+      for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	if (!strncmp (p->name, nextchar, nameend - nextchar))
+	  {
+	    if ((unsigned int) (nameend - nextchar)
+		== (unsigned int) strlen (p->name))
+	      {
+		/* Exact match found.  */
+		pfound = p;
+		indfound = option_index;
+		exact = 1;
+		break;
+	      }
+	    else if (pfound == NULL)
+	      {
+		/* First nonexact match found.  */
+		pfound = p;
+		indfound = option_index;
+	      }
+	    else
+	      /* Second or later nonexact match found.  */
+	      ambig = 1;
+	  }
+
+      if (ambig && !exact)
+	{
+	  if (opterr)
+	    fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+		     argv[0], argv[optind]);
+	  nextchar += strlen (nextchar);
+	  optind++;
+	  optopt = 0;
+	  return '?';
+	}
+
+      if (pfound != NULL)
+	{
+	  option_index = indfound;
+	  optind++;
+	  if (*nameend)
+	    {
+	      /* Don't test has_arg with >, because some C compilers don't
+		 allow it to be used on enums.  */
+	      if (pfound->has_arg)
+		optarg = nameend + 1;
+	      else
+		{
+		  if (opterr)
+		    {
+		      if (argv[optind - 1][1] == '-')
+			/* --option */
+			fprintf (stderr,
+				 _("%s: option `--%s' doesn't allow an argument\n"),
+				 argv[0], pfound->name);
+		      else
+			/* +option or -option */
+			fprintf (stderr,
+				 _("%s: option `%c%s' doesn't allow an argument\n"),
+				 argv[0], argv[optind - 1][0], pfound->name);
+		    }
+
+		  nextchar += strlen (nextchar);
+
+		  optopt = pfound->val;
+		  return '?';
+		}
+	    }
+	  else if (pfound->has_arg == 1)
+	    {
+	      if (optind < argc)
+		optarg = argv[optind++];
+	      else
+		{
+		  if (opterr)
+		    fprintf (stderr,
+			   _("%s: option `%s' requires an argument\n"),
+			   argv[0], argv[optind - 1]);
+		  nextchar += strlen (nextchar);
+		  optopt = pfound->val;
+		  return optstring[0] == ':' ? ':' : '?';
+		}
+	    }
+	  nextchar += strlen (nextchar);
+	  if (longind != NULL)
+	    *longind = option_index;
+	  if (pfound->flag)
+	    {
+	      *(pfound->flag) = pfound->val;
+	      return 0;
+	    }
+	  return pfound->val;
+	}
+
+      /* Can't find it as a long option.  If this is not getopt_long_only,
+	 or the option starts with '--' or is not a valid short
+	 option, then it's an error.
+	 Otherwise interpret it as a short option.  */
+      if (!long_only || argv[optind][1] == '-'
+	  || my_index (optstring, *nextchar) == NULL)
+	{
+	  if (opterr)
+	    {
+	      if (argv[optind][1] == '-')
+		/* --option */
+		fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+			 argv[0], nextchar);
+	      else
+		/* +option or -option */
+		fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+			 argv[0], argv[optind][0], nextchar);
+	    }
+	  nextchar = (char *) "";
+	  optind++;
+	  optopt = 0;
+	  return '?';
+	}
+    }
+
+  /* Look at and handle the next short option-character.  */
+
+  {
+    char c = *nextchar++;
+    char *temp = my_index (optstring, c);
+
+    /* Increment `optind' when we start to process its last character.  */
+    if (*nextchar == '\0')
+      ++optind;
+
+    if (temp == NULL || c == ':')
+      {
+	if (opterr)
+	  {
+	    if (posixly_correct)
+	      /* 1003.2 specifies the format of this message.  */
+	      fprintf (stderr, _("%s: illegal option -- %c\n"),
+		       argv[0], c);
+	    else
+	      fprintf (stderr, _("%s: invalid option -- %c\n"),
+		       argv[0], c);
+	  }
+	optopt = c;
+	return '?';
+      }
+    /* Convenience. Treat POSIX -W foo same as long option --foo */
+    if (temp[0] == 'W' && temp[1] == ';')
+      {
+	char *nameend;
+	const struct option *p;
+	const struct option *pfound = NULL;
+	int exact = 0;
+	int ambig = 0;
+	int indfound = 0;
+	int option_index;
+
+	/* This is an option that requires an argument.  */
+	if (*nextchar != '\0')
+	  {
+	    optarg = nextchar;
+	    /* If we end this ARGV-element by taking the rest as an arg,
+	       we must advance to the next element now.  */
+	    optind++;
+	  }
+	else if (optind == argc)
+	  {
+	    if (opterr)
+	      {
+		/* 1003.2 specifies the format of this message.  */
+		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+			 argv[0], c);
+	      }
+	    optopt = c;
+	    if (optstring[0] == ':')
+	      c = ':';
+	    else
+	      c = '?';
+	    return c;
+	  }
+	else
+	  /* We already incremented `optind' once;
+	     increment it again when taking next ARGV-elt as argument.  */
+	  optarg = argv[optind++];
+
+	/* optarg is now the argument, see if it's in the
+	   table of longopts.  */
+
+	for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
+	  /* Do nothing.  */ ;
+
+	/* Test all long options for either exact match
+	   or abbreviated matches.  */
+	for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	  if (!strncmp (p->name, nextchar, nameend - nextchar))
+	    {
+	      if ((unsigned int) (nameend - nextchar) == strlen (p->name))
+		{
+		  /* Exact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		  exact = 1;
+		  break;
+		}
+	      else if (pfound == NULL)
+		{
+		  /* First nonexact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		}
+	      else
+		/* Second or later nonexact match found.  */
+		ambig = 1;
+	    }
+	if (ambig && !exact)
+	  {
+	    if (opterr)
+	      fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+		       argv[0], argv[optind]);
+	    nextchar += strlen (nextchar);
+	    optind++;
+	    return '?';
+	  }
+	if (pfound != NULL)
+	  {
+	    option_index = indfound;
+	    if (*nameend)
+	      {
+		/* Don't test has_arg with >, because some C compilers don't
+		   allow it to be used on enums.  */
+		if (pfound->has_arg)
+		  optarg = nameend + 1;
+		else
+		  {
+		    if (opterr)
+		      fprintf (stderr, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+			       argv[0], pfound->name);
+
+		    nextchar += strlen (nextchar);
+		    return '?';
+		  }
+	      }
+	    else if (pfound->has_arg == 1)
+	      {
+		if (optind < argc)
+		  optarg = argv[optind++];
+		else
+		  {
+		    if (opterr)
+		      fprintf (stderr,
+			       _("%s: option `%s' requires an argument\n"),
+			       argv[0], argv[optind - 1]);
+		    nextchar += strlen (nextchar);
+		    return optstring[0] == ':' ? ':' : '?';
+		  }
+	      }
+	    nextchar += strlen (nextchar);
+	    if (longind != NULL)
+	      *longind = option_index;
+	    if (pfound->flag)
+	      {
+		*(pfound->flag) = pfound->val;
+		return 0;
+	      }
+	    return pfound->val;
+	  }
+	  nextchar = NULL;
+	  return 'W';	/* Let the application handle it.   */
+      }
+    if (temp[1] == ':')
+      {
+	if (temp[2] == ':')
+	  {
+	    /* This is an option that accepts an argument optionally.  */
+	    if (*nextchar != '\0')
+	      {
+		optarg = nextchar;
+		optind++;
+	      }
+	    else
+	      optarg = NULL;
+	    nextchar = NULL;
+	  }
+	else
+	  {
+	    /* This is an option that requires an argument.  */
+	    if (*nextchar != '\0')
+	      {
+		optarg = nextchar;
+		/* If we end this ARGV-element by taking the rest as an arg,
+		   we must advance to the next element now.  */
+		optind++;
+	      }
+	    else if (optind == argc)
+	      {
+		if (opterr)
+		  {
+		    /* 1003.2 specifies the format of this message.  */
+		    fprintf (stderr,
+			   _("%s: option requires an argument -- %c\n"),
+			   argv[0], c);
+		  }
+		optopt = c;
+		if (optstring[0] == ':')
+		  c = ':';
+		else
+		  c = '?';
+	      }
+	    else
+	      /* We already incremented `optind' once;
+		 increment it again when taking next ARGV-elt as argument.  */
+	      optarg = argv[optind++];
+	    nextchar = NULL;
+	  }
+      }
+    return c;
+  }
+}
+
+int
+getopt (argc, argv, optstring)
+     int argc;
+     char *const *argv;
+     const char *optstring;
+{
+  return _getopt_internal (argc, argv, optstring,
+			   (const struct option *) 0,
+			   (int *) 0,
+			   0);
+}
+
+#endif	/* Not ELIDE_CODE.  */
+
+#ifdef TEST
+
+/* Compile with -DTEST to make an executable for use in testing
+   the above definition of `getopt'.  */
+
+int
+main (argc, argv)
+     int argc;
+     char **argv;
+{
+  int c;
+  int digit_optind = 0;
+
+  while (1)
+    {
+      int this_option_optind = optind ? optind : 1;
+
+      c = getopt (argc, argv, "abc:d:0123456789");
+      if (c == -1)
+	break;
+
+      switch (c)
+	{
+	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 '?':
+	  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 */
diff --git a/src/getopt1.c b/src/getopt1.c
index 39f8383..fe2eb1d 100644
--- a/src/getopt1.c
+++ b/src/getopt1.c
@@ -1,188 +1,188 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.

-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98

-     Free Software Foundation, Inc.

-   This file is part of the GNU C Library.

-

-   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_win.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

-

-#ifndef ELIDE_CODE

-

-

-/* 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

-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);

-}

-

-

-#endif	/* Not ELIDE_CODE.  */

-

-#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 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 */

+/* getopt_long and getopt_long_only entry points for GNU getopt.
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
+     Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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_win.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
+
+#ifndef ELIDE_CODE
+
+
+/* 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
+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);
+}
+
+
+#endif	/* Not ELIDE_CODE.  */
+
+#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 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 */
diff --git a/src/getopt_win.h b/src/getopt_win.h
index 91eb54e..b0147e9 100644
--- a/src/getopt_win.h
+++ b/src/getopt_win.h
@@ -1,169 +1,169 @@
-/* Declarations for getopt.

-   Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.

-   This file is part of the GNU C Library.

-

-   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

-

-#ifndef __need_getopt

-# define _GETOPT_H 1

-#endif

-

-#ifdef	__cplusplus

-extern "C" {

-#endif

-

-/* For communication from `getopt' to the caller.

-   When `getopt' finds an option that takes an argument,

-   the argument value is returned here.

-   Also, when `ordering' is RETURN_IN_ORDER,

-   each non-option ARGV-element is returned here.  */

-

-extern char *optarg;

-

-/* Index in ARGV of the next element to be scanned.

-   This is used for communication to and from the caller

-   and for communication between successive calls to `getopt'.

-

-   On entry to `getopt', zero means this is the first call; initialize.

-

-   When `getopt' returns -1, this is the index of the first of the

-   non-option elements that the caller should itself scan.

-

-   Otherwise, `optind' communicates from one call to the next

-   how much of ARGV has been scanned so far.  */

-

-extern int optind;

-

-/* Callers store zero here to inhibit the error message `getopt' prints

-   for unrecognized options.  */

-

-extern int opterr;

-

-/* Set to an option character which was unrecognized.  */

-

-extern int optopt;

-

-#ifndef __need_getopt

-/* Describe the long-named options requested by the application.

-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector

-   of `struct option' terminated by an element containing a name which is

-   zero.

-

-   The field `has_arg' is:

-   no_argument		(or 0) if the option does not take an argument,

-   required_argument	(or 1) if the option requires an argument,

-   optional_argument 	(or 2) if the option takes an optional argument.

-

-   If the field `flag' is not NULL, it points to a variable that is set

-   to the value given in the field `val' when the option is found, but

-   left unchanged if the option is not found.

-

-   To have a long-named option do something other than set an `int' to

-   a compiled-in constant, such as set a value from `optarg', set the

-   option's `flag' field to zero and its `val' field to a nonzero

-   value (the equivalent single-letter option character, if there is

-   one).  For long options that have a zero `flag' field, `getopt'

-   returns the contents of the `val' field.  */

-

-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;

-  int *flag;

-  int val;

-};

-

-/* Names for the values of the `has_arg' field of `struct option'.  */

-

-# define no_argument		0

-# define required_argument	1

-# define optional_argument	2

-#endif	/* need getopt */

-

-

-/* Get definitions and prototypes for functions to process the

-   arguments in ARGV (ARGC of them, minus the program name) for

-   options given in OPTS.

-

-   Return the option character from OPTS just read.  Return -1 when

-   there are no more options.  For unrecognized options, or options

-   missing arguments, `optopt' is set to the option letter, and '?' is

-   returned.

-

-   The OPTS string is a list of characters which are recognized option

-   letters, optionally followed by colons, specifying that that letter

-   takes an argument, to be placed in `optarg'.

-

-   If a letter in OPTS is followed by two colons, its argument is

-   optional.  This behavior is specific to the GNU `getopt'.

-

-   The argument `--' causes premature termination of argument

-   scanning, explicitly telling `getopt' that there are no more

-   options.

-

-   If OPTS begins with `--', then non-option arguments are treated as

-   arguments to the option '\0'.  This behavior is specific to the GNU

-   `getopt'.  */

-

-#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__ */

-

-# ifndef __need_getopt

-extern int 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);

-# endif

-#else /* not __STDC__ */

-extern int getopt ();

-# ifndef __need_getopt

-extern int getopt_long ();

-extern int getopt_long_only ();

-

-extern int _getopt_internal ();

-# endif

-#endif /* __STDC__ */

-

-#ifdef	__cplusplus

-}

-#endif

-

-/* Make sure we later can get all the definitions and declarations.  */

-#undef __need_getopt

-

-#endif /* getopt.h */

+/* Declarations for getopt.
+   Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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
+
+#ifndef __need_getopt
+# define _GETOPT_H 1
+#endif
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int optopt;
+
+#ifndef __need_getopt
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of `struct option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument 	(or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
+
+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;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'.  */
+
+# define no_argument		0
+# define required_argument	1
+# define optional_argument	2
+#endif	/* need getopt */
+
+
+/* Get definitions and prototypes for functions to process the
+   arguments in ARGV (ARGC of them, minus the program name) for
+   options given in OPTS.
+
+   Return the option character from OPTS just read.  Return -1 when
+   there are no more options.  For unrecognized options, or options
+   missing arguments, `optopt' is set to the option letter, and '?' is
+   returned.
+
+   The OPTS string is a list of characters which are recognized option
+   letters, optionally followed by colons, specifying that that letter
+   takes an argument, to be placed in `optarg'.
+
+   If a letter in OPTS is followed by two colons, its argument is
+   optional.  This behavior is specific to the GNU `getopt'.
+
+   The argument `--' causes premature termination of argument
+   scanning, explicitly telling `getopt' that there are no more
+   options.
+
+   If OPTS begins with `--', then non-option arguments are treated as
+   arguments to the option '\0'.  This behavior is specific to the GNU
+   `getopt'.  */
+
+#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__ */
+
+# ifndef __need_getopt
+extern int 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);
+# endif
+#else /* not __STDC__ */
+extern int getopt ();
+# ifndef __need_getopt
+extern int getopt_long ();
+extern int getopt_long_only ();
+
+extern int _getopt_internal ();
+# endif
+#endif /* __STDC__ */
+
+#ifdef	__cplusplus
+}
+#endif
+
+/* Make sure we later can get all the definitions and declarations.  */
+#undef __need_getopt
+
+#endif /* getopt.h */
diff --git a/src/skeleton.c b/src/skeleton.c
index 22159d5..1a8c41b 100644
--- a/src/skeleton.c
+++ b/src/skeleton.c
@@ -14,15 +14,15 @@
 /* write an ogg_page to a file pointer */
 int write_ogg_page_to_file(ogg_page *og, FILE *out) {
    int written;
-   
+
    written = fwrite(og->header,1, og->header_len, out);
    written += fwrite(og->body,1, og->body_len, out);
 
    return written;
 }
 
-int add_message_header_field(fisbone_packet *fp, 
-                                        char *header_key, 
+int add_message_header_field(fisbone_packet *fp,
+                                        char *header_key,
                                         char *header_value) {
 
     /* size of both key and value + ': ' + CRLF */
@@ -33,10 +33,10 @@ int add_message_header_field(fisbone_packet *fp,
         int new_size = (fp->current_header_size + this_message_size) * sizeof(char);
         fp->message_header_fields = _ogg_realloc(fp->message_header_fields, new_size);
     }
-    snprintf(fp->message_header_fields + fp->current_header_size, 
-                this_message_size+1, 
-                "%s: %s\r\n", 
-                header_key, 
+    snprintf(fp->message_header_fields + fp->current_header_size,
+                this_message_size+1,
+                "%s: %s\r\n",
+                header_key,
                 header_value);
     fp->current_header_size += this_message_size;
 
@@ -68,16 +68,16 @@ ogg_packet ogg_from_fishead(fishead_packet *fp) {
     return op;
 }
 
-/* create a ogg_packet from a fisbone_packet structure. 
+/* create a ogg_packet from a fisbone_packet structure.
  * call this method after the fisbone_packet is filled and all message header fields are added
  * by calling add_message_header_field method.
  */
 ogg_packet ogg_from_fisbone(fisbone_packet *fp) {
-    
+
     ogg_packet op;
     int packet_size = FISBONE_SIZE + fp->current_header_size;
 
-    memset (&op, 0, sizeof (op));       
+    memset (&op, 0, sizeof (op));
     op.packet = _ogg_calloc (packet_size, sizeof(unsigned char));
     memset (op.packet, 0, packet_size);
     memcpy (op.packet, FISBONE_IDENTIFIER, 8); /* identifier */
@@ -100,7 +100,7 @@ ogg_packet ogg_from_fisbone(fisbone_packet *fp) {
 
 /* fills up a fishead_packet from a fishead ogg_packet of a skeleton bistream */
 fishead_packet fishead_from_ogg(ogg_packet *op) {
-	
+
     fishead_packet fp;
 
     if (memcmp(op->packet, FISHEAD_IDENTIFIER, 8))
@@ -121,7 +121,7 @@ fishead_packet fishead_from_ogg(ogg_packet *op) {
 fisbone_packet fisbone_from_ogg(ogg_packet *op) {
 
     fisbone_packet fp;
-    
+
     if (memcmp(op->packet, FISBONE_IDENTIFIER, 8))
 	; /* invalid value, what do we do? */
     fp.serial_no = *((ogg_uint32_t*)(op->packet+12)); /* serialno of the stream represented by this fisbone packet */
diff --git a/src/speexdec.c b/src/speexdec.c
index eb4123c..269556b 100644
--- a/src/speexdec.c
+++ b/src/speexdec.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 2002-2006 Jean-Marc Valin 
+/* Copyright (C) 2002-2006 Jean-Marc Valin
    File: speexdec.c
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -96,7 +96,7 @@ static void print_comments(char *comments, int length)
    char *c=comments;
    int len, i, nb_fields;
    char *end;
-   
+
    if (length<8)
    {
       fprintf (stderr, "Invalid/corrupted comments\n");
@@ -152,7 +152,7 @@ FILE *out_file_open(char *outFile, int rate, int *channels)
       if (audio_fd<0)
       {
          perror("Cannot open /dev/dsp");
-         exit(1);         
+         exit(1);
       }
 
       format=AFMT_S16_NE;
@@ -189,7 +189,7 @@ FILE *out_file_open(char *outFile, int rate, int *channels)
 #elif defined HAVE_SYS_AUDIOIO_H
       audio_info_t info;
       int audio_fd;
-      
+
       audio_fd = open("/dev/audio", O_WRONLY);
       if (audio_fd<0)
       {
@@ -205,7 +205,7 @@ FILE *out_file_open(char *outFile, int rate, int *channels)
       info.play.precision = 16;
       info.play.sample_rate = rate;
       info.play.channels = *channels;
-      
+
       if (ioctl(audio_fd, AUDIO_SETINFO, &info) < 0)
       {
          perror ("AUDIO_SETINFO");
@@ -235,7 +235,7 @@ FILE *out_file_open(char *outFile, int rate, int *channels)
 #endif
          fout=stdout;
       }
-      else 
+      else
       {
          fout = fopen(outFile, "wb");
          if (!fout)
@@ -259,13 +259,13 @@ void usage()
    printf ("input_file can be:\n");
    printf ("  filename.spx         regular Speex file\n");
    printf ("  -                    stdin\n");
-   printf ("\n");  
+   printf ("\n");
    printf ("output_file can be:\n");
    printf ("  filename.wav         Wav file\n");
    printf ("  filename.*           Raw PCM file (any extension other that .wav)\n");
    printf ("  -                    stdout\n");
    printf ("  (nothing)            Will be played to soundcard\n");
-   printf ("\n");  
+   printf ("\n");
    printf ("Options:\n");
    printf (" --enh                 Enable perceptual enhancement (default)\n");
    printf (" --no-enh              Disable perceptual enhancement\n");
@@ -276,7 +276,7 @@ void usage()
    printf (" --stereo              Force decoding in stereo\n");
    printf (" --rate n              Force decoding at sampling rate n Hz\n");
    printf (" --packet-loss n       Simulate n %% random packet loss\n");
-   printf (" -V                    Verbose mode (show bit-rate)\n"); 
+   printf (" -V                    Verbose mode (show bit-rate)\n");
    printf (" -h, --help            This help\n");
    printf (" -v, --version         Version information\n");
    printf (" --pf                  Deprecated, use --enh instead\n");
@@ -310,7 +310,7 @@ static void *process_header(ogg_packet *op, spx_int32_t enh_enabled, spx_int32_t
    SpeexHeader *header;
    int modeID;
    SpeexCallback callback;
-      
+
    header = speex_packet_to_header((char*)op->packet, op->bytes);
    if (!header)
    {
@@ -319,18 +319,18 @@ static void *process_header(ogg_packet *op, spx_int32_t enh_enabled, spx_int32_t
    }
    if (header->mode >= SPEEX_NB_MODES || header->mode<0)
    {
-      fprintf (stderr, "Mode number %d does not (yet/any longer) exist in this version\n", 
+      fprintf (stderr, "Mode number %d does not (yet/any longer) exist in this version\n",
                header->mode);
       free(header);
       return NULL;
    }
-      
+
    modeID = header->mode;
    if (forceMode!=-1)
       modeID = forceMode;
 
    mode = speex_lib_get_mode (modeID);
-   
+
    if (header->speex_version_id > 1)
    {
       fprintf (stderr, "This file was encoded with Speex bit-stream version %d, which I don't know how to decode\n", header->speex_version_id);
@@ -344,13 +344,13 @@ static void *process_header(ogg_packet *op, spx_int32_t enh_enabled, spx_int32_t
       free(header);
       return NULL;
    }
-   if (mode->bitstream_version > header->mode_bitstream_version) 
+   if (mode->bitstream_version > header->mode_bitstream_version)
    {
       fprintf (stderr, "The file was encoded with an older version of Speex. You would need to downgrade the version in order to play it.\n");
       free(header);
       return NULL;
    }
-   
+
    st = speex_decoder_init(mode);
    if (!st)
    {
@@ -395,22 +395,22 @@ static void *process_header(ogg_packet *op, spx_int32_t enh_enabled, spx_int32_t
       callback.data = stereo;
       speex_decoder_ctl(st, SPEEX_SET_HANDLER, &callback);
    }
-   
+
    if (!quiet)
    {
-      fprintf (stderr, "Decoding %d Hz audio using %s mode", 
+      fprintf (stderr, "Decoding %d Hz audio using %s mode",
                *rate, mode->modeName);
 
       if (*channels==1)
          fprintf (stderr, " (mono");
       else
          fprintf (stderr, " (stereo");
-      
+
       if (header->vbr)
          fprintf (stderr, ", VBR)\n");
       else
          fprintf(stderr, ")\n");
-      /*fprintf (stderr, "Decoding %d Hz audio at %d bps using %s mode\n", 
+      /*fprintf (stderr, "Decoding %d Hz audio at %d bps using %s mode\n",
        *rate, mode->bitrate, mode->modeName);*/
    }
 
@@ -484,7 +484,7 @@ int main(int argc, char **argv)
                        long_options, &option_index);
       if (c==-1)
          break;
-      
+
       switch(c)
       {
       case 0:
@@ -579,7 +579,7 @@ int main(int argc, char **argv)
 #endif
       fin=stdin;
    }
-   else 
+   else
    {
       fin = fopen(inFile, "rb");
       if (!fin)
@@ -593,10 +593,10 @@ int main(int argc, char **argv)
 
    /*Init Ogg data struct*/
    ogg_sync_init(&oy);
-   
+
    speex_bits_init(&bits);
    /*Main decoding loop*/
-   
+
    while (1)
    {
       char *data;
@@ -604,7 +604,7 @@ int main(int argc, char **argv)
       /*Get the ogg buffer for writing*/
       data = ogg_sync_buffer(&oy, 200);
       /*Read bitstream from input file*/
-      nb_read = fread(data, sizeof(char), 200, fin);      
+      nb_read = fread(data, sizeof(char), 200, fin);
       ogg_sync_wrote(&oy, nb_read);
 
       /*Loop for all complete pages we got (most likely only one)*/
@@ -673,7 +673,7 @@ int main(int argc, char **argv)
                /*End of stream condition*/
                if (op.e_o_s && os.serialno == speex_serialno) /* don't care for anything except speex eos */
                   eos=1;
-	       
+
                /*Copy Ogg packet to Speex bitstream*/
                speex_bits_read_from(&bits, (char*)op.packet, op.bytes);
                for (j=0;j!=nframes;j++)
@@ -741,14 +741,14 @@ int main(int argc, char **argv)
                         /*printf ("chopping end: %d %d %d\n", new_frame_size, packet_length, packet_no);*/
                      }
                      if (new_frame_size>0)
-                     {  
+                     {
 #if defined WIN32 || defined _WIN32
                         if (strlen(outFile)==0)
                            WIN_Play_Samples (out+frame_offset*channels, sizeof(short) * new_frame_size*channels);
                         else
 #endif
                            fwrite(out+frame_offset*channels, sizeof(short), new_frame_size*channels, fout);
-                  
+
                         audio_size+=sizeof(short)*new_frame_size*channels;
                      }
                   }
@@ -784,7 +784,7 @@ int main(int argc, char **argv)
 
    if (st)
       speex_decoder_destroy(st);
-   else 
+   else
    {
       fprintf (stderr, "This doesn't look like a Speex file\n");
    }
@@ -801,7 +801,7 @@ int main(int argc, char **argv)
    if (close_in)
       fclose(fin);
    if (fout != NULL)
-      fclose(fout);   
+      fclose(fout);
 
    return 0;
 }
diff --git a/src/speexenc.c b/src/speexenc.c
index 8196c3a..1beec99 100644
--- a/src/speexenc.c
+++ b/src/speexenc.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 2002-2006 Jean-Marc Valin 
+/* Copyright (C) 2002-2006 Jean-Marc Valin
    File: speexenc.c
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -75,7 +75,7 @@ int oe_write_page(ogg_page *page, FILE *fp)
    int written;
    written = fwrite(page->header,1,page->header_len, fp);
    written += fwrite(page->body,1,page->body_len, fp);
-   
+
    return written;
 }
 
@@ -84,7 +84,7 @@ int oe_write_page(ogg_page *page, FILE *fp)
 
 /* Convert input audio bits, endians and channels */
 static int read_samples(FILE *fin,int frame_size, int bits, int channels, int lsb, short * input, char *buff, spx_int32_t *size)
-{   
+{
    unsigned char in[MAX_FRAME_BYTES*2];
    int i;
    short *s;
@@ -142,8 +142,8 @@ static int read_samples(FILE *fin,int frame_size, int bits, int channels, int ls
       /* convert to our endian format */
       for(i=0;i<frame_size*channels;i++)
       {
-         if(lsb) 
-            s[i]=le_short(s[i]); 
+         if(lsb)
+            s[i]=le_short(s[i]);
          else
             s[i]=be_short(s[i]);
       }
@@ -225,27 +225,27 @@ void usage()
    printf ("  filename.wav      wav file\n");
    printf ("  filename.*        Raw PCM file (any extension other than .wav)\n");
    printf ("  -                 stdin\n");
-   printf ("\n");  
+   printf ("\n");
    printf ("output_file can be:\n");
    printf ("  filename.spx      Speex file\n");
    printf ("  -                 stdout\n");
-   printf ("\n");  
+   printf ("\n");
    printf ("Options:\n");
-   printf (" -n, --narrowband   Narrowband (8 kHz) input file\n"); 
-   printf (" -w, --wideband     Wideband (16 kHz) input file\n"); 
-   printf (" -u, --ultra-wideband \"Ultra-wideband\" (32 kHz) input file\n"); 
-   printf (" --quality n        Encoding quality (0-10), default 8\n"); 
-   printf (" --bitrate n        Encoding bit-rate (use bit-rate n or lower)\n"); 
-   printf (" --vbr              Enable variable bit-rate (VBR)\n"); 
-   printf (" --vbr-max-bitrate  Set max VBR bit-rate allowed\n"); 
-   printf (" --abr rate         Enable average bit-rate (ABR) at rate bps\n"); 
-   printf (" --vad              Enable voice activity detection (VAD)\n"); 
-   printf (" --dtx              Enable file-based discontinuous transmission (DTX)\n"); 
-   printf (" --comp n           Set encoding complexity (0-10), default 3\n"); 
-   printf (" --nframes n        Number of frames per Ogg packet (1-10), default 1\n"); 
+   printf (" -n, --narrowband   Narrowband (8 kHz) input file\n");
+   printf (" -w, --wideband     Wideband (16 kHz) input file\n");
+   printf (" -u, --ultra-wideband \"Ultra-wideband\" (32 kHz) input file\n");
+   printf (" --quality n        Encoding quality (0-10), default 8\n");
+   printf (" --bitrate n        Encoding bit-rate (use bit-rate n or lower)\n");
+   printf (" --vbr              Enable variable bit-rate (VBR)\n");
+   printf (" --vbr-max-bitrate  Set max VBR bit-rate allowed\n");
+   printf (" --abr rate         Enable average bit-rate (ABR) at rate bps\n");
+   printf (" --vad              Enable voice activity detection (VAD)\n");
+   printf (" --dtx              Enable file-based discontinuous transmission (DTX)\n");
+   printf (" --comp n           Set encoding complexity (0-10), default 3\n");
+   printf (" --nframes n        Number of frames per Ogg packet (1-10), default 1\n");
 #ifdef USE_SPEEXDSP
-   printf (" --denoise          Denoise the input before encoding\n"); 
-   printf (" --agc              Apply adaptive gain control (AGC) before encoding\n"); 
+   printf (" --denoise          Denoise the input before encoding\n");
+   printf (" --agc              Apply adaptive gain control (AGC) before encoding\n");
 #endif
    printf (" --no-highpass      Disable the encoder's built-in high-pass filter\n");
    printf (" --skeleton         Outputs ogg skeleton metadata (may cause incompatibilities)\n");
@@ -253,18 +253,18 @@ void usage()
    printf ("                     used multiple times\n");
    printf (" --author           Author of this track\n");
    printf (" --title            Title for this track\n");
-   printf (" -h, --help         This help\n"); 
-   printf (" -v, --version      Version information\n"); 
-   printf (" -V                 Verbose mode (show bit-rate)\n"); 
+   printf (" -h, --help         This help\n");
+   printf (" -v, --version      Version information\n");
+   printf (" -V                 Verbose mode (show bit-rate)\n");
    printf (" --print-rate       Print the bitrate for each frame to standard output\n");
    printf ("Raw input options:\n");
-   printf (" --rate n           Sampling rate for raw input\n"); 
-   printf (" --stereo           Consider raw input as stereo\n"); 
-   printf (" --le               Raw input is little-endian\n"); 
-   printf (" --be               Raw input is big-endian\n"); 
-   printf (" --8bit             Raw input is 8-bit unsigned\n"); 
-   printf (" --16bit            Raw input is 16-bit signed\n"); 
-   printf ("Default raw PCM input is 16-bit, little-endian, mono\n"); 
+   printf (" --rate n           Sampling rate for raw input\n");
+   printf (" --stereo           Consider raw input as stereo\n");
+   printf (" --le               Raw input is little-endian\n");
+   printf (" --be               Raw input is big-endian\n");
+   printf (" --8bit             Raw input is 8-bit unsigned\n");
+   printf (" --16bit            Raw input is 16-bit signed\n");
+   printf ("Default raw PCM input is 16-bit, little-endian, mono\n");
    printf ("\n");
    printf ("More information is available from the Speex site: http://www.speex.org\n");
    printf ("\n");
@@ -368,7 +368,7 @@ int main(int argc, char **argv)
 
    speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version);
    snprintf(vendor_string, sizeof(vendor_string), "Encoded with Speex %s", speex_version);
-   
+
    comment_init(&comments, &comments_length, vendor_string);
 
    /*Process command-line options*/
@@ -378,7 +378,7 @@ int main(int argc, char **argv)
                        long_options, &option_index);
       if (c==-1)
          break;
-      
+
       switch(c)
       {
       case 0:
@@ -491,13 +491,13 @@ int main(int argc, char **argv)
 	     fprintf (stderr, "Comments must be of the form name=value\n");
 	     exit(1);
 	   }
-           comment_add(&comments, &comments_length, NULL, optarg); 
+           comment_add(&comments, &comments_length, NULL, optarg);
          } else if (strcmp(long_options[option_index].name,"author")==0)
          {
-           comment_add(&comments, &comments_length, "author=", optarg); 
+           comment_add(&comments, &comments_length, "author=", optarg);
          } else if (strcmp(long_options[option_index].name,"title")==0)
          {
-           comment_add(&comments, &comments_length, "title=", optarg); 
+           comment_add(&comments, &comments_length, "title=", optarg);
          }
 
          break;
@@ -557,7 +557,7 @@ int main(int argc, char **argv)
 #endif
       fin=stdin;
    }
-   else 
+   else
    {
       fin = fopen(inFile, "rb");
       if (!fin)
@@ -648,7 +648,7 @@ int main(int argc, char **argv)
 
    if (!quiet)
       if (rate!=8000 && rate!=16000 && rate!=32000)
-         fprintf (stderr, "Warning: Speex is only optimized for 8, 16 and 32 kHz. It will still work at %d Hz but your mileage may vary\n", rate); 
+         fprintf (stderr, "Warning: Speex is only optimized for 8, 16 and 32 kHz. It will still work at %d Hz but your mileage may vary\n", rate);
 
    if (!mode)
       mode = speex_lib_get_mode (modeID);
@@ -663,10 +663,10 @@ int main(int argc, char **argv)
       if (chan==2)
          st_string="stereo";
       if (!quiet)
-         fprintf (stderr, "Encoding %d Hz audio using %s mode (%s)\n", 
+         fprintf (stderr, "Encoding %d Hz audio using %s mode (%s)\n",
                header.rate, mode->modeName, st_string);
    }
-   /*fprintf (stderr, "Encoding %d Hz audio at %d bps using %s mode\n", 
+   /*fprintf (stderr, "Encoding %d Hz audio at %d bps using %s mode\n",
      header.rate, mode->bitrate, mode->modeName);*/
 
    /*Initialize Speex encoder*/
@@ -679,7 +679,7 @@ int main(int argc, char **argv)
 #endif
       fout=stdout;
    }
-   else 
+   else
    {
       fout = fopen(outFile, "wb");
       if (!fout)
@@ -741,7 +741,7 @@ int main(int argc, char **argv)
    speex_encoder_ctl(st, SPEEX_SET_HIGHPASS, &highpass_enabled);
 
    speex_encoder_ctl(st, SPEEX_GET_LOOKAHEAD, &lookahead);
-   
+
 #ifdef USE_SPEEXDSP
    if (denoise_enabled || agc_enabled)
    {
@@ -858,7 +858,7 @@ int main(int argc, char **argv)
          speex_preprocess(preprocess, input, NULL);
 #endif
       speex_encode_int(st, input, &bits);
-      
+
       nb_encoded += frame_size;
       if (print_bitrate) {
          int tmp;
@@ -876,7 +876,7 @@ int main(int argc, char **argv)
 			if (output_rate)
 				printf ("%d\n", tmp);
          }
-         
+
       }
 
       if (wave_input)
@@ -971,8 +971,8 @@ int main(int argc, char **argv)
    return 0;
 }
 
-/*                 
- Comments will be stored in the Vorbis style.            
+/*
+ Comments will be stored in the Vorbis style.
  It is describled in the "Structure" section of
     http://www.xiph.org/ogg/vorbis/doc/v-comment.html
 
diff --git a/src/wav_io.c b/src/wav_io.c
index 907f5ba..8544288 100644
--- a/src/wav_io.c
+++ b/src/wav_io.c
@@ -1,22 +1,22 @@
-/* Copyright (C) 2002 Jean-Marc Valin 
+/* Copyright (C) 2002 Jean-Marc Valin
    File: wav_io.c
    Routines to handle wav (RIFF) headers
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -90,12 +90,12 @@ int read_wav_header(FILE *file, int *rate, int *channels, int *format, spx_int32
       fprintf (stderr, "Corrupted WAVE file: no \"fmt \"\n");
       return -1;
       }*/
-   
+
    fread(&itmp, 4, 1, file);
    itmp = le_int(itmp);
    skip_bytes=itmp-16;
    /*fprintf (stderr, "skip=%d\n", skip_bytes);*/
-   
+
    fread(&stmp, 2, 1, file);
    stmp = le_short(stmp);
    if (stmp!=1)
@@ -107,7 +107,7 @@ int read_wav_header(FILE *file, int *rate, int *channels, int *format, spx_int32
    fread(&stmp, 2, 1, file);
    stmp = le_short(stmp);
    *channels = stmp;
-   
+
    if (stmp>2)
    {
       fprintf (stderr, "Only mono and (intensity) stereo supported\n");
@@ -150,7 +150,7 @@ int read_wav_header(FILE *file, int *rate, int *channels, int *format, spx_int32
       return -1;
    }
 
-   
+
    /*strange way of seeking, but it works even for pipes*/
    if (skip_bytes>0)
       for (i=0;i<skip_bytes;i++)
diff --git a/src/wav_io.h b/src/wav_io.h
index 0755763..8e3888b 100644
--- a/src/wav_io.h
+++ b/src/wav_io.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 2002 Jean-Marc Valin 
+/* Copyright (C) 2002 Jean-Marc Valin
    File: wav_io.h
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -41,7 +41,7 @@
 #else
 #define le_short(s) ((short) (s))
 #define be_short(s) ((short) ((unsigned short) (s) << 8) | ((unsigned short) (s) >> 8))
-#endif 
+#endif
 
 /** Convert little endian */
 static inline spx_int32_t le_int(spx_int32_t i)
diff --git a/src/wave_out.c b/src/wave_out.c
index 64eeb6e..57b5703 100644
--- a/src/wave_out.c
+++ b/src/wave_out.c
@@ -1,220 +1,220 @@
-/* Copyright (c) 2002, John Edwards

-

-   Redistribution and use in source and binary forms, with or without

-   modification, are permitted provided that the following conditions

-   are met:

-

-   - Redistributions of source code must retain the above copyright

-   notice, this list of conditions and the following disclaimer.

-

-   - Redistributions in binary form must reproduce the above copyright

-   notice, this list of conditions and the following disclaimer in the

-   documentation and/or other materials provided with the distribution.

-

-   - Neither the name of the Xiph.org Foundation nor the names of its

-   contributors may be used to endorse or promote products derived from

-   this software without specific prior written permission.

-

-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR

-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-*/

-

-#ifdef HAVE_CONFIG_H

-# include "config.h"

-#endif

-

-/* Set TABS = 4 */

-/********************************************************************

-

- function: To provide playback of 16 bit PCM wave data in Win32

-           environments from decoded compressed files.

-

- ********************************************************************/

-

-#if defined WIN32 || defined _WIN32

-

-#include <string.h>

-#include <errno.h>

-#include "wave_out.h"

-

-#define MAXWAVESIZE     4294967040LU

-#define MAX_WAVEBLOCKS    32

-

-// This is modified for USE_WIN_AUDIO - ONLY 2002-02-27

-

-

-static CRITICAL_SECTION  cs;

-static HWAVEOUT          dev                    = NULL;

-static int               ScheduledBlocks        = 0;

-static int               PlayedWaveHeadersCount = 0;          // free index

-static WAVEHDR*          PlayedWaveHeaders [MAX_WAVEBLOCKS];

-

-static int

-Box ( const char* msg )

-{

-	MessageBox ( NULL, msg, " "VERSION_STRING": Error Message . . .", MB_OK | MB_ICONEXCLAMATION );

-	return -1;

-}

-

-

-/*

- *  This function registers already played WAVE chunks. Freeing is done by free_memory(),

- */

-

-static void CALLBACK

-wave_callback ( HWAVE hWave, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 )

-{

-	if ( uMsg == WOM_DONE ) {

-		EnterCriticalSection ( &cs );

-		PlayedWaveHeaders [PlayedWaveHeadersCount++] = (WAVEHDR*) dwParam1;

-		LeaveCriticalSection ( &cs );

-	}

-}

-

-

-static void

-free_memory ( void )

-{

-	WAVEHDR*  wh;

-	HGLOBAL   hg;

-

-	EnterCriticalSection ( &cs );

-	wh = PlayedWaveHeaders [--PlayedWaveHeadersCount];

-	ScheduledBlocks--;                               // decrease the number of USED blocks

-	LeaveCriticalSection ( &cs );

-

-	waveOutUnprepareHeader ( dev, wh, sizeof (WAVEHDR) );

-

-	hg = GlobalHandle ( wh -> lpData );       // Deallocate the buffer memory

-	GlobalUnlock (hg);

-	GlobalFree   (hg);

-

-	hg = GlobalHandle ( wh );                 // Deallocate the header memory

-	GlobalUnlock (hg);

-	GlobalFree   (hg);

-}

-

-

-Int

-Set_WIN_Params ( FILE_T   dummyFile ,

-                 Ldouble  SampleFreq,

-                 Uint     BitsPerSample,

-                 Uint     Channels )

-{

-	WAVEFORMATEX  outFormat;

-	UINT          deviceID = WAVE_MAPPER;

-

-	(void) dummyFile;

-

-	if ( waveOutGetNumDevs () == 0 )

-		return Box ( "No audio device present." );

-

-	outFormat.wFormatTag      = WAVE_FORMAT_PCM;

-	outFormat.wBitsPerSample  = BitsPerSample;

-	outFormat.nChannels       = Channels;

-	outFormat.nSamplesPerSec  = (unsigned long)(SampleFreq + 0.5);

-	outFormat.nBlockAlign     = (outFormat.wBitsPerSample + 7) / 8 * outFormat.nChannels;

-	outFormat.nAvgBytesPerSec = outFormat.nSamplesPerSec * outFormat.nBlockAlign;

-

-	switch ( waveOutOpen ( &dev, deviceID, &outFormat, (DWORD)wave_callback, 0, CALLBACK_FUNCTION ) )

-	{

-		case MMSYSERR_ALLOCATED:   return Box ( "Device is already open." );

-		case MMSYSERR_BADDEVICEID: return Box ( "The specified device is out of range." );

-		case MMSYSERR_NODRIVER:    return Box ( "There is no audio driver in this system." );

-		case MMSYSERR_NOMEM:       return Box ( "Unable to allocate sound memory." );

-		case WAVERR_BADFORMAT:     return Box ( "This audio format is not supported." );

-		case WAVERR_SYNC:          return Box ( "The device is synchronous." );

-		default:                   return Box ( "Unknown media error." );

-		case MMSYSERR_NOERROR:     break;

-	}

-

-	waveOutReset ( dev );

-	InitializeCriticalSection ( &cs );

-	SetPriorityClass ( GetCurrentProcess (), HIGH_PRIORITY_CLASS );

-	return 0;

-}

-

-

-int

-WIN_Play_Samples ( const void* data, size_t len )

-{

-	HGLOBAL    hg;

-	HGLOBAL    hg2;

-	LPWAVEHDR  wh;

-	void*      allocptr;

-

-	do {

-		while ( PlayedWaveHeadersCount > 0 )                // free used blocks ...

-			free_memory ();

-

-		if ( ScheduledBlocks < sizeof(PlayedWaveHeaders)/sizeof(*PlayedWaveHeaders) ) // wait for a free block ...

-			break;

-		Sleep (26);

-	} while (1);

-

-	if ( (hg2 = GlobalAlloc ( GMEM_MOVEABLE, len )) == NULL )   // allocate some memory for a copy of the buffer

-		return Box ( "GlobalAlloc failed." );

-

-	allocptr = GlobalLock (hg2);

-	CopyMemory ( allocptr, data, len );                         // Here we can call any modification output functions we want....

-

-	if ( (hg = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, sizeof (WAVEHDR))) == NULL ) // now make a header and WRITE IT!

-		return -1;

-

-	wh                   = GlobalLock (hg);

-	wh -> dwBufferLength = len;

-	wh -> lpData         = allocptr;

-

-	if ( waveOutPrepareHeader ( dev, wh, sizeof (WAVEHDR)) != MMSYSERR_NOERROR ) {

-		GlobalUnlock (hg);

-		GlobalFree   (hg);

-		return -1;

-	}

-

-	if ( waveOutWrite ( dev, wh, sizeof (WAVEHDR)) != MMSYSERR_NOERROR ) {

-		GlobalUnlock (hg);

-		GlobalFree   (hg);

-		return -1;

-	}

-

-	EnterCriticalSection ( &cs );

-	ScheduledBlocks++;

-	LeaveCriticalSection ( &cs );

-

-	return len;

-}

-

-

-int

-WIN_Audio_close ( void )

-{

-	if ( dev != NULL ) {

-

-		while ( ScheduledBlocks > 0 ) {

-			Sleep (ScheduledBlocks);

-			while ( PlayedWaveHeadersCount > 0 )         // free used blocks ...

-				free_memory ();

-		}

-

-		waveOutReset (dev);      // reset the device

-		waveOutClose (dev);      // close the device

-		dev = NULL;

-	}

-

-	DeleteCriticalSection ( &cs );

-	ScheduledBlocks = 0;

-	return 0;

-}

-

-#endif

-

-/* end of wave_out.c */

+/* Copyright (c) 2002, John Edwards
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   - Neither the name of the Xiph.org Foundation nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* Set TABS = 4 */
+/********************************************************************
+
+ function: To provide playback of 16 bit PCM wave data in Win32
+           environments from decoded compressed files.
+
+ ********************************************************************/
+
+#if defined WIN32 || defined _WIN32
+
+#include <string.h>
+#include <errno.h>
+#include "wave_out.h"
+
+#define MAXWAVESIZE     4294967040LU
+#define MAX_WAVEBLOCKS    32
+
+// This is modified for USE_WIN_AUDIO - ONLY 2002-02-27
+
+
+static CRITICAL_SECTION  cs;
+static HWAVEOUT          dev                    = NULL;
+static int               ScheduledBlocks        = 0;
+static int               PlayedWaveHeadersCount = 0;          // free index
+static WAVEHDR*          PlayedWaveHeaders [MAX_WAVEBLOCKS];
+
+static int
+Box ( const char* msg )
+{
+	MessageBox ( NULL, msg, " "VERSION_STRING": Error Message . . .", MB_OK | MB_ICONEXCLAMATION );
+	return -1;
+}
+
+
+/*
+ *  This function registers already played WAVE chunks. Freeing is done by free_memory(),
+ */
+
+static void CALLBACK
+wave_callback ( HWAVE hWave, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 )
+{
+	if ( uMsg == WOM_DONE ) {
+		EnterCriticalSection ( &cs );
+		PlayedWaveHeaders [PlayedWaveHeadersCount++] = (WAVEHDR*) dwParam1;
+		LeaveCriticalSection ( &cs );
+	}
+}
+
+
+static void
+free_memory ( void )
+{
+	WAVEHDR*  wh;
+	HGLOBAL   hg;
+
+	EnterCriticalSection ( &cs );
+	wh = PlayedWaveHeaders [--PlayedWaveHeadersCount];
+	ScheduledBlocks--;                               // decrease the number of USED blocks
+	LeaveCriticalSection ( &cs );
+
+	waveOutUnprepareHeader ( dev, wh, sizeof (WAVEHDR) );
+
+	hg = GlobalHandle ( wh -> lpData );       // Deallocate the buffer memory
+	GlobalUnlock (hg);
+	GlobalFree   (hg);
+
+	hg = GlobalHandle ( wh );                 // Deallocate the header memory
+	GlobalUnlock (hg);
+	GlobalFree   (hg);
+}
+
+
+Int
+Set_WIN_Params ( FILE_T   dummyFile ,
+                 Ldouble  SampleFreq,
+                 Uint     BitsPerSample,
+                 Uint     Channels )
+{
+	WAVEFORMATEX  outFormat;
+	UINT          deviceID = WAVE_MAPPER;
+
+	(void) dummyFile;
+
+	if ( waveOutGetNumDevs () == 0 )
+		return Box ( "No audio device present." );
+
+	outFormat.wFormatTag      = WAVE_FORMAT_PCM;
+	outFormat.wBitsPerSample  = BitsPerSample;
+	outFormat.nChannels       = Channels;
+	outFormat.nSamplesPerSec  = (unsigned long)(SampleFreq + 0.5);
+	outFormat.nBlockAlign     = (outFormat.wBitsPerSample + 7) / 8 * outFormat.nChannels;
+	outFormat.nAvgBytesPerSec = outFormat.nSamplesPerSec * outFormat.nBlockAlign;
+
+	switch ( waveOutOpen ( &dev, deviceID, &outFormat, (DWORD)wave_callback, 0, CALLBACK_FUNCTION ) )
+	{
+		case MMSYSERR_ALLOCATED:   return Box ( "Device is already open." );
+		case MMSYSERR_BADDEVICEID: return Box ( "The specified device is out of range." );
+		case MMSYSERR_NODRIVER:    return Box ( "There is no audio driver in this system." );
+		case MMSYSERR_NOMEM:       return Box ( "Unable to allocate sound memory." );
+		case WAVERR_BADFORMAT:     return Box ( "This audio format is not supported." );
+		case WAVERR_SYNC:          return Box ( "The device is synchronous." );
+		default:                   return Box ( "Unknown media error." );
+		case MMSYSERR_NOERROR:     break;
+	}
+
+	waveOutReset ( dev );
+	InitializeCriticalSection ( &cs );
+	SetPriorityClass ( GetCurrentProcess (), HIGH_PRIORITY_CLASS );
+	return 0;
+}
+
+
+int
+WIN_Play_Samples ( const void* data, size_t len )
+{
+	HGLOBAL    hg;
+	HGLOBAL    hg2;
+	LPWAVEHDR  wh;
+	void*      allocptr;
+
+	do {
+		while ( PlayedWaveHeadersCount > 0 )                // free used blocks ...
+			free_memory ();
+
+		if ( ScheduledBlocks < sizeof(PlayedWaveHeaders)/sizeof(*PlayedWaveHeaders) ) // wait for a free block ...
+			break;
+		Sleep (26);
+	} while (1);
+
+	if ( (hg2 = GlobalAlloc ( GMEM_MOVEABLE, len )) == NULL )   // allocate some memory for a copy of the buffer
+		return Box ( "GlobalAlloc failed." );
+
+	allocptr = GlobalLock (hg2);
+	CopyMemory ( allocptr, data, len );                         // Here we can call any modification output functions we want....
+
+	if ( (hg = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, sizeof (WAVEHDR))) == NULL ) // now make a header and WRITE IT!
+		return -1;
+
+	wh                   = GlobalLock (hg);
+	wh -> dwBufferLength = len;
+	wh -> lpData         = allocptr;
+
+	if ( waveOutPrepareHeader ( dev, wh, sizeof (WAVEHDR)) != MMSYSERR_NOERROR ) {
+		GlobalUnlock (hg);
+		GlobalFree   (hg);
+		return -1;
+	}
+
+	if ( waveOutWrite ( dev, wh, sizeof (WAVEHDR)) != MMSYSERR_NOERROR ) {
+		GlobalUnlock (hg);
+		GlobalFree   (hg);
+		return -1;
+	}
+
+	EnterCriticalSection ( &cs );
+	ScheduledBlocks++;
+	LeaveCriticalSection ( &cs );
+
+	return len;
+}
+
+
+int
+WIN_Audio_close ( void )
+{
+	if ( dev != NULL ) {
+
+		while ( ScheduledBlocks > 0 ) {
+			Sleep (ScheduledBlocks);
+			while ( PlayedWaveHeadersCount > 0 )         // free used blocks ...
+				free_memory ();
+		}
+
+		waveOutReset (dev);      // reset the device
+		waveOutClose (dev);      // close the device
+		dev = NULL;
+	}
+
+	DeleteCriticalSection ( &cs );
+	ScheduledBlocks = 0;
+	return 0;
+}
+
+#endif
+
+/* end of wave_out.c */
diff --git a/src/wave_out.h b/src/wave_out.h
index 0c467b1..a4aa3c1 100644
--- a/src/wave_out.h
+++ b/src/wave_out.h
@@ -1,71 +1,71 @@
-/* Copyright (c) 2002, John Edwards

-

-   Redistribution and use in source and binary forms, with or without

-   modification, are permitted provided that the following conditions

-   are met:

-

-   - Redistributions of source code must retain the above copyright

-   notice, this list of conditions and the following disclaimer.

-

-   - Redistributions in binary form must reproduce the above copyright

-   notice, this list of conditions and the following disclaimer in the

-   documentation and/or other materials provided with the distribution.

-

-   - Neither the name of the Xiph.org Foundation nor the names of its

-   contributors may be used to endorse or promote products derived from

-   this software without specific prior written permission.

-

-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR

-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-*/

-

-//    WAVE_OUT.H - Necessary stuff for WIN_AUDIO

-

-#ifndef WAVE_OUT_H

-#define WAVE_OUT_H

-

-#include <stdio.h>

-#include <windows.h>

-#ifdef __MINGW32__

-#include <mmsystem.h>

-#endif

-

-#define VERSION_STRING "\n 0.7.0\n"

-

-#define Cdecl               __cdecl

-#define __attribute__(x)

-#define sleep(__sec)        Sleep ((__sec) * 1000)

-#define inline              __inline

-#define restrict

-

-//// constants /////////////////////////////////////////////////////

-

-#define CD_SAMPLE_FREQ         44.1e3

-#define SAMPLE_SIZE            16

-#define SAMPLE_SIZE_STRING     ""

-#define WINAUDIO_FD            ((FILE_T)-128)

-#define FILE_T                 FILE*

-#define INVALID_FILEDESC       NULL

-

-//// Simple types //////////////////////////////////////////////////

-

-typedef signed   int        Int;        // at least -32767...+32767, fast type

-typedef unsigned int        Uint;       // at least 0...65535, fast type

-typedef long double         Ldouble;    // most exact floating point format

-

-//// procedures/functions //////////////////////////////////////////

-// wave_out.c

-Int        Set_WIN_Params             ( FILE_T dummyFile , Ldouble SampleFreq, Uint BitsPerSample, Uint Channels);

-int        WIN_Play_Samples           ( const void* buff, size_t len );

-int        WIN_Audio_close            ( void );

-

-#endif /* WAVE_OUT_H */

+/* Copyright (c) 2002, John Edwards
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   - Neither the name of the Xiph.org Foundation nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+//    WAVE_OUT.H - Necessary stuff for WIN_AUDIO
+
+#ifndef WAVE_OUT_H
+#define WAVE_OUT_H
+
+#include <stdio.h>
+#include <windows.h>
+#ifdef __MINGW32__
+#include <mmsystem.h>
+#endif
+
+#define VERSION_STRING "\n 0.7.0\n"
+
+#define Cdecl               __cdecl
+#define __attribute__(x)
+#define sleep(__sec)        Sleep ((__sec) * 1000)
+#define inline              __inline
+#define restrict
+
+//// constants /////////////////////////////////////////////////////
+
+#define CD_SAMPLE_FREQ         44.1e3
+#define SAMPLE_SIZE            16
+#define SAMPLE_SIZE_STRING     ""
+#define WINAUDIO_FD            ((FILE_T)-128)
+#define FILE_T                 FILE*
+#define INVALID_FILEDESC       NULL
+
+//// Simple types //////////////////////////////////////////////////
+
+typedef signed   int        Int;        // at least -32767...+32767, fast type
+typedef unsigned int        Uint;       // at least 0...65535, fast type
+typedef long double         Ldouble;    // most exact floating point format
+
+//// procedures/functions //////////////////////////////////////////
+// wave_out.c
+Int        Set_WIN_Params             ( FILE_T dummyFile , Ldouble SampleFreq, Uint BitsPerSample, Uint Channels);
+int        WIN_Play_Samples           ( const void* buff, size_t len );
+int        WIN_Audio_close            ( void );
+
+#endif /* WAVE_OUT_H */