Commit: 8fd865b89fd0504dfe5a5199e2be56155177f0b9 - mingw-catgets (git)

POSIX.1 National Language Support API for MinGW

Commit MetaInfo

• Revision: 8fd865b89fd0504dfe5a5199e2be56155177f0b9 (tree)
• Zeit: 2008-01-09 04:51:59
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Add -help' and -version' options for gencat'.

Ändern Zusammenfassung

• modified: ChangeLog
• modified: Makefile.in
• modified: aclocal.m4
• modified: configure
• modified: configure.ac
• modified: gencat.c
• modified: gendefs.awk
• modified: include/gcmsgs.h
• add: repl/getopt.c
• add: repl/include/getopt.h

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Add `-help' and `-version' options for `gencat'.
+
+	* repl/getopt.c: New file; it provides a replacement for the
+	`libmingwex.a' implementation of the `getopt' object module, with...
+	(getopt_long_only): New function; implement it.
+
+	* repl/include/getopt.h: New file; it provides a replacement header
+	for use with the above replacement getopt.c implementation.
+
+	* gencat.c: Add more comments; update copyright notice for new year.
+	(PROGRAM_IDENTITY): New manifest definition.
+	(AUTHOR_IDENTITY, AUTHOR_ATTRIBUTION): Ditto.
+	(COPYRIGHT_YEARS, COPYRIGHT_HOLDER, COPYRIGHT_NOTICE): Ditto.
+	(stdarg.h, getopt.h): Include.
+	(banner_printf): New static function.
+	(main): Add `options' defining structure; filter `argv' through it,
+	using `getopt_long_only' function.
+
+	* include/gcmsgs.h: Update copyright notice for new year.
+	Renumber existing message sets, making initial space to insert...
+	(MSG_PROGRAM_BANNER): New message definition; allocate exclusively to
+	message set #1, for display by both `-help' and `-version' options.
+	(MSG_COPYRIGHT_NOTICE): New message definition; allocate exclusively
+	to message set #2, for display by `-version' option.
+	(MSG_GENCAT_SYNOPSIS): New message definition; allocate exclusively to
+	message set #3, for display by `-help' option.
+	Add additional comments; document message set allocations.
+
+	* gendefs.awk (MULTILINE): New control variable; use it to implement
+	handling for multiline message definitions.
+	
+	* Makefile.in (DEV_SCRIPTS): Renamed again, to...
+	(DISTDEV_SCRIPTS): ...this; it specifies the distributable scripts.
+	(EXECDEV_SCRIPTS): Define; it specifies executable variants of these.
+	(all-targets): Include EXECDEV_SCRIPTS, to ensure they are built.
+	(install-scripts): Ditto, to install them.
+	(AWK_INTERPRETER): New autoconf substitution; use it to define a
+	generic pattern rule, for generating EXECDEV_SCRIPTS from awk scripts
+	specified in DISTDEV_SCRIPTS.
+
+	* aclocal.m4: Add copyright notice, and other macro specific comments.
+	(GENCAT_AC_FUNC_GETOPT_LONG_ONLY): New macro; it checks for presence
+	of the getopt_long_only() function, in the standard C libraries.
+	(GENCAT_AC_OBJECTS_ADD_GETOPT): New macro; it is invoked if needed, by
+	GENCAT_AC_FUNC_GETOPT_LONG_ONLY, to schedule building of a replacement
+	getopt function module, providing getopt_long_only().
+
+	* configure.ac: Update copyright notice, for new year.
+	(AWK_INTERPRETER): New AC_SUBST variable; defined by AC_PATH_PROG.
+	(GENCAT_AC_FUNC_GETOPT_LONG_ONLY): Invoke.
+
+	* configure: Regenerated.
+
 2008-01-01  Keith Marshall  <[e-mail]>
 
 	Establish package structure for distribution.

--- a/Makefile.in
+++ b/Makefile.in
@@ -94,7 +94,7 @@ GENCAT_SOURCES  = gencat.c mcload.c mcsource.c mciconv.c mcmerge.c mcutfsig.c
 GENCAT_OBJECTS  = @GENCAT_OBJECTS@
 
 OTHER_SOURCES   = $(DISTDOC_SOURCES) mkinstalldirs install-sh $(MISC_SOURCES)
-MISC_SOURCES	= $(CONFIG_HEADERS) $(CONFIG_SOURCES) $(DEV_SCRIPTS)
+MISC_SOURCES	= $(CONFIG_HEADERS) $(CONFIG_SOURCES) $(DISTDEV_SCRIPTS)
 
 DISTDOC_SOURCES = ChangeLog COPYING FDL README
 MANPAGE_SOURCES	= catopen.man catgets.man catclose.man gencat.man
@@ -133,7 +133,13 @@ BUILD_LIBS	= libcatgets.a
 BUILD_DLLS	= catgets$(DLLVERSION).dll
 DLLVERSION	= @DLLVERSION@
 
-DEV_SCRIPTS	= gendefs.awk
+DISTDEV_SCRIPTS	= gendefs.awk
+
+# DISTDEV_SCRIPTS may not be directly runnable...
+# EXECDEV_SCRIPTS derives from them, creating variants with appropriate
+# shebang entries, making them directly executable from a command line.
+#
+EXECDEV_SCRIPTS = gendefs
 
 # Generic rule, replacing the built-in default, to create an object file
 # from a C source file...
@@ -158,8 +164,15 @@ AUTOGENERATED = Automatically generated from $<; do not edit!
 %.h: repl/include/%.h
 	$(LN_S) $< $@
 
+# Generic rule to make a runnable (shebanged) script,
+# from a non-runnable awk program script.
+#
+%: %.awk
+	sed '1s,!.*,! @AWK_INTERPRETER@ -f,' $< > $@
+	chmod 755 $@
+
 all-dll = @MAKE_DLL@
-all-targets = @MAKE_TARGETS@
+all-targets = $(EXECDEV_SCRIPTS) @MAKE_TARGETS@
 
 all: $(all-targets)
 
@@ -227,7 +240,7 @@ install-bin-progs: $(BUILD_PROGS)
 	  $(INSTALL_PROGRAM) $$prog ${bindir}/$(tool_prefix)$$progname; \
 	done
 
-install-scripts: $(DEV_SCRIPTS)
+install-scripts: $(EXECDEV_SCRIPTS)
 	$(mkinstalldirs) --require ${prefix} ${scriptdir}
 	for script in $^; do \
 	  prog=`IFS='\\/'; set x $$script; eval echo '$$'$$#`; \
@@ -361,4 +374,4 @@ distclean: distclean-cross-hosted clean
 distclean-cross-hosted: FORCE
 	rm -rf cross-build
 
-# $RCSfile$Revision: 1.5 $: end of file
+# $RCSfile$Revision: 1.6 $: end of file

--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,16 @@
 # aclocal.m4 -*- Autoconf -*- vim: filetype=config
 #
+# $Id$
+#
+# Copyright (C) 2006, 2007, 2008, MinGW Project
+# Written by Keith Marshall <[e-mail]>
+#
+# This is aclocal.m4 for the MinGW `catgets' package.
+#
+# This is free software; it is provided `as is', in the hope that it may
+# be useful, but WITHOUT WARRANTY OF ANY KIND, not even an implied warranty
+# of MERCHANTABILITY, nor of FITNESS FOR ANY PARTICULAR PURPOSE.
+#
 m4_include([m4/pkgid.m4])
 m4_include([m4/iconv.m4])
 
@@ -208,39 +219,106 @@ AC_DEFUN([CATGETS_AC_CONFIG_TARGET],
  fi[]dnl
 ])# CATGETS_AC_CONFIG_TARGET
 
+# GENCAT_AC_OBJECTS_INIT
+# ----------------------
+# Initialise the list of object files to be compiled,
+# as prerequisites for building the `gencat' executable.
+#
 AC_DEFUN([GENCAT_AC_OBJECTS_INIT],
 [GENCAT_OBJECTS=${GENCAT_OBJECTS-'gencat.$(OBJEXT)'}
  AC_SUBST([GENCAT_OBJECTS])dnl
 ])# GENCAT_AC_OBJECTS_INIT
 
