[prev in list] [next in list] [prev in thread] [next in thread]
List: mingw-cvs
Subject: MinGW-cvs Digest, Vol 15, Issue 2
From: mingw-cvs-request () lists ! sourceforge ! net
Date: 2008-01-08 19:52:05
Message-ID: mailman.972320.1199821925.7786.mingw-cvs () lists ! sourceforge ! net
[Download RAW message or body]
Send MinGW-cvs mailing list submissions to
mingw-cvs@lists.sourceforge.net
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.sourceforge.net/lists/listinfo/mingw-cvs
or, via email, send a message with subject or body 'help' to
mingw-cvs-request@lists.sourceforge.net
You can reach the person managing the list at
mingw-cvs-owner@lists.sourceforge.net
When replying, please edit your Subject line so it is more specific
than "Re: Contents of MinGW-cvs digest..."
This list will notify you of updates to the code stored in CVS. Typically only \
developers with access to update the CVS are interested in this list. However, this \
list can be beneficial to see what is happening with your changes. If you wish to \
unsubscribe please do so at https://lists.sourceforge.net/lists/listinfo/mingw-cvs.
Today's Topics:
1. catgets/repl getopt.c,NONE,1.1 (Keith Marshall)
2. catgets/repl/include getopt.h,NONE,1.1 (Keith Marshall)
3. catgets/include gcmsgs.h,1.4,1.5 (Keith Marshall)
----------------------------------------------------------------------
Message: 1
Date: Tue, 08 Jan 2008 19:52:01 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] catgets/repl getopt.c,NONE,1.1
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1JCKUU-0005YJ-Rp@mail.sourceforge.net>
Update of /cvsroot/mingw/catgets/repl
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26202/repl
Added Files:
getopt.c
Log Message:
Add `-help' and `-version' options for `gencat'.
--- NEW FILE: getopt.c ---
/*
* getopt.c
*
* $Id: getopt.c,v 1.1 2008/01/08 19:51:59 keithmarshall Exp $
*
* 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 <keithmarshall@users.sourceforge.net>
* 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: 1.1 $
* $Author: keithmarshall $
* $Date: 2008/01/08 19:51:59 $
*
*/
#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: getopt.c,v $Revision: 1.1 $: end of file */
------------------------------
Message: 2
Date: Tue, 08 Jan 2008 19:52:01 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] catgets/repl/include getopt.h,NONE,1.1
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1JCKUW-0005Zs-0I@mail.sourceforge.net>
Update of /cvsroot/mingw/catgets/repl/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26202/repl/include
Added Files:
getopt.h
Log Message:
Add `-help' and `-version' options for `gencat'.
--- NEW FILE: getopt.h ---
#ifndef __GETOPT_H__
/*
* getopt.h
*
* $Id: getopt.h,v 1.1 2008/01/08 19:51:59 keithmarshall Exp $
*
* 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 <keithmarshall@users.sourceforge.net>
* 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: 1.1 $
* $Author: keithmarshall $
* $Date: 2008/01/08 19:51:59 $
*
*/
#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: getopt.h,v $Revision: 1.1 $: end of file */
------------------------------
Message: 3
Date: Tue, 08 Jan 2008 19:52:01 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] catgets/include gcmsgs.h,1.4,1.5
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1JCKUW-0005aY-UV@mail.sourceforge.net>
Update of /cvsroot/mingw/catgets/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26202/include
Modified Files:
gcmsgs.h
Log Message:
Add `-help' and `-version' options for `gencat'.
Index: gcmsgs.h
===================================================================
RCS file: /cvsroot/mingw/catgets/include/gcmsgs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gcmsgs.h 18 Jun 2007 22:36:08 -0000 1.4
--- gcmsgs.h 8 Jan 2008 19:51:58 -0000 1.5
***************
*** 8,12 ****
* !$
* !$ $Id$
! * !$ Copyright (C) 2006, 2007, MinGW Project
* !$ Written by Keith Marshall <keithmarshall@users.sourceforge.net>
* !$
--- 8,12 ----
* !$
* !$ $Id$
! * !$ Copyright (C) 2006, 2007, 2008, MinGW Project
* !$ Written by Keith Marshall <keithmarshall@users.sourceforge.net>
* !$
***************
*** 36,61 ****
* !$quote "
* !
*/
! #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" /* !
* !$ end of file
--- 36,145 ----
* !$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_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
------------------------------
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
------------------------------
_______________________________________________
MinGW-cvs mailing list
MinGW-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-cvs
End of MinGW-cvs Digest, Vol 15, Issue 2
****************************************
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic