Changeset 2144

Timestamp:

Jul 2, 2005, 4:31:40 AM (20 years ago)

Author:

bird

Message:

o Ported GLIBC argp and getopt (argp requires the GLIBC one).

This means no optreset anylonger.

o Some corrections / hacks in the weak_alias departement.

Location:

trunk/src/emx

Files:

• include/argp.h (added)
• include/getopt.h (modified) (1 diff, 1 prop)
• src/lib/bsd/stdlib/getopt_long.c (deleted)
• src/lib/lgpl/argp/argp-ba.c (modified) (1 diff, 1 prop)
• src/lib/lgpl/argp/argp-fmtstream.h (modified) (5 diffs, 1 prop)
• src/lib/lgpl/argp/argp-help.c (modified) (13 diffs, 1 prop)
• src/lib/lgpl/argp/argp-namefrob.h (modified) (2 diffs, 1 prop)
• src/lib/lgpl/argp/argp-parse.c (modified) (4 diffs, 1 prop)
• src/lib/lgpl/argp/argp-pv.c (modified) (1 diff, 1 prop)
• src/lib/lgpl/argp/argp-pvh.c (modified) (1 diff, 1 prop)
• src/lib/lgpl/argp/argp-xinl.c (modified) (2 diffs, 1 prop)
• src/lib/lgpl/argp/argp.h (deleted)
• src/lib/lgpl/include/config.h (modified) (1 diff, 1 prop)
• src/lib/lgpl/include/libc-alias-glibc.h (modified) (2 diffs, 1 prop)
• src/lib/lgpl/include/libc-symbols.h (modified) (2 diffs, 1 prop)
• src/lib/lgpl/posix/getopt.c (modified) (4 diffs, 1 prop)
• src/lib/lgpl/posix/getopt1.c (modified) (2 diffs, 1 prop)
• src/lib/lgpl/sysdeps/i386/rawmemchr.S (modified) (2 diffs, 1 prop)
• src/lib/lgpl/sysdeps/i386/strchrnul.S (modified) (2 diffs, 1 prop)
• src/lib/libc.def (modified) (3 diffs, 1 prop)
• src/lib/libc.smak (modified) (2 diffs, 1 prop)
• src/lib/libc06b4.def (modified) (1 diff, 1 prop)
• src/lib/libc06b5.def (modified) (1 diff, 1 prop)

trunk/src/emx/include/getopt.h

@@ -1 @@
-/* getopt.h,v 1.6 2004/09/14 22:27:33 bird Exp */
+/* Declarations for getopt.
+   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+   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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
 /** @file
- * FreeBSD 5.2
- * @changed bird: Added one GNU api from libiberty.
+ * GLIBC 2.3.4
  */
 
-/*      $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $    */
-/*      $FreeBSD: src/include/getopt.h,v 1.6 2004/02/24 08:09:20 ache Exp $ */
+#ifndef _GETOPT_H
 
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dieter Baron and Thomas Klausner.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD 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 NETBSD FOUNDATION, INC. 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.
- */
+#ifndef __need_getopt
+# define _GETOPT_H 1
+#endif
 
-#ifndef _GETOPT_H_
-#define _GETOPT_H_
+/* If __GNU_LIBRARY__ is not already defined, either we are being used
+   standalone, or this is the first header included in the source file.
+   If we are being used with glibc, we need to include <features.h>, but
+   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
+   not defined, include <ctype.h>, which will pull in <features.h> for us
+   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
+   doesn't flood the namespace with stuff the way some other headers do.)  */
+#if !defined __GNU_LIBRARY__
+# include <ctype.h>
+#endif
 
-#include <sys/cdefs.h>
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+#  define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW       throw ()
+# else
+#  define __THROW
+# endif
+#endif
 