+# GENCAT_AC_OBJECTS_ADD( OBJECT_FILE_NAME )
+# -----------------------------------------
+# Add OBJECT_FILE_NAME to the list of object files to be compiled,
+# as prerequisites for building the `gencat' executable.
+#
 AC_DEFUN([GENCAT_AC_OBJECTS_ADD],
 [AC_REQUIRE([GENCAT_AC_OBJECTS_INIT])dnl
  GENCAT_OBJECTS=${GENCAT_OBJECTS}' $1.$(OBJEXT)'dnl
 ])# GENCAT_AC_OBJECTS_ADD
 
+# GENCAT_AC_FUNC_BASENAME
+# -----------------------
+# Check if the standard C library provides the `basename' function;
+# if not, add `basename.$(OBJEXT)' to the list of prerequisite objects
+# to be compiled, to ensure that a replacement is made available from
+# package local sources.
+#
 AC_DEFUN([GENCAT_AC_FUNC_BASENAME],
 [AC_REQUIRE([GENCAT_AC_OBJECTS_INIT])dnl
  AC_CHECK_FUNCS([basename],[],GENCAT_AC_OBJECTS_ADD([basename]))dnl
 ])# GENCAT_AC_FUNC_BASENAME
 
+# GENCAT_AC_FUNC_MKSTEMP
+# ----------------------
+# Check if the standard C library provides the `mkstemp' function;
+# if not, add `mkstemp.$(OBJEXT)' to the list of prerequisite objects
+# to be compiled, to ensure that a replacement is made available from
+# package local sources.
+#
 AC_DEFUN([GENCAT_AC_FUNC_MKSTEMP],
 [AC_REQUIRE([GENCAT_AC_OBJECTS_INIT])dnl
  AC_CHECK_FUNCS([mkstemp],[],GENCAT_AC_OBJECTS_ADD([mkstemp]))dnl
 ])# GENCAT_AC_FUNC_MKSTEMP
 
+# GENCAT_AC_FUNC_GETOPT_LONG_ONLY
+# -------------------------------
+# Check if the standard C library provides the `getopt_long_only'
+# function; if not, add `getopt.$(OBJEXT)' to the list of prerequisite
+# objects to be compiled, to ensure that a replacement is made available
+# from package local sources.
+#
+AC_DEFUN([GENCAT_AC_FUNC_GETOPT_LONG_ONLY],
+[AC_REQUIRE([GENCAT_AC_OBJECTS_INIT])dnl
+ AC_CHECK_FUNCS([getopt_long_only],[],GENCAT_AC_OBJECTS_ADD_GETOPT)dnl
+])# GENCAT_AC_FUNC_GETOPT_LONG_ONLY
+
+# GENCAT_AC_OBJECTS_ADD_GETOPT
+# ----------------------------
+# Helper macro invoked by GENCAT_AC_FUNC_GETOPT_LONG_ONLY,
+# to add `getopt.$(OBJECT)' to the list of prerequisite objects
+# to be compiled; it also ensures that a compatible version of
+# `getopt.h' is used, by adding a compatible package local
+# version to the LOCAL_HEADERS list.
+#
+AC_DEFUN([GENCAT_AC_OBJECTS_ADD_GETOPT],
+[AC_SUBST([LOCAL_HEADERS],["getopt.h ${LOCAL_HEADERS}"])
+ GENCAT_AC_OBJECTS_ADD([getopt])dnl
+])# GENCAT_AC_OBJECTS_ADD_GETOPT
+
+# GENCAT_AC_FUNC_LANGINFO
+# -----------------------
+# Check if the standard C library provides the `nl_langinfo' function;
+# if not, add `langinfo.$(OBJEXT)' to the list of prerequisite objects
+# to be compiled, to ensure that a replacement is made available from
+# package local sources.
+#
 AC_DEFUN([GENCAT_AC_FUNC_NL_LANGINFO],
 [AC_REQUIRE([GENCAT_AC_OBJECTS_INIT])dnl
  AC_CHECK_FUNCS([nl_langinfo],[],GENCAT_AC_OBJECTS_ADD([langinfo]))dnl
 ])# GENCAT_AC_FUNC_NL_LANGINFO
 
+# CATGETS_AC_CONFIG_VERSION
+# -------------------------
+# Propagate the `catgets' version number into object code,
+# via manifest definitions in `config.h'.
+#
 AC_DEFUN([CATGETS_AC_CONFIG_VERSION],
 [CATGETS_AC_CONFIG_VERSION_DEFINE([CATGETS_VERSION_MAJOR],[major],[2])dnl
  CATGETS_AC_CONFIG_VERSION_DEFINE([CATGETS_VERSION_MINOR],[minor],[3])dnl
 ])# CATGETS_AC_CONFIG_VERSION
 
+# CATGETS_AC_CONFIG_VERSION_DEFINE
+# --------------------------------
+# Helper macro invoked by CATGETS_AC_CONFIG_VERSION,
+# to place manifest definitions of the `catgets' major and minor
+# version numbers into `config.h'.
+#
 AC_DEFUN([CATGETS_AC_CONFIG_VERSION_DEFINE],
 [AC_DEFINE_UNQUOTED([$1],[`IFS=.;set x $PACKAGE_VERSION;echo ${$3}`],
  [Define numerically to the catgets $2 version number])dnl
 ])# CATGETS_AC_CONFIG_VERSION_DEFINE
 
-# $RCSfile$Revision: 1.2 $: end of file
+# $RCSfile$Revision: 1.3 $: end of file

--- a/configure
+++ b/configure
@@ -310,7 +310,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAKE_TARGETS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAKE_DLL DLLVERSION canonical_prefix HOST_PATH_SEPARATOR REPLACEMENT_HEADERS CPP EGREP LOCAL_HEADERS GENCAT_OBJECTS INCICONV LIBICONV LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAKE_TARGETS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S AR ac_ct_AR AWK_INTERPRETER INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAKE_DLL DLLVERSION canonical_prefix HOST_PATH_SEPARATOR REPLACEMENT_HEADERS CPP EGREP LOCAL_HEADERS GENCAT_OBJECTS INCICONV LIBICONV LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -2398,6 +2398,46 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
+  # Extract the first word of "awk", so it can be a program name with args.
+set dummy awk; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_AWK_INTERPRETER+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $AWK_INTERPRETER in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_AWK_INTERPRETER="$AWK_INTERPRETER" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_AWK_INTERPRETER="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_AWK_INTERPRETER" && ac_cv_path_AWK_INTERPRETER="/bin/awk"
+  ;;
+esac
+fi
+AWK_INTERPRETER=$ac_cv_path_AWK_INTERPRETER
+
+if test -n "$AWK_INTERPRETER"; then
+  echo "$as_me:$LINENO: result: $AWK_INTERPRETER" >&5
+echo "${ECHO_T}$AWK_INTERPRETER" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
   ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -4235,9 +4275,9 @@ done
 
 
 # Object modules required to build the `gencat' executable.
-# We need `mkstemp', `nl_langinfo' and `basename'; if these are
-# already available in system libraries, just use the provided
-# implementations, otherwise we must supply them.
+# We need `mkstemp', `nl_langinfo', `getopt_long_only' and `basename';
+# if these are already available in system libraries, just use the
+# provided implementations, otherwise we must supply them.
 #
 
 for ac_func in mkstemp
@@ -4448,6 +4488,112 @@ fi
 done
 
 
+for ac_func in getopt_long_only
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  LOCAL_HEADERS="getopt.h ${LOCAL_HEADERS}"
+
+  GENCAT_OBJECTS=${GENCAT_OBJECTS}' getopt.$(OBJEXT)'
+fi
+done
+
+
 for ac_func in basename
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -5691,6 +5837,7 @@ s,@OBJEXT@,$OBJEXT,;t t
 s,@LN_S@,$LN_S,;t t
 s,@AR@,$AR,;t t
 s,@ac_ct_AR@,$ac_ct_AR,;t t