-/*
- * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.
- * getopt() is declared here too for GNU programs.
- */
-#define no_argument        0
-#define required_argument  1
-#define optional_argument  2
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
-struct option {
-        /* name of long option */
-        const char *name;
-        /*
-         * one of no_argument, required_argument, and optional_argument:
-         * whether option takes an argument
-         */
-        int has_arg;
-        /* if not NULL, set *flag to val when option found */
-        int *flag;
-        /* if flag not NULL, value to set *flag to; else return value */
-        int val;
+/* 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
+{
+  const char *name;
+  /* 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;
 };
 
-__BEGIN_DECLS
-int     getopt_long(int, char * const *, const char *,
-        const struct option *, int *);
-int     getopt_long_only(int, char * const *, const char *,
-        const struct option *, int *);
-#ifndef _GETOPT_DECLARED
-#define _GETOPT_DECLARED
-int      getopt(int, char * const [], const char *);
+/* Names for the values of the `has_arg' field of `struct option'.  */
 
-extern char *optarg;                    /* getopt(3) external variables */
-extern int optind, opterr, optopt;
-#endif
-#ifndef _OPTRESET_DECLARED
-#define _OPTRESET_DECLARED
-extern int optreset;                    /* getopt(3) external variable */
+# 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'.  */
+
+#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)
+       __THROW;
+#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)
+       __THROW;
+extern int getopt_long_only (int ___argc, char *const *___argv,
+                             const char *__shortopts,
+                             const struct option *__longopts, int *__longind)
+       __THROW;
+
 #endif
 
-/* bird - start: this is provided thru libiberty. */
-int _getopt_internal __P((int, char *const *, const char *,
-    const struct option *, int *, int));
-/* bird - end */
+#ifdef  __cplusplus
+}
+#endif
 
-__END_DECLS
+/* Make sure we later can get all the definitions and declarations.  */
+#undef __need_getopt
 
-#endif /* !_GETOPT_H_ */
+#endif /* getopt.h */

trunk/src/emx/src/lib/lgpl/argp/argp-ba.c