+s,@AWK_INTERPRETER@,$AWK_INTERPRETER,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
@@ -6199,4 +6346,4 @@ if test "$no_create" != yes; then
 fi
 
 #
-# $RCSfile$Revision: 1.3 $: end of file
+# $RCSfile$Revision: 1.4 $: end of file

--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2006, 2007, MinGW Project
+# Copyright (C) 2006, 2007, 2008, MinGW Project
 # Written by Keith Marshall <[e-mail]>
 #
 # Package identification.
@@ -62,6 +62,7 @@
   AC_PROG_CC
   AC_PROG_LN_S
   AC_CHECK_TOOL([AR], [ar], [ar])
+  AC_PATH_PROG([AWK_INTERPRETER], [awk], [/bin/awk])
   AC_PROG_INSTALL
 
 # Check if Win32 DLLs should be built,
@@ -102,12 +103,13 @@
   MINGW_AC_LC_EXTENSIONS([LOCAL_HEADERS])
 
 # Object modules required to build the `gencat' executable.
-# We need `mkstemp', `nl_langinfo' and `basename'; if these are
-# already available in system libraries, just use the provided
-# implementations, otherwise we must supply them.
+# We need `mkstemp', `nl_langinfo', `getopt_long_only' and `basename';
+# if these are already available in system libraries, just use the
+# provided implementations, otherwise we must supply them.
 #
   GENCAT_AC_FUNC_MKSTEMP
   GENCAT_AC_FUNC_NL_LANGINFO
+  GENCAT_AC_FUNC_GETOPT_LONG_ONLY
   GENCAT_AC_FUNC_BASENAME
 #
 # The remainder are always provided by this package.
@@ -127,4 +129,4 @@
   AC_CONFIG_FILES([Makefile])
   AC_OUTPUT
 #
-# $RCSfile$Revision: 1.3 $: end of file
+# $RCSfile$Revision: 1.4 $: end of file

--- a/gencat.c
+++ b/gencat.c
@@ -3,12 +3,12 @@
  *
  * $Id$
  *
- * Copyright (C) 2006, 2007, Keith Marshall
+ * Copyright (C) 2006, 2007, 2008, Keith Marshall
  *
  * This file implements the `main' function for the `gencat' program.
  *
  * Written by Keith Marshall  <[e-mail]>
- * Last modification: 12-May-2007
+ * Last modification: 08-Jan-2008
  *
  *
  * This is free software.  It is provided AS IS, in the hope that it may
@@ -26,6 +26,14 @@
  * MA 02110-1301, USA.
  *
  */
+#define PROGRAM_IDENTITY	progname, PACKAGE_VERSION
+
+#define AUTHOR_IDENTITY		"Keith Marshall"
+#define AUTHOR_ATTRIBUTION	AUTHOR_IDENTITY" for the MinGW Project"
+
+#define COPYRIGHT_YEARS		"2006, 2007, 2008"
+#define COPYRIGHT_HOLDER	COPYRIGHT_YEARS, AUTHOR_IDENTITY
+#define COPYRIGHT_NOTICE	MSG_COPYRIGHT_NOTICE, COPYRIGHT_HOLDER
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -34,10 +42,12 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <getopt.h>
 #include <libgen.h>
 #include <errno.h>
 
@@ -54,12 +64,60 @@ char *progname, *invoked;
 int gencat_errno = 0;
 nl_catd gencat_messages;
 
+/* Option control flags, for printing of program identification banners,
+ * as required for `help', `version' and copyright notifications.
+ */
+#define print_top_banner	0x08
+#define print_nl_duplicate	0x04
+
+/* Standard arguments, to include in a program identification banner.
+ */
+#define top_banner_text PROGRAM_IDENTITY, AUTHOR_ATTRIBUTION
+
+static
+void banner_printf( int opts, int set, int msg, const char *fmt, ... )
+{
+  /* A helper function, for printing banner notifications.
+   */
+  va_list args;
+  const char *nl_fmt = catgets( gencat_messages, set, msg, NULL );
+
+  if( opts & print_top_banner )
+    printf( catgets( gencat_messages, MSG_PROGRAM_BANNER ), top_banner_text );
+
+  va_start( args, fmt );
+  if( (nl_fmt == NULL) || ((opts & print_nl_duplicate) != 0) )
+    /*
+     * A national language translation has been provided, but the
+     * English version must also be displayed, or there is no available
+     * translation, so we just print the English text anyway.
+     */
+    vprintf( fmt, args );
+
+  if( nl_fmt != NULL )
+    /*
+     * When we found a national language translation, we print it.
+     */
+    vprintf( nl_fmt, args );
+  va_end( args );
+}
+
 int main( int argc, char **argv )
 {
+  struct option options[] =
+  {
+    /* The options understood by this version of `gencat';
+     * all are long form, to be evaluated by getopt_long_only().
+     */
+    { "help",    no_argument, NULL, 'h' },
+    { "version", no_argument, NULL, 'v' },
+    {  NULL,     0,           NULL,  0  }
+  };
+
   char *msgcat;
   char *outfile = NULL;
 
-  int mc, numsets, setnum, msgcount;
+  int opt, mc, numsets, setnum, msgcount;
   off_t offset, msg_index_offset;
 
   char tmpcat[] = "mcXXXXXX";
@@ -83,14 +141,51 @@ int main( int argc, char **argv )
   progname = basename( invoked = *argv );
   gencat_messages = catopen( "gencat", NL_CAT_LOCALE );
 
+  if( (*argv = strdup( progname )) != NULL )
+  {
+    /* Set up the form of the program name to display in diagnostics;
+     * exclude the path component, and discard any `.exe' suffix.
+     */
+    int ext = strlen( *argv ) - 4;
+    if( (ext > 0) && (strcasecmp( *argv + ext, ".exe" ) == 0) )
+      *(*argv + ext) = '\0';
+    progname = *argv;
+  }
+  else
+    /* Something went wrong...
+     * retain the basename from the original program path name,
+     * as the effective program name.
+     */
+    *argv = progname;
+
+  /* Evaluate any options, specified on the command line.
+   */
+  while( (opt = getopt_long_only( argc, argv, "vh", options, NULL )) != -1 )
+    switch( opt )
+    {
+      case 'h':
+	/*
+	 * This is a request to display a help message.
+	 */
+	banner_printf( print_top_banner, MSG_GENCAT_SYNOPSIS, *argv );
+	exit( EXIT_SUCCESS );
+
+      case 'v':
+	/*
+	 * And this is for display of version and copyright info.
+	 */
+	banner_printf( print_top_banner + print_nl_duplicate, COPYRIGHT_NOTICE );
+	exit( EXIT_SUCCESS );
+    }
+
   cat_index.id = tag;
 
-  if( --argc > 1 )
+  if( (argc -= optind) > 1 )
   {
     /* Initialise the message list, to incorporate any messages which
      * are already contained within the specified message catalogue.
      */
-    if( (cat = mc_load( msgcat = *++argv )) == NULL )
+    if( (cat = mc_load( msgcat = *(argv += optind) )) == NULL )
       switch( errno )
       {
 	case ENOENT:
@@ -110,23 +205,39 @@ int main( int argc, char **argv )
     while( --argc )
       cat = mc_merge( cat, mc_source( *++argv ));
 
+    /* Walk the resultant in-memory linked message list, counting...
+     */
     msgcount = numsets = setnum = 0;
     for( curr = cat; curr != NULL; curr = curr->link )
     {
+      /* the number of individual messages defined...
+       */
       ++msgcount;
       if( curr->set > setnum )
       {
+	/* and the number of distinct message sets,
+	 * to which they are allocated.
+	 */
 	++numsets;
 	setnum = curr->set;
       }
     }
     dfprintf(( stderr, "%u messages in %u sets\n", msgcount, numsets ));
+
+    /* Compute the required image size for the message catalogue index,
+     * and allocate memory in which to construct it...
+     */
     offset = ( numsets + msgcount ) * sizeof( struct key );
     if( (set_index = mc_malloc( offset )) == NULL )
     {
+      /* bailing out, if insufficient memory.
+       */
       fprintf( errmsg( MSG_OUT_OF_MEMORY ), progname );
       return( EXIT_FAILURE );
     }
+    /* Locate the start of the message index entries,
+     * within the composite set and message index image.
+     */
     msg_index = set_index + numsets;
 
     /* Create a temporary output file,
@@ -141,67 +252,134 @@ int main( int argc, char **argv )
       return EXIT_FAILURE;
     }
 
+    /* Write out the standard message catalogue header record,
+     * then seek beyond the space required for the index image,
+     * to commence writing out the message data.
+     */
     write( mc, &cat_index, sizeof( MSGCAT ) );
     offset = lseek( mc, offset, SEEK_CUR );
-    setnum = 0;
+
+    /* Compute the offset, ON DISK, for the start of the message
+     * index, within the composite set and message index image, in
+     * terms of its physical byte count from start of file.
+     */
     msg_index_offset = sizeof( MSGCAT ) + numsets * sizeof( struct key );
+
+    /* Forcing a set number transition into the first message set...
+     */
+    setnum = 0;
+    /*
+     * Walk the in-memory linked message list again...
+     */
     for( curr = cat; curr != NULL; curr = curr->link )
     {
+      /* adding a new set index entry, on each set number transition...
+       */
       if( curr->set > setnum )
       {
+	/* incorporating the applicable set number,
+	 * and the ON-DISK byte offset for the index entry
+	 * associated with its first included message.
+	 */
 	set_index->setnum = setnum = curr->set;
 	(set_index++)->offset = msg_index_offset;
       }
+      /* Adjust the cumulative computed value of the ON-DISK
+       * message index offset, to account for each message traversed...
+       */
       msg_index_offset += sizeof( struct key );
+      /*
+       * while incorporating the appropriate message number,
+       * and message data offset, into the in-memory image of
+       * the message index.
+       */
       msg_index->msgnum = curr->msg;
       (msg_index++)->offset = offset;
-
+      /*
+       * and write out the message data, to the catalogue file,
+       * updating `offset' to track where the data for the NEXT message,
+       * if any, is to be written.
+       */
       offset += write( mc, curr->base + curr->loc, curr->len );
     }
 
-    set_index = msg_index - numsets - msgcount;
+    /* Rewind the catalogue, to the start of the reserved index space...
+     */
     lseek( mc, sizeof( MSGCAT ), SEEK_SET );
+    /*
+     * Locate the start of the in-memory image of the index, once more,
+     * and copy it into the generated message catalogue.
+     */
+    set_index = msg_index - numsets - msgcount;
     write( mc, set_index, (numsets + msgcount) * sizeof( struct key ) );
 
+    /* Check message catalogue generation status...
+     */
     if( gencat_errno == 0 )
     {
+      /* Completed without error...
+       */
       if( outfile == NULL )
+	/*
+	 * Always true, at present...
+	 * (this is here to accommodate a possible future implementation
+	 *  of an `--output-file=NAME' option, to facilitate including an
+	 *  existing message catalogue into a new, and differently named,
+	 *  derivative message catalogue).
+	 */
 	outfile = msgcat;
 
       if( strcmp( outfile, "-" ) == 0 )
       {
+	/* This is emitting the message catalogue content to the standard
+	 * output stream; rewind the temporary catalogue file, read back,
+	 * and then rewrite its content to the stdout stream.
+	 */
 	int count;
 	char buf[ BUFSIZ ];
 	lseek( mc, (off_t)(0), SEEK_SET );
 	while( (count = read( mc, buf, BUFSIZ )) > 0 )
 	  write( STDOUT_FILENO, buf, count );
+
+	/* When done, close and delete the temporary file.
+	 */
 	close( mc );
 	remove( tmpcat );
       }
       else
       {
+	/* This is saving the message catalogue as a permanent disk file,
+	 * overwriting any previously existing version; this is achieved by
+	 * simply renaming the temporary file, and setting its attributes
+	 * appropriately.
+	 */
 	close( mc );
 	rename( tmpcat, outfile );
 	chmod( outfile, 0644 );
       }
     }
     else
-    {
+    { /* An error occurred...
+       * The temporary file is likely to be corrupt,
+       * so simply discard it, and report failure.
+       */
       close( mc );
       remove( tmpcat );
+      return EXIT_FAILURE;
     }
   }
 
   else
-  {
-    /* User specified insufficient command line arguments.
+  { /* User specified insufficient command line arguments.
      * Diagnose, and bail out.
      */
     fprintf( errmsg( MSG_MISSING_ARGS ), progname );
     fprintf( errmsg( MSG_GENCAT_USAGE ), progname );
     return EXIT_FAILURE;
   }
+  /* On successful completion, report it.
+   */
   return EXIT_SUCCESS;
 }
 
-/* $RCSfile$Revision: 1.1.1.1 $: end of file */
+/* $RCSfile$Revision: 1.2 $: end of file */

--- a/gendefs.awk
+++ b/gendefs.awk
@@ -29,11 +29,19 @@
 #                   message set.
 #
 #   <message text>  is the fallback text defined for the message; it
-#                   must all on the same line as the `#define' token.
+#                   must all appear on the same line as the `#define'
+#                   token, or that line must terminate with a reverse
+#                   solidus, so escaping the newline, to indicate that
+#                   the following line is to be subsumed as a logical
+#                   continuation of the `#define' line; continuation,
+#                   in this manner, may be extended over any number
+#                   of consecutive input lines, by similarly escaping
+#                   the terminal newline on all but the last physical
+#                   input line of any such single logical line.
 #
 #
 # Written by Keith Marshall  <[e-mail]>
-# Last modification: 05-Mar-2007
+# Last modification: 02-Jan-2008
 #
 #
 # This is free software.  It is provided AS IS, in the hope that it may
@@ -53,7 +61,29 @@
 
 # Establish the default convention for identifying message definitions.
 #
-  BEGIN { MSGTAG = "MSG_[A-Z_a-z0-9]+" }
+  BEGIN { MSGTAG = "MSG_[A-Z_a-z0-9]+"; MULTILINE = 0 }
+#
+# If we enabled MULTILINE mode, on the preceding input line, then we treat
+# the current input line as a logical continuation of the preceding line.
+# We must handle this case *before* any other condition, because such line
+# continuation overrides any other line type identification checks.
+#
+  MULTILINE == 1 {
+#
+#   If this continuation line is not itself continued,
+#   then we turn off MULTILINE, effective from the *next* input line.
+#
+    if( $0 !~ /\\$/ ) MULTILINE = 0;
+#
+#   We then emit the continuation line, and immediately proceed to
+#   the next input line.
+#
+    print
+    next
+  }
+#
+# If we are *not* in MULTILINE mode, then we proceed to the normal input
+# line interpretation strategy...
 #
 # Allow the user to substitute an alternative identification convention,
 # by assigning a new MSGTAG value in the input stream.
@@ -77,6 +107,12 @@
   { sub( "^#[ 	]*define[ 	]+", "# define " ) }
   $1$2 == "#define" && match( $3, MSGTAG ) == 1 && RLENGTH == length( $3 ){
 #
+#   Only lines, such as this, which begin with a `#define' token, are permitted
+#   to initiate MULTILINE continuation mode; when such a line is terminated by
+#   a reverse solidus escaped newline, then initiate MULTILINE mode.
+#
+    if( $0 ~ /\\$/ ) MULTILINE = 1
+#
 #   Extract the set number from the message definition;
 #   if it differs from that of the set identified by CURSET,
 #   then start a new set.
@@ -106,4 +142,4 @@
     print MSGNUM, $0
   }
 #
-# $RCSfile$Revision: end of file
+# $RCSfile$Revision$: end of file

--- a/include/gcmsgs.h
+++ b/include/gcmsgs.h
@@ -7,7 +7,7 @@
  * !$ Message definitions for MinGW implementation of `gencat'.
  * !$
  * !$ $Id$
- * !$ Copyright (C) 2006, 2007, MinGW Project
+ * !$ Copyright (C) 2006, 2007, 2008, MinGW Project
  * !$ Written by Keith Marshall <[e-mail]>
  * !$
  * !$ This file has been automatically generated from `gcmsgs.h',
@@ -35,29 +35,113 @@
  * !$
  * !$quote "
  * !
+ * !$ When translating these message definitions, please take care
+ * !$ to preserve the number and order of `printf' format tags; (i.e.
+ * !$ tags of the form `%c', where `c' is any alphabetic character).
+ * !$ Also please note the usage of `\n' to insert a line break into
+ * !$ any message definition, and the use of a `\` following the
+ * !$ closing quote, on all but the last line of a multiline message
+ * !$ definition; there must be no white space between the quote and
+ * !$ the following `\', nor following the `\' itself.
+ * !
+ * !
+ * !$ Message set #1 is reserved for the program banner, which is
+ * !$ displayed when either the `-help' or the `-version' option is
+ * !$ invoked; it is discretional whether a translation of this, in
+ * !$ the national language, is provided.  If not, then set #1 may be
+ * !$ excluded from the message catalogue, or the banner template
+ * !$ may be left untranslated, in which case the banner will be
+ * !$ displayed in its original English language form.
+ * !
+ */
+#define MSG_PROGRAM_BANNER   1, 1, \
+"%s (MinGW catgets SubSystem for MS-Windows), Version %s\n"\
+"Written by %s\n"
+/* 
+ * !
+ * !$ Messages in set #2 are reserved for use by the `-version' option,
+ * !$ and are displayed *both* in English *and* in the national language.
+ * !$ While it is not normally necessary to provide an English language
+ * !$ message catalogue, if one is provided, it should *exclude* all of
+ * !$ the messages defined in set #2, to avoid displaying identical
+ * !$ copies of these messages twice.
+ * !
+ */
+#define MSG_COPYRIGHT_NOTICE 2, 3, "\nCopyright (C) %s, %s.\n"\
+"This is free software; see the source for copying conditions.  There is NO\n"\
+"WARRANTY OF ANY KIND, not even an IMPLIED WARRANTY OF MERCHANTABILITY, nor\n"\
+"of FITNESS FOR ANY PARTICULAR PURPOSE.\n"
+/*
+ * !
+ * !$ Set #3 is reserved for the synopsis displayed by the `-help' option;
+ * !$ in general, a national language version of this should be provided.
+ * !
+ */
+#define MSG_GENCAT_SYNOPSIS  3, 2, \
+"\nUsage: %s catalogue-name input-file ...\n"\
+"\nDescription\n"\
+"  Generate, or update, the national language message catalogue specified\n"\
+"  by `catalogue-name', (which is a binary file, in the format required by\n"\
+"  the MinGW implementation of the POSIX `catgets' facility), reading the\n"\
+"  message definitions from each specified `input-file' in turn.\n"\
+"\nOptions\n"\
+"  In normal use, there are no options.  However, for compatibility with\n"\
+"  GNU standard utilities, the following are accepted:--\n\n"\
+"    -help, --help\n"\
+"      Display this program synopsis, and exit.\n\n"\
+"    -version, --version\n"\
+"      Display program identification, and copyright notice,\n"\
+"      then exit.\n\n"
+/*
+ * !
+ * !$ Set #4 specifies messages relating to `gencat' program invocation,
+ * !$ or to runtime problems; they should always be translated to the
+ * !$ applicable national language.
+ * !
+ */
+#define MSG_MISSING_ARGS     4, 1, "%s: incorrect number of arguments\n"
+#define MSG_GENCAT_USAGE     4, 2, "usage: %s catalogue-name input-file ...\n"
+#define MSG_OUTPUT_NOFILE    4, 3, "%s: %s: cannot create temporary output file\n"
+#define MSG_OUT_OF_MEMORY    4, 4, "%s: out of memory\n"
+#define MSG_INTERNAL_ERROR   4, 5, "%s: internal error: %s\n"
+/*
+ * !
+ * !$ Set #5 defines messages relating to problems in interpretation of
+ * !$ the content, or format, of the input files, or any pre-existing
+ * !$ version of the message catalogue which is being updated; national
+ * !$ language translations should be provided.
+ * !
+ */
+#define MSG_BAD_CATALOGUE    5, 1, "%s: %s: file is not a valid message catalogue\n"
+#define MSG_UNKNOWN_CODESET  5, 2, "%s: %s: unknown codeset descriptor\n"
+#define MSG_CODESET_CLASH    5, 3, "%s:%u: codeset `%s' conflicts with prior declaration\n"
+#define MSG_HAD_CODESET      5, 4, "%s:%u: codeset `%s' previously declared here\n"
+#define MSG_SETNUM_NOT_INCR  5, 5, "invalid set number: expecting > %d; got %d\n"
+#define MSG_MSGNUM_NOT_INCR  5, 6, "invalid message number: expecting > %d; got %d\n"
+#define MSG_REDEFINED        5, 7, "%s: %s:%u: redefinition of message %u in set %u\n"
+#define MSG_PREVIOUS_HERE    5, 8, "%s: %s:%u: previous definition was here\n"
+/*
+ * !
+ * !$ Set #6 defines messages relating to abnormal conditions occuring
+ * !$ when the end of an input file is encountered; again, national
+ * !$ language translations should be provided.
+ * !
+ */
+#define MSG_EOF_IN_QUOTES    6, 2, "%s:%u: unexpected EOF encountered before closing quote\n"
+#define MSG_TEXT_DISCARDED   6, 3, "%s:%u: incomplete message marked for deletion\n"
+#define MSG_MISSING_NEWLINE  6, 4, "%s:%u: missing newline at end of file\n"
+#define MSG_BAD_INDEX        6, 5, "invalid reference in message index"
+/*
+ * !
+ * !$ Set #7 defines messages relating to malformed Unicode input streams;
+ * !$ once again, national language translations should be provided.
+ * !
  */
-#define MSG_MISSING_ARGS     1, 1, "%s: incorrect number of arguments\n"
-#define MSG_GENCAT_USAGE     1, 2, "usage: %s catalogue-name input-file ...\n"
-#define MSG_OUTPUT_NOFILE    1, 3, "%s: %s: cannot create temporary output file\n"
-#define MSG_OUT_OF_MEMORY    1, 4, "%s: out of memory\n"
-#define MSG_INTERNAL_ERROR   1, 5, "%s: internal error: %s\n"
-#define MSG_BAD_CATALOGUE    2, 1, "%s: %s: file is not a valid message catalogue\n"
-#define MSG_UNKNOWN_CODESET  2, 2, "%s: %s: unknown codeset descriptor\n"
-#define MSG_CODESET_CLASH    2, 3, "%s:%u: codeset `%s' conflicts with prior declaration\n"
-#define MSG_HAD_CODESET      2, 4, "%s:%u: codeset `%s' previously declared here\n"
-#define MSG_SETNUM_NOT_INCR  2, 5, "invalid set number: expecting > %d; got %d\n"
-#define MSG_MSGNUM_NOT_INCR  2, 6, "invalid message number: expecting > %d; got %d\n"
-#define MSG_REDEFINED        2, 7, "%s: %s:%u: redefinition of message %u in set %u\n"
-#define MSG_PREVIOUS_HERE    2, 8, "%s: %s:%u: previous definition was here\n"
-#define MSG_EOF_IN_QUOTES    3, 2, "%s:%u: unexpected EOF encountered before closing quote\n"
-#define MSG_TEXT_DISCARDED   3, 3, "%s:%u: incomplete message marked for deletion\n"
-#define MSG_MISSING_NEWLINE  3, 4, "%s:%u: missing newline at end of file\n"
-#define MSG_BAD_INDEX        3, 5, "invalid reference in message index"
-#define MSG_UTF_UNKNOWN      4, 1, "%s:unrecognisable encoding format\n"
-#define MSG_UTF_SIZE_ERROR   4, 2, "%s:invalid byte count per code point; value was %d\n"
-#define MSG_UTF_FRAME_ERROR  4, 3, "%s:%u:UTF-%u%cE input framing error\n"
-#define MSG_UTF_CODESET      4, 4, "%s:input codeset identified as %s; conflicts with ...\n"
+#define MSG_UTF_UNKNOWN      7, 1, "%s:unrecognisable encoding format\n"
+#define MSG_UTF_SIZE_ERROR   7, 2, "%s:invalid byte count per code point; value was %d\n"
+#define MSG_UTF_FRAME_ERROR  7, 3, "%s:%u:UTF-%u%cE input framing error\n"
+#define MSG_UTF_CODESET      7, 4, "%s:input codeset identified as %s; conflicts with ...\n"
 /* !
  * !$ end of file
  */
-#endif /* !defined( GCMSGS_H ): $RCSfile$Revision: 1.3 $: end of file */
+#endif /* !defined( GCMSGS_H ): $RCSfile$Revision: 1.4 $: end of file */

--- /dev/null
+++ b/repl/getopt.c
@@ -0,0 +1,636 @@
+/* 
+ * getopt.c
+ *
+ * $Id$
+ *
+ * Implementation of the `getopt', `getopt_long' and `getopt_long_only'
+ * APIs, for inclusion in the MinGW runtime library.
+ *
+ * This file is part of the MinGW32 package set.
+ *
+ * Contributed by Keith Marshall <[e-mail]>
+ * Last modification: 27-Dec-2007
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain. You may
+ * use, modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED. This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * $Revision$
+ * $Author$
+ * $Date$
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <getopt.h>
+
+/* Identify how to get the calling program name, for use in messages...
+ */
+#ifdef __CYGWIN__
+/*
+ * CYGWIN uses this DLL reference...
+ */
+# define PROGNAME  __progname
+extern char __declspec(dllimport) *__progname;
+#else
+/*
+ * ...while elsewhere, we simply use the first argument passed.
+ */
+# define PROGNAME  *argv
+#endif
+
+/* Initialise the public variables. */
+
+int optind = 0;				/* index for first non-option arg     */
+int opterr = 1;				/* enable built-in error messages     */
+
+char *optarg = NULL;			/* pointer to current option argument */
+
+#define CHAR  char			/* argument type selector */
+
+#define getopt_switchar         '-'	/* option prefix character in argv    */
+#define getopt_pluschar         '+'	/* prefix for POSIX mode in optstring */
+#define getopt_takes_argument   ':'	/* marker for optarg in optstring     */
+#define getopt_arg_assign       '='     /* longopt argument field separator   */
+#define getopt_unknown          '?'	/* return code for unmatched option   */
+#define getopt_ordered           1      /* return code for ordered non-option */
+
+#define getopt_all_done         -1	/* return code to indicate completion */
+
+enum
+{ /* All `getopt' API functions are implemented via calls to the
+   * common static function `getopt_parse()'; these `mode' selectors
+   * determine the behaviour of `getopt_parse()', to deliver the
+   * appropriate result in each case.
+   */
+  getopt_mode_standard = 0,	/* getopt()	      */
+  getopt_mode_long,		/* getopt_long()      */
+  getopt_mode_long_only		/* getopt_long_only() */
+};
+
+enum
+{ /* When attempting to match a command line argument to a long form option,
+   * these indicate the status of the match.
+   */
+  getopt_no_match = 0,		/* no successful match			     */
+  getopt_abbreviated_match,	/* argument is an abbreviation for an option */
+  getopt_exact_match		/* argument matches the full option name     */
+};
+
+int optopt = getopt_unknown;	/* return value for option being evaluated   */
+
+static __inline__
+int getopt_missing_arg( const CHAR *optstring )
+{
+  /* Helper function to determine the appropriate return value,
+   * for the case where a required option argument is missing.
+   */
+  if( (*optstring == getopt_pluschar) || (*optstring == getopt_switchar) )
+    ++optstring;
+  return (*optstring == getopt_takes_argument)
+    ? getopt_takes_argument
+    : getopt_unknown;
+}
+
+/* `complain' macro facilitates the generation of simple built-in
+ * error messages, displayed on various fault conditions, provided
+ * `opterr' is non-zero.
+ */
+#define	complain( MSG, ARG )  if( opterr ) \
+  fprintf( stderr, "%s: "MSG"\n", PROGNAME, ARG )
+
+static __inline__
+int getopt_argerror( int mode, char *fmt, CHAR *prog, struct option *opt, int retval )
+{
+  /* Helper function, to generate more complex built-in error
+   * messages, for invalid arguments to long form options ...
+   */
+  if( opterr )
+  {
+    /* ... but, displayed only if `opterr' is non-zero.
+     */
+    char flag[] = "--";
+    if( mode != getopt_mode_long )
+      /*
+       * only display one hyphen, for implicit long form options,
+       * improperly resolved by `getopt_long_only()'.
+       */
+      flag[1] = 0;
+    /*
+     * always preface the program name ...
+     */
+    fprintf( stderr, "%s: ", prog );
+    /*
+     * to the appropriate, option specific message.
+     */
+    fprintf( stderr, fmt, flag, opt->name );
+  }
+  /* Whether displaying the message, or not, always set `optopt'
+   * to identify the faulty option ...
+   */
+  optopt = opt->val;
+  /*
+   * and return the `invalid option' indicator.
+   */
+  return retval;
+}
+
+/* `getopt_conventions' establish behavioural options, to control
+ * the operation of `getopt_parse()', e.g. to select between POSIX
+ * and GNU style argument parsing behaviour.
+ */
+#define getopt_set_conventions  0x1000
+#define getopt_posixly_correct  0x0010
+
+static __inline__
+int getopt_conventions( int flags )
+{
+  static int conventions = 0;
+
+  if( (conventions == 0) && ((flags & getopt_set_conventions) == 0) )
+  {
+    /* default conventions have not yet been established;
+     * initialise them now!
+     */
+    conventions = getopt_set_conventions;
+    if( (flags == getopt_pluschar) || (getenv( "POSIXLY_CORRECT" ) != NULL) )
+      conventions |= getopt_posixly_correct;
+  }
+
+  else if( flags & getopt_set_conventions )
+    /*
+     * default conventions may have already been established,
+     * but this is a specific request to augment them.
+     */
+    conventions |= flags;
+
+  /* in any event, return the currently established conventions.
+   */
+  return conventions;
+}
+
+static __inline__
+int is_switchar( CHAR flag )
+{
+  /* A simple helper function, used to identify the switch character
+   * introducing an optional command line argument.
+   */
+  return flag == getopt_switchar;
+}
+
+static __inline__
+const CHAR *getopt_match( CHAR lookup, const CHAR *opt_string )
+{
+  /* Helper function, used to identify short form options.
+   */
+  if( (*opt_string == getopt_pluschar) || (*opt_string == getopt_switchar) )
+    ++opt_string;
+  if( *opt_string == getopt_takes_argument )
+    ++opt_string;
+  do if( lookup == *opt_string ) return opt_string;
+     while( *++opt_string );
+  return NULL;
+}
+
+static __inline__
+int getopt_match_long( const CHAR *nextchar, const CHAR *optname )
+{
+  /* Helper function, used to identify potential matches for
+   * long form options.
+   */
+  CHAR matchchar;
+  while( (matchchar = *nextchar++) && (matchchar == *optname) )
+    /*
+     * skip over initial substring which DOES match.
+     */
+    ++optname;
+
+  if( matchchar )
+  {
+    /* did NOT match the entire argument to an initial substring
+     * of a defined option name ...
+     */
+    if( matchchar != getopt_arg_assign )
+      /*
+       * ... and didn't stop at an `=' internal field separator,
+       * so this is NOT a possible match.
+       */
+      return getopt_no_match;
+
+    /* DID stop at an `=' internal field separator,
+     * so this IS a possible match, and what follows is an
+     * argument to the possibly matched option.
+     */
+    optarg = (char *)(nextchar);
+  }
+  return *optname
+    /*
+     * if we DIDN'T match the ENTIRE text of the option name,
+     * then it's a possible abbreviated match ...
+     */
+    ? getopt_abbreviated_match
+    /*
+     * but if we DID match the entire option name,
+     * then it's a DEFINITE EXACT match.
+     */
+    : getopt_exact_match;
+}
+
+static __inline__
+int getopt_resolved( int mode, int argc, CHAR *const *argv, int *argind,
+struct option *opt, int index, int *retindex, const CHAR *optstring )
+{
+  /* Helper function to establish appropriate return conditions,
+   * on resolution of a long form option.
+   */
+  if( retindex != NULL )
+    *retindex = index;
+
+  if( optarg && (opt[index].has_arg == no_argument) )
+    /*
+     * it is an error for the user to specify an option specific argument
+     * with an option which doesn't expect one!
+     */
+    return getopt_argerror( mode, "option `%s%s' doesn't accept an argument\n",
+	PROGNAME, opt + index, getopt_unknown );
+
+  else if( (optarg == NULL) && (opt[index].has_arg == required_argument) )
+  {
+    /* similarly, it is an error if no argument is specified
+     * with an option which requires one ...
+     */
+    if( (*argind + 1) < argc )
+      /*
+       * ... except that the requirement may be satisfied from
+       * the following comand line argument, if any ...
+       */
+      optarg = argv[++*argind];
+
+    else
+      /* so fail this case, only if no such argument exists!
+       */
+      return getopt_argerror( mode, "option `%s%s' requires an argument\n",
+	  PROGNAME, opt + index, getopt_missing_arg( optstring ) );
+  }
+
+  /* when the caller has provided a return buffer ...
+   */
+  if( retindex != NULL )
+  {
+    /* ... then we place the proper return value there,
+     * and return a status code of zero ...
+     */
+    *retindex = opt[index].val;
+    return 0;
+  }
+  /* ... otherwise, the return value becomes the status code.
+   */
+  return opt[index].val;
+}
+
+static
+#define getopt_std_args int argc, CHAR *const argv[], const CHAR *optstring
+int getopt_parse( int mode, getopt_std_args, ... )
+{
+  /* Common core implementation for ALL `getopt' functions.
+   */
+  static int argind = 0;
+  static const CHAR *nextchar = NULL;
+  static int optmark = 0;
+
+  if( nextchar && *nextchar )
+  {
+    /* we are parsing a standard, or short format, option argument ...
+     */
+    const CHAR *optchar;
+    if( (optchar = getopt_match( optopt = *nextchar++, optstring )) != NULL )
+    {
+      /* we have identified it as valid ...
+       */
+      if( optchar[1] == getopt_takes_argument )
+      {
+	/* and determined that it requires an associated argument ...
+	 */
+	if( ! *(optarg = (char *)(nextchar)) )
+	{
+	  /* the argument is NOT attached ...
+	   */
+	  if( optchar[2] == getopt_takes_argument )
+	    /*
+	     * but this GNU extension marks it as optional,
+	     * so we don't provide one on this occasion.
+	     */
+	    optarg = NULL;
+
+	  /* otherwise this option takes a mandatory argument,
+	   * so, provided there is one available ...
+	   */
+	  else if( (argc - argind) > 1 )
+	    /*
+	     * we take the following command line argument,
+	     * as the appropriate option argument.
+	     */
+	    optarg = argv[++argind];
+
+	  /* but if no further argument is available,
+	   * then there is nothing we can do, except for
+	   * issuing the requisite diagnostic message.
+	   */
+	  else
+	  {
+	    complain( "option requires an argument -- %c", optopt );
+	    return getopt_missing_arg( optstring );
+	  }
+	}
+	nextchar = NULL;
+      }
+      else
+	optarg = NULL;
+      return optopt;
+    }
+    /* if we didn't find a valid match for the specified option character,
+     * then we fall through to here, so take appropriate diagnostic action.
+     */
+    if( mode == getopt_mode_long_only )
+    {
+      complain( "unrecognised option `-%s'", --nextchar );
+      nextchar = NULL;
+      optopt = 0;
+    }
+    else complain( "invalid option -- %c", optopt );
+    return getopt_unknown;
+  }
+
+  if( optmark > optind )
+  {
+    /* This can happen, in GNU parsing mode ONLY, when we have
+     * skipped over non-option arguments, and found a subsequent
+     * option argument; in this case we permute the arguments.
+     */
+    int index;
+    /*
+     * `optspan' specifies the number of contiguous arguments
+     * which are spanned by the current option, and so must be
+     * moved together during permutation.
+     */
+    int optspan = argind - optmark + 1;
+    /*
+     * we use `this_arg' to store these temporarily.
+     */
+    CHAR *this_arg[optspan];
+    /*
+     * we cannot manipulate `argv' directly, since the `getopt'
+     * API prototypes it as `read-only'; this cast to `arglist'
+     * allows us to work around that restriction.
+     */
+    CHAR **arglist = (char **)(argv);
+
+    /* save temporary copies of the arguments which are associated
+     * with the current option ...
+     */
+    for( index = 0; index < optspan; ++index )
+      this_arg[index] = arglist[optmark + index];
+
+    /* move all preceding non-option arguments to the right,
+     * overwriting these saved arguments, while making space
+     * to replace them in their permuted location.
+     */
+    for( --optmark; optmark >= optind; --optmark )
+      arglist[optmark + optspan] = arglist[optmark];
+
+    /* restore the temporarily saved option arguments to
+     * their permuted location.
+     */
+    for( index = 0; index < optspan; ++index )
+      arglist[optind + index] = this_arg[index];
+
+    /* adjust `optind', to account for the relocated option.
+     */
+    optind += optspan;
+  }
+
+  else
+    /* no permutation occurred ...
+     * simply adjust `optind' for all options parsed so far.
+     */
+    optind = argind + 1;
+
+  /* enter main parsing loop ...
+   */
+  while( argc > ++argind )
+  {
+    /* inspect each argument in turn, identifying possible options ...
+     */
+    if( is_switchar( *(nextchar = argv[optmark = argind]) ) && *++nextchar )
+    {
+      /* we've found a candidate option argument ... */
+
+      if( is_switchar( *nextchar ) )
+      {
+	/* it's a double hyphen argument ... */
+
+	const CHAR *refchar = nextchar;
+	if( *++refchar )
+	{
+	  /* and it looks like a long format option ...
+	   * `getopt_long' mode must be active to accept it as such,
+	   * `getopt_long_only' also qualifies, but we must downgrade
+	   * it to force explicit handling as a long format option.
+	   */
+	  if( mode >= getopt_mode_long )
+	  {
+	    nextchar = refchar;
+	    mode = getopt_mode_long;
+	  }
+	}
+	else
+	{
+	  /* this is an explicit `--' end of options marker, so wrap up now!
+	   */
+	  if( optmark > optind )
+	  {
+	    /* permuting the argument list as necessary ...
+	     * (note use of `this_arg' and `arglist', as above).
+	     */
+	    CHAR *this_arg = argv[optmark];
+	    CHAR **arglist = (CHAR **)(argv);
+
+	    /* move all preceding non-option arguments to the right ...
+	     */
+	    do arglist[optmark] = arglist[optmark - 1];
+	       while( optmark-- > optind );
+
+	    /* reinstate the `--' marker, in its permuted location.
+	     */
+	    arglist[optind] = this_arg;
+	  }
+	  /* ... before finally bumping `optind' past the `--' marker,
+	   * and returning the `all done' completion indicator.
+	   */
+	  ++optind;
+	  return getopt_all_done;
+	}
+      }
+      else if( mode < getopt_mode_long_only )
+      {
+	/* it's not an explicit long option, and `getopt_long_only' isn't active,
+	 * so we must explicitly try to match it as a short option.
+	 */
+	mode = getopt_mode_standard;
+      }
+
+      if( mode >= getopt_mode_long )
+      {
+	/* the current argument is a long form option, (either explicitly,
+	 * introduced by a double hyphen, or implicitly because we were called
+	 * by `getopt_long_only'); this is where we parse it.
+	 */
+	int lookup;
+	int matched = -1;
+
+	/* we need to fetch the `extra' function arguments, which are
+	 * specified for the `getopt_long' APIs.
+	 */
+	va_list refptr;
+	va_start( refptr, optstring );
+	struct option *longopts = va_arg( refptr, struct option * );
+	int *optindex = va_arg( refptr, int * );
+	va_end( refptr );
+
+	/* ensuring that `optarg' does not inherit any junk, from parsing
+	 * preceding arguments ...
+	 */
+	optarg = NULL;
+	for( lookup = 0; longopts && longopts[lookup].name; ++lookup )
+	{
+	  /* scan the list of defined long form options ...
+	   */
+          switch( getopt_match_long( nextchar, longopts[lookup].name ) )
+          {
+	    /* looking for possible matches for the current argument.
+	     */
+            case getopt_exact_match:
+	      /*
+	       * when an exact match is found,
+	       * return it immediately, setting `nextchar' to NULL,
+	       * to ensure we don't mistakenly try to match any
+	       * subsequent characters as short form options.
+	       */
+	      nextchar = NULL;
+	      return getopt_resolved( mode, argc, argv, &argind,
+		  longopts, lookup, optindex, optstring );
+
+	    case getopt_abbreviated_match:
+	      /*
+	       * but, for a partial (initial substring) match ...
+	       */
+	      if( matched >= 0 )
+	      {
+		/* if this is not the first, then we have an ambiguity ...
+		 */
+		complain( "option `%s' is ambiguous", argv[argind] );
+		nextchar = NULL;
+		optopt = 0;
+		return getopt_unknown;
+	      }
+	      /* otherwise just note that we've found a possible match ...
+	       */
+	      matched = lookup;
+          }
+	}
+	if( matched >= 0 )
+	{
+	  /* if we get to here, then we found exactly one partial match,
+	   * so return it, as for an exact match.
+	   */
+	  nextchar = NULL;
+	  return getopt_resolved( mode, argc, argv, &argind,
+	      longopts, matched, optindex, optstring );
+	}
+	if( mode < getopt_mode_long_only )
+	{
+	  /* if here, then we had what SHOULD have been a long form option,
+	   * but it is unmatched; (perversely, `mode == getopt_mode_long_only'
+	   * allows us to still try to match it as a short form option).
+	   */
+	  optopt = 0;
+	  nextchar = NULL;
+	  complain( "unrecognised option `%s'", argv[argind] );
+	  return getopt_unknown;
+	}
+      }
+      /* fall through to handle standard short form options...
+       * when the option argument format is neither explictly identified
+       * as long, nor implicitly matched as such, and the argument isn't
+       * just a bare hyphen, (which isn't an option), then we make one
+       * recursive call to explicitly interpret it as short format.
+       */
+      if( *nextchar )
+	return getopt_parse( mode, argc, argv, optstring );
+    }
+    /* if we get to here, then we've parsed a non-option argument ...
+     * in GNU compatibility mode, we step over it, so we can permute
+     * any subsequent option arguments, but ...
+     */
+    if( *optstring == getopt_switchar )
+    {
+      /* if `optstring' begins with a `-' character, this special
+       * GNU specific behaviour requires us to return the non-option
+       * arguments in strict order, as pseudo-arguments to a special
+       * option, with return value defined as `getopt_ordered'.
+       */
+      nextchar = NULL;
+      optarg = argv[argind];
+      return getopt_ordered;
+    }
+    if( getopt_conventions( *optstring ) & getopt_posixly_correct )
+      /*
+       * otherwise ...
+       * for POSIXLY_CORRECT behaviour, or if `optstring' begins with
+       * a `+' character, then we break out of the parsing loop, so that
+       * the scan ends at the current argument, with no permutation.
+       */
+      break;
+  }
+  /* fall through when all arguments have been evaluated,
+   */
+  return getopt_all_done;
+}
+
+/* All three public API entry points are trivially defined,
+ * in terms of the internal `getopt_parse' function.
+ */
+int getopt( getopt_std_args )
+{
+  return getopt_parse( getopt_mode_standard, argc, argv, optstring );
+}
+
+int getopt_long( getopt_std_args, const struct option *opts, int *index )
+{
+  return getopt_parse( getopt_mode_long, argc, argv, optstring, opts, index );
+}
+
+int getopt_long_only( getopt_std_args, const struct option *opts, int *index )
+{
+  return getopt_parse( getopt_mode_long_only, argc, argv, optstring, opts, index );
+}
+
+#ifdef __weak_alias
+/*
+ * These Microsnot style uglified aliases are provided for compatibility
+ * with the previous MinGW implementation of the getopt API.
+ */
+__weak_alias( getopt, _getopt )
+__weak_alias( getopt_long, _getopt_long )
+__weak_alias( getopt_long_only, _getopt_long_only )
+#endif
+
+/* $RCSfile$Revision$: end of file */

--- /dev/null
+++ b/repl/include/getopt.h
@@ -0,0 +1,100 @@
+#ifndef __GETOPT_H__
+/* 
+ * getopt.h
+ *
+ * $Id$
+ *
+ * Defines constants and function prototypes required to implement
+ * the `getopt', `getopt_long' and `getopt_long_only' APIs.
+ *
+ * This file is part of the MinGW32 package set.
+ *
+ * Contributed by Keith Marshall <[e-mail]>
+ * Last modification: 04-Jan-2008
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain. You may
+ * use, modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED. This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * $Revision$
+ * $Author$
+ * $Date$
+ *
+ */
+#define __GETOPT_H__
+
+/* All the headers include this file. */
+#include <_mingw.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int optind;		/* index of first non-option in argv      */
+extern int optopt;		/* single option character, as parsed     */
+extern int opterr;		/* flag to enable built-in diagnostics... */
+				/* (user may set to zero, to suppress)    */
+
+extern char *optarg;		/* pointer to argument of current option  */
+
+extern int getopt( int, char * const [], const char * );
+
+#ifdef __cplusplus
+}
+#endif
+/*
+ * POSIX requires the `getopt' API to be specified in `unistd.h';
+ * thus, `unistd.h' includes this header.  However, we do not want
+ * to expose the `getopt_long' or `getopt_long_only' APIs, when
+ * included in this manner.  Thus, close the standard __GETOPT_H__
+ * declarations block, and open an additional __GETOPT_LONG_H__
+ * specific block, only when *not* __UNISTD_H_SOURCED__, in which
+ * to declare the extended API.
+ */
+#endif /* !defined(__GETOPT_H__) */
+#if !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__)
+#define __GETOPT_LONG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct option		/* specification for a long form option...	*/
+{
+  const char *name;		/* option name, without leading hyphens */
+  int         has_arg;		/* does it take an argument?		*/
+  int        *flag;		/* where to save its status, or NULL	*/
+  int         val;		/* its associated status value		*/
+};
+
+enum    		/* permitted values for its `has_arg' field...	*/
+{
+  no_argument = 0,      	/* option never takes an argument	*/
+  required_argument,		/* option always requires an argument	*/
+  optional_argument		/* option may take an argument		*/
+};
+
+extern int getopt_long( int, char * const [], const char *, const struct option *, int * );
+extern int getopt_long_only( int, char * const [], const char *, const struct option *, int * );
+/*
+ * Previous MinGW implementation had...
+ */
+#ifndef HAVE_DECL_GETOPT
+/*
+ * ...for the long form API only; keep this for compatibility.
+ */
+# define HAVE_DECL_GETOPT	1
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__) */
+/* $RCSfile$Revision$: end of file */