@@ -24 +24 @@
    messages), embedded in a sentence that says something like `Report bugs to
    ADDR.'.  */
-const char *argp_program_bug_address;
+const char *argp_program_bug_address = 0;

trunk/src/emx/src/lib/lgpl/argp/argp-fmtstream.h

@@ -35 +35 @@
 #include <unistd.h>
 
+#ifndef __IN_INNOTEK_LIBC__
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
@@ -53 +54 @@
 #define ARGP_FMTSTREAM_USE_LINEWRAP
 #endif
+#else /* __IN_INNOTEK_LIBC__ */
+# ifdef printf
+#  define __format__(a,b,c)
+# endif
+#endif /* __IN_INNOTEK_LIBC__ */
 
 #ifdef ARGP_FMTSTREAM_USE_LINEWRAP
@@ -198 +204 @@
 /* Inline versions of above routines.  */
 
+#ifndef __IN_INNOTEK_LIBC__
 #if !_LIBC
 #define __argp_fmtstream_putc argp_fmtstream_putc
@@ -209 +216 @@
 #define __argp_fmtstream_ensure _argp_fmtstream_ensure
 #endif
+#endif /* !__IN_INNOTEK_LIBC__ */
 
 #ifndef ARGP_FS_EI
@@ -295 +303 @@
 }
 
-#if !_LIBC
+#if (!defined _LIBC || !_LIBC) && !defined __IN_INNOTEK_LIBC__
 #undef __argp_fmtstream_putc
 #undef __argp_fmtstream_puts

trunk/src/emx/src/lib/lgpl/argp/argp-help.c

@@ -55 +55 @@
 #ifndef _
 /* This is for other GNU distributions with internationalized messages.  */
-# if defined HAVE_LIBINTL_H || defined _LIBC
+# if (defined HAVE_LIBINTL_H || defined _LIBC) && !defined __IN_INNOTEK_LIBC__
 #  include <libintl.h>
 #  ifdef _LIBC
@@ -82 +82 @@
 #include "argp-fmtstream.h"
 #include "argp-namefrob.h"
+#ifdef __IN_INNOTEK_LIBC__
+#include <sys/stdint.h>
+#endif
 
 #ifndef SIZE_MAX
@@ -1575 +1578 @@
     return;
 
-#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+#if defined (__IN_INNOTEK_LIBC__) || _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
   __flockfile (stream);
 #endif
@@ -1585 +1588 @@
   if (! fs)
     {
-#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+#if defined (__IN_INNOTEK_LIBC__) || _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
       __funlockfile (stream);
 #endif
@@ -1695 +1698 @@
     }
 
-#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+#if  defined (__IN_INNOTEK_LIBC__) || _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
   __funlockfile (stream);
 #endif
@@ -1717 +1720 @@
 #endif
 
+#ifndef __IN_INNOTEK_LIBC__
 #ifndef _LIBC
 char *__argp_basename (char *name)
@@ -1742 +1746 @@
 }
 #endif
+#else /* __IN_INNOTEK_LIBC__ */
+char *
+__argp_short_program_name (void)
+{
+    return (char *)getprogname();
+}
+#endif /* __IN_INNOTEK_LIBC__ */
+
 
 /* Output, if appropriate, a usage message for STATE to STREAM.  FLAGS are
@@ -1784 +1796 @@
           va_list ap;
 
-#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+#if  defined (__IN_INNOTEK_LIBC__) || _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
           __flockfile (stream);
 #endif
@@ -1822 +1834 @@
           va_end (ap);
 
-#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+#if  defined (__IN_INNOTEK_LIBC__) || _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
           __funlockfile (stream);
 #endif
@@ -1851 +1863 @@
       if (stream)
         {
-#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+#if  defined (__IN_INNOTEK_LIBC__) || _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
           __flockfile (stream);
 #endif
@@ -1907 +1919 @@
                   putc_unlocked (':', stream);
                   putc_unlocked (' ', stream);
+#if defined (__IN_INNOTEK_LIBC__)
+                  buf [sizeof (buf) - 1] = buf [0] = '\0';
+                  strerror_r (errnum, buf, sizeof (buf));
+                  fputs (buf, stream);
+#else /* !__IN_INNOTEK_LIBC__ */
 #if defined _LIBC || defined HAVE_STRERROR_R
                   fputs (__strerror_r (errnum, buf, sizeof (buf)), stream);
@@ -1912 +1929 @@
                   fputs (strerror (errnum), stream);
 #endif
+#endif /* !__IN_INNOTEK_LIBC__ */
                 }
             }
@@ -1922 +1940 @@
             putc_unlocked ('\n', stream);
 
-#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+#if  defined (__IN_INNOTEK_LIBC__) || _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
           __funlockfile (stream);
 #endif

trunk/src/emx/src/lib/lgpl/argp/argp-namefrob.h

@@ -19 +19 @@
    02111-1307 USA.  */
 
-#if !_LIBC
+#if (!defined _LIBC || !_LIBC) && !defined __IN_INNOTEK_LIBC__
+#error "__IN_INNOTEK_LIBC__ isn't defined!"
 /* This code is written for inclusion in gnu-libc, and uses names in the
    namespace reserved for libc.  If we're not compiling in libc, define those
@@ -151 +152 @@
 #endif
 
-#if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
+#if defined _LIBC || (defined(HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME) && HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME)
 # define __argp_short_program_name()    (program_invocation_short_name)
 #else

trunk/src/emx/src/lib/lgpl/argp/argp-parse.c

@@ -43 +43 @@
 #include <limits.h>
 #include <getopt.h>
+#ifndef __IN_INNOTEK_LIBC__
 #include <getopt_int.h>
+#else
+#include "../posix/getopt_int.h"
+#endif
 
 #ifndef _
@@ -123 +127 @@
 
     case OPT_PROGNAME:          /* Set the program name.  */
+#ifndef __IN_INNOTEK_LIBC__
 #if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_NAME
       program_invocation_name = arg;
+#endif
 #endif
       /* [Note that some systems only have PROGRAM_INVOCATION_SHORT_NAME (aka
@@ -137 +143 @@
         state->name = arg;
 
+#ifndef __IN_INNOTEK_LIBC__
 #if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
       program_invocation_short_name = state->name;
+#endif
 #endif
 
@@ -514 +522 @@
 
   parser->groups = parser->storage;
-  parser->child_inputs = parser->storage + GLEN;
-  parser->long_opts = parser->storage + GLEN + CLEN;
-  parser->short_opts = parser->storage + GLEN + CLEN + LLEN;
+  parser->child_inputs = (void **)((char *)parser->storage + GLEN);
+  parser->long_opts = (struct option *)((char *)parser->storage + GLEN + CLEN);
+  parser->short_opts = (char *)parser->storage + GLEN + CLEN + LLEN;
   parser->opt_data = opt_data;
 

trunk/src/emx/src/lib/lgpl/argp/argp-pv.c

@@ -23 +23 @@
    print this this string followed by a newline and exit (unless the
    ARGP_NO_EXIT flag is used).  Overridden by ARGP_PROGRAM_VERSION_HOOK.  */
-const char *argp_program_version;
+const char *argp_program_version = 0;

trunk/src/emx/src/lib/lgpl/argp/argp-pvh.c

@@ -30 +30 @@
    current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
    used).  This variable takes precedent over ARGP_PROGRAM_VERSION.  */
-void (*argp_program_version_hook) (FILE *stream, struct argp_state *state);
+void (*argp_program_version_hook) (FILE *stream, struct argp_state *state) = NULL;

trunk/src/emx/src/lib/lgpl/argp/argp-xinl.c

@@ -36 +36 @@
 
 /* Add weak aliases.  */
+#ifndef __IN_INNOTEK_LIBC__
 #if _LIBC - 0 && defined (weak_alias)
 
@@ -43 +44 @@
 
 #endif
+#endif

trunk/src/emx/src/lib/lgpl/include/config.h

@@ -113 +113 @@
 #endif
 
-#include "libc-alias.h"
+#include "libc-alias-glibc.h"
 #endif

trunk/src/emx/src/lib/lgpl/include/libc-alias-glibc.h

@@ -32 +32 @@
 
 /* a little hack */
+#undef _GNU_SOURCE
 #define _GNU_SOURCE
+#undef _BSD_SOURCE
+#define _BSD_SOURCE
+#undef _SVID_SOURCE
+#define _SVID_SOURCE
+#undef _POSIX_SOURCE
+#undef _POSIX_C_SOURCE
 #include <sys/cdefs.h>
 
-#define weak_alias(a,b)
-#define INTDEF(a)
-#define libc_hidden_def(a)
+#ifndef _LIBC_SYMBOLS_H /* hackityhack */
+#undef weak_alias
+#define weak_alias(name, aliasname)
+#undef INTDEF
+#define INTDEF(name)
+#define libc_hidden_def(name)
+#endif
 
 #define __stpcpy(d, s) stpcpy(d, s)
@@ -460 +471 @@
 #define __abs _STD(abs)
 #define __environ _STD(environ)
+#define __strcasecmp _STD(stricmp)
+#define __strncasecmp _STD(strnicmp)
+#define __flockfile _STD(flockfile)
+#define __ftrylockfile _STD(ftrylockfile)
+#define __funlockfile _STD(funlockfile)
 
 #endif

trunk/src/emx/src/lib/lgpl/include/libc-symbols.h

@@ -93 +93 @@
 # endif
 #endif
+
+#ifdef __IN_INNOTEK_LIBC__
+
+/* InnoTek LIBC uses an awk script for generating aliases. */
+# define weak_alias(original, alias)
+# define weak_extern(original, alias)
+
+#else /* !__IN_INNOTEK_LIBC__ */
 
 #ifndef __ASSEMBLER__
@@ -202 +210 @@
 
 #endif /* __ASSEMBLER__ */
+
+#endif /* !__IN_INNOTEK_LIBC__ */
 
 /* On some platforms we can make internal function calls (i.e., calls of

trunk/src/emx/src/lib/lgpl/posix/getopt.c

@@ -56 +56 @@
 /* This needs to come after some library #include
    to get __GNU_LIBRARY__ defined.  */
-#ifdef  __GNU_LIBRARY__
+#if defined __GNU_LIBRARY__ || defined __INNOTEK_LIBC__
 /* Don't include stdlib.h for non-GNU C libraries because some of them
    contain conflicting prototypes for getopt.  */
@@ -69 +69 @@
 #endif
 
-#ifdef _LIBC
+#ifndef __INNOTEK_LIBC__
+#ifndef _LIBC
 # include <libintl.h>
 #else
@@ -75 +76 @@
 # define _(msgid) gettext (msgid)
 #endif
+#else /* __INNOTEK_LIBC__ */
+# define _(msgid) msgid
+#endif /* __INNOTEK_LIBC__ */
 
 #if defined _LIBC && defined USE_IN_LIBIO
@@ -1179 +1183 @@
 
 int
-getopt (int argc, char *const *argv, const char *optstring)
+_STD(getopt) (int argc, char *const *argv, const char *optstring)
 {
   return _getopt_internal (argc, argv, optstring,

trunk/src/emx/src/lib/lgpl/posix/getopt1.c

@@ -63 +63 @@
 
 int
-getopt_long (int argc, char *const *argv, const char *options,
+_STD(getopt_long) (int argc, char *const *argv, const char *options,
              const struct option *long_options, int *opt_index)
 {
@@ -84 +84 @@
 
 int
-getopt_long_only (int argc, char *const *argv, const char *options,
+_STD(getopt_long_only) (int argc, char *const *argv, const char *options,
                   const struct option *long_options, int *opt_index)
 {

trunk/src/emx/src/lib/lgpl/sysdeps/i386/rawmemchr.S

@@ -39 +39 @@
 
         .text
-ENTRY (BP_SYM (_STD (rawmemchr)))
+ENTRY (BP_SYM (__rawmemchr))
         ENTER
 
@@ -225 +225 @@
         LEAVE
         RET_PTR
-END (BP_SYM (_STD (rawmemchr)))
+END (BP_SYM (__rawmemchr))
 
 /*libc_hidden_def (BP_SYM (__rawmemchr)) */
 /*w e a k _ a l i a s (BP_SYM (__rawmemchr), BP_SYM (rawmemchr)) */
+weak_alias(__rawmemchr, rawmemchr)

trunk/src/emx/src/lib/lgpl/sysdeps/i386/strchrnul.S

@@ -36 +36 @@
 
         .text
-ENTRY (BP_SYM (_STD (strchrnul)))
+ENTRY (BP_SYM (__strchrnul))
         ENTER
 
@@ -285 +285 @@
         LEAVE
         RET_PTR
-END (BP_SYM (_STD (strchrnul)))
+END (BP_SYM (__strchrnul))
 
 /*w e a k _ a l i a s (BP_SYM (__strchrnul), BP_SYM (strchrnul)) */
+weak_alias(__strchrnul, strchrnul)

trunk/src/emx/src/lib/libc.def

@@ -69 +69 @@
     "_optind" @47
     "_optopt" @48
-    "_optreset" @49
+    ;dead with gnu getopt - "_optreset" @49
     "_pwdb_versions" @50
     "__std_suboptarg" @51
@@ -1742 +1742 @@
     "__std_isinf" @1744
     ; 06r1
-    "__std_rawmemchr" @1745
-    "__std_strchrnul" @1746
+    "___rawmemchr" @1745
+    "___strchrnul" @1746
     "__std_fgets_unlocked" @1747
     "__std_gets_unlocked" @1748
@@ -1753 +1753 @@
     "__std_getline" @1754
     "__std_getlogin_r" @1755
+    "__getopt_internal" @1756
+    "__getopt_internal_r" @1757
+    "__getopt_long_only_r" @1758
+    "__getopt_long_r" @1759
+    "_argp_err_exit_status" @1760
+    "___argp_error" @1761
+    "___argp_failure" @1762
+    "___argp_fmtstream_ensure" @1763
+    "___argp_fmtstream_free" @1764
+    "___argp_fmtstream_point" @1765
+    "___argp_fmtstream_printf" @1766
+    "___argp_fmtstream_putc" @1767
+    "___argp_fmtstream_puts" @1768
+    "___argp_fmtstream_set_lmargin" @1769
+    "___argp_fmtstream_set_rmargin" @1770
+    "___argp_fmtstream_set_wmargin" @1771
+    "___argp_fmtstream_update" @1772
+    "___argp_fmtstream_write" @1773
+    "___argp_help" @1774
+    "___argp_input" @1775
+    "___argp_make_fmtstream" @1776
+    "___argp_parse" @1777
+    "_argp_program_bug_address" @1778
+    "_argp_program_version" @1779
+    "_argp_program_version_hook" @1780
+    "___argp_short_program_name" @1781
+    "___argp_state_help" @1782
+    "___argp_usage" @1783
+    "___option_is_end" @1784
+    "___option_is_short" @1785

trunk/src/emx/src/lib/libc.smak

@@ -32 +32 @@
 .TCF    := \
  -DIN_INNOTEK_LIBC \
+ -D__IN_INNOTEK_LIBC__ \
  -D__DBINTERFACE_PRIVATE \
  -D__NETBSD_SYSCALLS \
@@ -443 +444 @@
         $(call DO.COMPILE.asm)
         
-# libc06b4                                              
-$.omf/libc06b4.dll: src/lib/libc06b4.def $.omf/fwdstub.obj $.omf/libc_dll.lib
-        gcc -Zomf -o $@ -nostdlib -Zdll $^
-$(INS)lib/libc06b4.dll: $.omf/libc06b4.dll
-        $(call CP,$<,$@)
-INS.FILES += $(INS)lib/libc06b4.dll
-libc-dll: $.omf/libc06b4.dll
+## libc06b4                                             
+#$.omf/libc06b4.dll: src/lib/libc06b4.def $.omf/fwdstub.obj $.omf/libc_dll.lib
+#       gcc -Zomf -o $@ -nostdlib -Zdll $^
+#$(INS)lib/libc06b4.dll: $.omf/libc06b4.dll
+#       $(call CP,$<,$@)
+#INS.FILES += $(INS)lib/libc06b4.dll
+#libc-dll: $.omf/libc06b4.dll
 
 # libc06b5                                              

trunk/src/emx/src/lib/libc06b4.def

@@ -70 +70 @@
     "_optind" @47
     "_optopt" @48
-    "_optreset" @49
+    "___nullstub_data" @49 ; dead with gnu getopt
     "_pwdb_versions" @50
     "__std_suboptarg" @51

trunk/src/emx/src/lib/libc06b5.def

@@ -70 +70 @@
     "_optind" @47
     "_optopt" @48
-    "_optreset" @49
+    "___nullstub_data" @49 ; dead with gnu getopt
     "_pwdb_versions" @50
     "__std_suboptarg" @51