1998-07-13 14:29:13 +02:00
|
|
|
@node Message Translation, Searching and Sorting, Locales, Top
|
|
|
|
@c %MENU% How to make the program speak the user's language
|
1997-08-20 05:53:21 +02:00
|
|
|
@chapter Message Translation
|
|
|
|
|
|
|
|
The program's interface with the human should be designed in a way to
|
|
|
|
ease the human the task. One of the possibilities is to use messages in
|
|
|
|
whatever language the user prefers.
|
|
|
|
|
|
|
|
Printing messages in different languages can be implemented in different
|
|
|
|
ways. One could add all the different languages in the source code and
|
|
|
|
add among the variants every time a message has to be printed. This is
|
|
|
|
certainly no good solution since extending the set of languages is
|
|
|
|
difficult (the code must be changed) and the code itself can become
|
|
|
|
really big with dozens of message sets.
|
|
|
|
|
|
|
|
A better solution is to keep the message sets for each language are kept
|
|
|
|
in separate files which are loaded at runtime depending on the language
|
|
|
|
selection of the user.
|
|
|
|
|
|
|
|
The GNU C Library provides two different sets of functions to support
|
|
|
|
message translation. The problem is that neither of the interfaces is
|
|
|
|
officially defined by the POSIX standard. The @code{catgets} family of
|
1997-10-15 07:34:02 +02:00
|
|
|
functions is defined in the X/Open standard but this is derived from
|
|
|
|
industry decisions and therefore not necessarily based on reasonable
|
1997-08-20 05:53:21 +02:00
|
|
|
decisions.
|
|
|
|
|
|
|
|
As mentioned above the message catalog handling provides easy
|
|
|
|
extendibility by using external data files which contain the message
|
|
|
|
translations. I.e., these files contain for each of the messages used
|
|
|
|
in the program a translation for the appropriate language. So the tasks
|
1998-06-15 20:12:05 +02:00
|
|
|
of the message handling functions are
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
@itemize @bullet
|
|
|
|
@item
|
|
|
|
locate the external data file with the appropriate translations.
|
|
|
|
@item
|
|
|
|
load the data and make it possible to address the messages
|
|
|
|
@item
|
|
|
|
map a given key to the translated message
|
|
|
|
@end itemize
|
|
|
|
|
|
|
|
The two approaches mainly differ in the implementation of this last
|
|
|
|
step. The design decisions made for this influences the whole rest.
|
|
|
|
|
|
|
|
@menu
|
|
|
|
* Message catalogs a la X/Open:: The @code{catgets} family of functions.
|
|
|
|
* The Uniforum approach:: The @code{gettext} family of functions.
|
|
|
|
@end menu
|
|
|
|
|
|
|
|
|
|
|
|
@node Message catalogs a la X/Open
|
|
|
|
@section X/Open Message Catalog Handling
|
|
|
|
|
|
|
|
The @code{catgets} functions are based on the simple scheme:
|
|
|
|
|
|
|
|
@quotation
|
|
|
|
Associate every message to translate in the source code with a unique
|
|
|
|
identifier. To retrieve a message from a catalog file solely the
|
|
|
|
identifier is used.
|
|
|
|
@end quotation
|
|
|
|
|
|
|
|
This means for the author of the program that s/he will have to make
|
|
|
|
sure the meaning of the identifier in the program code and in the
|
|
|
|
message catalogs are always the same.
|
|
|
|
|
|
|
|
Before a message can be translated the catalog file must be located.
|
|
|
|
The user of the program must be able to guide the responsible function
|
|
|
|
to find whatever catalog the user wants. This is separated from what
|
|
|
|
the programmer had in mind.
|
|
|
|
|
1997-10-15 07:34:02 +02:00
|
|
|
All the types, constants and functions for the @code{catgets} functions
|
1997-08-20 05:53:21 +02:00
|
|
|
are defined/declared in the @file{nl_types.h} header file.
|
|
|
|
|
|
|
|
@menu
|
|
|
|
* The catgets Functions:: The @code{catgets} function family.
|
|
|
|
* The message catalog files:: Format of the message catalog files.
|
|
|
|
* The gencat program:: How to generate message catalogs files which
|
|
|
|
can be used by the functions.
|
|
|
|
* Common Usage:: How to use the @code{catgets} interface.
|
|
|
|
@end menu
|
|
|
|
|
|
|
|
|
|
|
|
@node The catgets Functions
|
|
|
|
@subsection The @code{catgets} function family
|
|
|
|
|
|
|
|
@comment nl_types.h
|
|
|
|
@comment X/Open
|
|
|
|
@deftypefun nl_catd catopen (const char *@var{cat_name}, int @var{flag})
|
|
|
|
The @code{catgets} function tries to locate the message data file names
|
|
|
|
@var{cat_name} and loads it when found. The return value is of an
|
|
|
|
opaque type and can be used in calls to the other functions to refer to
|
|
|
|
this loaded catalog.
|
|
|
|
|
|
|
|
The return value is @code{(nl_catd) -1} in case the function failed and
|
|
|
|
no catalog was loaded. The global variable @var{errno} contains a code
|
|
|
|
for the error causing the failure. But even if the function call
|
|
|
|
succeeded this does not mean that all messages can be translated.
|
|
|
|
|
|
|
|
Locating the catalog file must happen in a way which lets the user of
|
|
|
|
the program influence the decision. It is up to the user to decide
|
|
|
|
about the language to use and sometimes it is useful to use alternate
|
|
|
|
catalog files. All this can be specified by the user by setting some
|
1997-10-15 07:34:02 +02:00
|
|
|
environment variables.
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
The first problem is to find out where all the message catalogs are
|
|
|
|
stored. Every program could have its own place to keep all the
|
|
|
|
different files but usually the catalog files are grouped by languages
|
|
|
|
and the catalogs for all programs are kept in the same place.
|
|
|
|
|
|
|
|
@cindex NLSPATH environment variable
|
|
|
|
To tell the @code{catopen} function where the catalog for the program
|
|
|
|
can be found the user can set the environment variable @code{NLSPATH} to
|
|
|
|
a value which describes her/his choice. Since this value must be usable
|
|
|
|
for different languages and locales it cannot be a simple string.
|
|
|
|
Instead it is a format string (similar to @code{printf}'s). An example
|
|
|
|
is
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
/usr/share/locale/%L/%N:/usr/share/locale/%L/LC_MESSAGES/%N
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
First one can see that more than one directory can be specified (with
|
|
|
|
the usual syntax of separating them by colons). The next things to
|
|
|
|
observe are the format string, @code{%L} and @code{%N} in this case.
|
|
|
|
The @code{catopen} function knows about several of them and the
|
|
|
|
replacement for all of them is of course different.
|
|
|
|
|
|
|
|
@table @code
|
|
|
|
@item %N
|
|
|
|
This format element is substituted with the name of the catalog file.
|
|
|
|
This is the value of the @var{cat_name} argument given to
|
|
|
|
@code{catgets}.
|
|
|
|
|
|
|
|
@item %L
|
|
|
|
This format element is substituted with the name of the currently
|
|
|
|
selected locale for translating messages. How this is determined is
|
|
|
|
explained below.
|
|
|
|
|
|
|
|
@item %l
|
|
|
|
(This is the lowercase ell.) This format element is substituted with the
|
1997-10-15 07:34:02 +02:00
|
|
|
language element of the locale name. The string describing the selected
|
1997-08-20 05:53:21 +02:00
|
|
|
locale is expected to have the form
|
|
|
|
@code{@var{lang}[_@var{terr}[.@var{codeset}]]} and this format uses the
|
|
|
|
first part @var{lang}.
|
|
|
|
|
|
|
|
@item %t
|
|
|
|
This format element is substituted by the territory part @var{terr} of
|
|
|
|
the name of the currently selected locale. See the explanation of the
|
|
|
|
format above.
|
|
|
|
|
|
|
|
@item %c
|
|
|
|
This format element is substituted by the codeset part @var{codeset} of
|
|
|
|
the name of the currently selected locale. See the explanation of the
|
|
|
|
format above.
|
|
|
|
|
|
|
|
@item %%
|
|
|
|
Since @code{%} is used in a meta character there must be a way to
|
|
|
|
express the @code{%} character in the result itself. Using @code{%%}
|
|
|
|
does this just like it works for @code{printf}.
|
|
|
|
@end table
|
|
|
|
|
|
|
|
|
2000-03-10 09:41:39 +01:00
|
|
|
Using @code{NLSPATH} allows arbitrary directories to be searched for
|
|
|
|
message catalogs while still allowing different languages to be used.
|
|
|
|
If the @code{NLSPATH} environment variable is not set, the default value
|
|
|
|
is
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
@smallexample
|
|
|
|
@var{prefix}/share/locale/%L/%N:@var{prefix}/share/locale/%L/LC_MESSAGES/%N
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
where @var{prefix} is given to @code{configure} while installing the GNU
|
|
|
|
C Library (this value is in many cases @code{/usr} or the empty string).
|
|
|
|
|
|
|
|
The remaining problem is to decide which must be used. The value
|
|
|
|
decides about the substitution of the format elements mentioned above.
|
|
|
|
First of all the user can specify a path in the message catalog name
|
|
|
|
(i.e., the name contains a slash character). In this situation the
|
|
|
|
@code{NLSPATH} environment variable is not used. The catalog must exist
|
|
|
|
as specified in the program, perhaps relative to the current working
|
|
|
|
directory. This situation in not desirable and catalogs names never
|
2000-01-24 05:18:43 +01:00
|
|
|
should be written this way. Beside this, this behavior is not portable
|
1997-08-20 05:53:21 +02:00
|
|
|
to all other platforms providing the @code{catgets} interface.
|
|
|
|
|
|
|
|
@cindex LC_ALL environment variable
|
|
|
|
@cindex LC_MESSAGES environment variable
|
|
|
|
@cindex LANG environment variable
|
|
|
|
Otherwise the values of environment variables from the standard
|
1997-10-15 07:34:02 +02:00
|
|
|
environment are examined (@pxref{Standard Environment}). Which
|
1997-08-20 05:53:21 +02:00
|
|
|
variables are examined is decided by the @var{flag} parameter of
|
|
|
|
@code{catopen}. If the value is @code{NL_CAT_LOCALE} (which is defined
|
2000-01-31 07:42:36 +01:00
|
|
|
in @file{nl_types.h}) then the @code{catopen} function use the name of
|
|
|
|
the locale currently selected for the @code{LC_MESSAGES} category.
|
|
|
|
|
|
|
|
If @var{flag} is zero the @code{LANG} environment variable is examined.
|
|
|
|
This is a left-over from the early days where the concept of the locales
|
|
|
|
had not even reached the level of POSIX locales.
|
|
|
|
|
|
|
|
The environment variable and the locale name should have a value of the
|
|
|
|
form @code{@var{lang}[_@var{terr}[.@var{codeset}]]} as explained above.
|
|
|
|
If no environment variable is set the @code{"C"} locale is used which
|
1997-08-20 05:53:21 +02:00
|
|
|
prevents any translation.
|
|
|
|
|
|
|
|
The return value of the function is in any case a valid string. Either
|
|
|
|
it is a translation from a message catalog or it is the same as the
|
|
|
|
@var{string} parameter. So a piece of code to decide whether a
|
|
|
|
translation actually happened must look like this:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
@{
|
|
|
|
char *trans = catgets (desc, set, msg, input_string);
|
|
|
|
if (trans == input_string)
|
|
|
|
@{
|
|
|
|
/* Something went wrong. */
|
|
|
|
@}
|
|
|
|
@}
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
2000-01-24 05:18:43 +01:00
|
|
|
When an error occurred the global variable @var{errno} is set to
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
@table @var
|
|
|
|
@item EBADF
|
|
|
|
The catalog does not exist.
|
|
|
|
@item ENOMSG
|
2000-01-22 10:20:14 +01:00
|
|
|
The set/message tuple does not name an existing element in the
|
1997-08-20 05:53:21 +02:00
|
|
|
message catalog.
|
|
|
|
@end table
|
|
|
|
|
|
|
|
While it sometimes can be useful to test for errors programs normally
|
|
|
|
will avoid any test. If the translation is not available it is no big
|
|
|
|
problem if the original, untranslated message is printed. Either the
|
|
|
|
user understands this as well or s/he will look for the reason why the
|
|
|
|
messages are not translated.
|
|
|
|
@end deftypefun
|
|
|
|
|
|
|
|
Please note that the currently selected locale does not depend on a call
|
|
|
|
to the @code{setlocale} function. It is not necessary that the locale
|
|
|
|
data files for this locale exist and calling @code{setlocale} succeeds.
|
|
|
|
The @code{catopen} function directly reads the values of the environment
|
|
|
|
variables.
|
|
|
|
|
|
|
|
|
|
|
|
@deftypefun {char *} catgets (nl_catd @var{catalog_desc}, int @var{set}, int @var{message}, const char *@var{string})
|
|
|
|
The function @code{catgets} has to be used to access the massage catalog
|
|
|
|
previously opened using the @code{catopen} function. The
|
|
|
|
@var{catalog_desc} parameter must be a value previously returned by
|
|
|
|
@code{catopen}.
|
|
|
|
|
|
|
|
The next two parameters, @var{set} and @var{message}, reflect the
|
|
|
|
internal organization of the message catalog files. This will be
|
|
|
|
explained in detail below. For now it is interesting to know that a
|
|
|
|
catalog can consists of several set and the messages in each thread are
|
|
|
|
individually numbered using numbers. Neither the set number nor the
|
|
|
|
message number must be consecutive. They can be arbitrarily chosen.
|
|
|
|
But each message (unless equal to another one) must have its own unique
|
|
|
|
pair of set and message number.
|
|
|
|
|
|
|
|
Since it is not guaranteed that the message catalog for the language
|
|
|
|
selected by the user exists the last parameter @var{string} helps to
|
|
|
|
handle this case gracefully. If no matching string can be found
|
|
|
|
@var{string} is returned. This means for the programmer that
|
|
|
|
|
|
|
|
@itemize @bullet
|
|
|
|
@item
|
|
|
|
the @var{string} parameters should contain reasonable text (this also
|
|
|
|
helps to understand the program seems otherwise there would be no hint
|
|
|
|
on the string which is expected to be returned.
|
|
|
|
@item
|
|
|
|
all @var{string} arguments should be written in the same language.
|
|
|
|
@end itemize
|
|
|
|
@end deftypefun
|
|
|
|
|
|
|
|
It is somewhat uncomfortable to write a program using the @code{catgets}
|
|
|
|
functions if no supporting functionality is available. Since each
|
1997-10-15 07:34:02 +02:00
|
|
|
set/message number tuple must be unique the programmer must keep lists
|
1997-08-20 05:53:21 +02:00
|
|
|
of the messages at the same time the code is written. And the work
|
|
|
|
between several people working on the same project must be coordinated.
|
1998-11-16 13:02:08 +01:00
|
|
|
We will see some how these problems can be relaxed a bit (@pxref{Common
|
|
|
|
Usage}).
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
@deftypefun int catclose (nl_catd @var{catalog_desc})
|
|
|
|
The @code{catclose} function can be used to free the resources
|
|
|
|
associated with a message catalog which previously was opened by a call
|
|
|
|
to @code{catopen}. If the resources can be successfully freed the
|
|
|
|
function returns @code{0}. Otherwise it return @code{@minus{}1} and the
|
|
|
|
global variable @var{errno} is set. Errors can occur if the catalog
|
|
|
|
descriptor @var{catalog_desc} is not valid in which case @var{errno} is
|
|
|
|
set to @code{EBADF}.
|
|
|
|
@end deftypefun
|
|
|
|
|
|
|
|
|
|
|
|
@node The message catalog files
|
|
|
|
@subsection Format of the message catalog files
|
|
|
|
|
|
|
|
The only reasonable way the translate all the messages of a function and
|
|
|
|
store the result in a message catalog file which can be read by the
|
|
|
|
@code{catopen} function is to write all the message text to the
|
|
|
|
translator and let her/him translate them all. I.e., we must have a
|
1997-10-15 07:34:02 +02:00
|
|
|
file with entries which associate the set/message tuple with a specific
|
1997-08-20 05:53:21 +02:00
|
|
|
translation. This file format is specified in the X/Open standard and
|
|
|
|
is as follows:
|
|
|
|
|
|
|
|
@itemize @bullet
|
|
|
|
@item
|
|
|
|
Lines containing only whitespace characters or empty lines are ignored.
|
|
|
|
|
|
|
|
@item
|
|
|
|
Lines which contain as the first non-whitespace character a @code{$}
|
|
|
|
followed by a whitespace character are comment and are also ignored.
|
|
|
|
|
|
|
|
@item
|
|
|
|
If a line contains as the first non-whitespace characters the sequence
|
|
|
|
@code{$set} followed by a whitespace character an additional argument
|
|
|
|
is required to follow. This argument can either be:
|
|
|
|
|
|
|
|
@itemize @minus
|
|
|
|
@item
|
|
|
|
a number. In this case the value of this number determines the set
|
|
|
|
to which the following messages are added.
|
|
|
|
|
|
|
|
@item
|
|
|
|
an identifier consisting of alphanumeric characters plus the underscore
|
|
|
|
character. In this case the set get automatically a number assigned.
|
|
|
|
This value is one added to the largest set number which so far appeared.
|
|
|
|
|
|
|
|
How to use the symbolic names is explained in section @ref{Common Usage}.
|
|
|
|
|
|
|
|
It is an error if a symbol name appears more than once. All following
|
|
|
|
messages are placed in a set with this number.
|
|
|
|
@end itemize
|
|
|
|
|
|
|
|
@item
|
|
|
|
If a line contains as the first non-whitespace characters the sequence
|
|
|
|
@code{$delset} followed by a whitespace character an additional argument
|
|
|
|
is required to follow. This argument can either be:
|
|
|
|
|
|
|
|
@itemize @minus
|
|
|
|
@item
|
|
|
|
a number. In this case the value of this number determines the set
|
|
|
|
which will be deleted.
|
|
|
|
|
|
|
|
@item
|
|
|
|
an identifier consisting of alphanumeric characters plus the underscore
|
|
|
|
character. This symbolic identifier must match a name for a set which
|
|
|
|
previously was defined. It is an error if the name is unknown.
|
|
|
|
@end itemize
|
|
|
|
|
|
|
|
In both cases all messages in the specified set will be removed. They
|
|
|
|
will not appear in the output. But if this set is later again selected
|
|
|
|
with a @code{$set} command again messages could be added and these
|
|
|
|
messages will appear in the output.
|
|
|
|
|
|
|
|
@item
|
|
|
|
If a line contains after leading whitespaces the sequence
|
|
|
|
@code{$quote}, the quoting character used for this input file is
|
|
|
|
changed to the first non-whitespace character following the
|
|
|
|
@code{$quote}. If no non-whitespace character is present before the
|
|
|
|
line ends quoting is disable.
|
|
|
|
|
|
|
|
By default no quoting character is used. In this mode strings are
|
|
|
|
terminated with the first unescaped line break. If there is a
|
|
|
|
@code{$quote} sequence present newline need not be escaped. Instead a
|
1997-10-15 07:34:02 +02:00
|
|
|
string is terminated with the first unescaped appearance of the quote
|
1997-08-20 05:53:21 +02:00
|
|
|
character.
|
|
|
|
|
|
|
|
A common usage of this feature would be to set the quote character to
|
1997-10-15 07:34:02 +02:00
|
|
|
@code{"}. Then any appearance of the @code{"} in the strings must
|
1997-08-20 05:53:21 +02:00
|
|
|
be escaped using the backslash (i.e., @code{\"} must be written).
|
|
|
|
|
|
|
|
@item
|
|
|
|
Any other line must start with a number or an alphanumeric identifier
|
|
|
|
(with the underscore character included). The following characters
|
1999-10-05 17:26:17 +02:00
|
|
|
(starting after the first whitespace character) will form the string
|
1997-08-20 05:53:21 +02:00
|
|
|
which gets associated with the currently selected set and the message
|
|
|
|
number represented by the number and identifier respectively.
|
|
|
|
|
|
|
|
If the start of the line is a number the message number is obvious. It
|
|
|
|
is an error if the same message number already appeared for this set.
|
|
|
|
|
|
|
|
If the leading token was an identifier the message number gets
|
|
|
|
automatically assigned. The value is the current maximum messages
|
|
|
|
number for this set plus one. It is an error if the identifier was
|
2000-01-24 05:18:43 +01:00
|
|
|
already used for a message in this set. It is OK to reuse the
|
1997-08-20 05:53:21 +02:00
|
|
|
identifier for a message in another thread. How to use the symbolic
|
|
|
|
identifiers will be explained below (@pxref{Common Usage}). There is
|
|
|
|
one limitation with the identifier: it must not be @code{Set}. The
|
|
|
|
reason will be explained below.
|
|
|
|
|
|
|
|
The text of the messages can contain escape characters. The usual bunch
|
|
|
|
of characters known from the @w{ISO C} language are recognized
|
|
|
|
(@code{\n}, @code{\t}, @code{\v}, @code{\b}, @code{\r}, @code{\f},
|
|
|
|
@code{\\}, and @code{\@var{nnn}}, where @var{nnn} is the octal coding of
|
|
|
|
a character code).
|
|
|
|
@end itemize
|
|
|
|
|
|
|
|
@strong{Important:} The handling of identifiers instead of numbers for
|
|
|
|
the set and messages is a GNU extension. Systems strictly following the
|
|
|
|
X/Open specification do not have this feature. An example for a message
|
|
|
|
catalog file is this:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
$ This is a leading comment.
|
|
|
|
$quote "
|
|
|
|
|
|
|
|
$set SetOne
|
|
|
|
1 Message with ID 1.
|
|
|
|
two " Message with ID \"two\", which gets the value 2 assigned"
|
|
|
|
|
|
|
|
$set SetTwo
|
1997-10-15 07:34:02 +02:00
|
|
|
$ Since the last set got the number 1 assigned this set has number 2.
|
1997-08-20 05:53:21 +02:00
|
|
|
4000 "The numbers can be arbitrary, they need not start at one."
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
This small example shows various aspects:
|
|
|
|
@itemize @bullet
|
|
|
|
@item
|
|
|
|
Lines 1 and 9 are comments since they start with @code{$} followed by
|
|
|
|
a whitespace.
|
|
|
|
@item
|
|
|
|
The quoting character is set to @code{"}. Otherwise the quotes in the
|
|
|
|
message definition would have to be left away and in this case the
|
|
|
|
message with the identifier @code{two} would loose its leading whitespace.
|
|
|
|
@item
|
|
|
|
Mixing numbered messages with message having symbolic names is no
|
1997-10-15 07:34:02 +02:00
|
|
|
problem and the numbering happens automatically.
|
1997-08-20 05:53:21 +02:00
|
|
|
@end itemize
|
|
|
|
|
|
|
|
|
|
|
|
While this file format is pretty easy it is not the best possible for
|
|
|
|
use in a running program. The @code{catopen} function would have to
|
|
|
|
parser the file and handle syntactic errors gracefully. This is not so
|
|
|
|
easy and the whole process is pretty slow. Therefore the @code{catgets}
|
|
|
|
functions expect the data in another more compact and ready-to-use file
|
1997-10-15 07:34:02 +02:00
|
|
|
format. There is a special program @code{gencat} which is explained in
|
1997-08-20 05:53:21 +02:00
|
|
|
detail in the next section.
|
|
|
|
|
|
|
|
Files in this other format are not human readable. To be easy to use by
|
|
|
|
programs it is a binary file. But the format is byte order independent
|
|
|
|
so translation files can be shared by systems of arbitrary architecture
|
|
|
|
(as long as they use the GNU C Library).
|
|
|
|
|
|
|
|
Details about the binary file format are not important to know since
|
|
|
|
these files are always created by the @code{gencat} program. The
|
|
|
|
sources of the GNU C Library also provide the sources for the
|
1997-10-15 07:34:02 +02:00
|
|
|
@code{gencat} program and so the interested reader can look through
|
1997-08-20 05:53:21 +02:00
|
|
|
these source files to learn about the file format.
|
|
|
|
|
|
|
|
|
|
|
|
@node The gencat program
|
|
|
|
@subsection Generate Message Catalogs files
|
|
|
|
|
|
|
|
@cindex gencat
|
|
|
|
The @code{gencat} program is specified in the X/Open standard and the
|
2000-03-10 09:41:39 +01:00
|
|
|
GNU implementation follows this specification and so processes
|
1997-08-20 05:53:21 +02:00
|
|
|
all correctly formed input files. Additionally some extension are
|
1998-05-19 18:13:05 +02:00
|
|
|
implemented which help to work in a more reasonable way with the
|
1997-08-20 05:53:21 +02:00
|
|
|
@code{catgets} functions.
|
|
|
|
|
|
|
|
The @code{gencat} program can be invoked in two ways:
|
|
|
|
|
|
|
|
@example
|
|
|
|
`gencat [@var{Option}]@dots{} [@var{Output-File} [@var{Input-File}]@dots{}]`
|
|
|
|
@end example
|
|
|
|
|
|
|
|
This is the interface defined in the X/Open standard. If no
|
|
|
|
@var{Input-File} parameter is given input will be read from standard
|
|
|
|
input. Multiple input files will be read as if they are concatenated.
|
|
|
|
If @var{Output-File} is also missing, the output will be written to
|
2000-01-22 10:20:14 +01:00
|
|
|
standard output. To provide the interface one is used to from other
|
1997-08-20 05:53:21 +02:00
|
|
|
programs a second interface is provided.
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
`gencat [@var{Option}]@dots{} -o @var{Output-File} [@var{Input-File}]@dots{}`
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
The option @samp{-o} is used to specify the output file and all file
|
|
|
|
arguments are used as input files.
|
|
|
|
|
|
|
|
Beside this one can use @file{-} or @file{/dev/stdin} for
|
|
|
|
@var{Input-File} to denote the standard input. Corresponding one can
|
|
|
|
use @file{-} and @file{/dev/stdout} for @var{Output-File} to denote
|
|
|
|
standard output. Using @file{-} as a file name is allowed in X/Open
|
|
|
|
while using the device names is a GNU extension.
|
|
|
|
|
|
|
|
The @code{gencat} program works by concatenating all input files and
|
|
|
|
then @strong{merge} the resulting collection of message sets with a
|
1997-10-15 07:34:02 +02:00
|
|
|
possibly existing output file. This is done by removing all messages
|
|
|
|
with set/message number tuples matching any of the generated messages
|
1997-08-20 05:53:21 +02:00
|
|
|
from the output file and then adding all the new messages. To
|
|
|
|
regenerate a catalog file while ignoring the old contents therefore
|
|
|
|
requires to remove the output file if it exists. If the output is
|
|
|
|
written to standard output no merging takes place.
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
The following table shows the options understood by the @code{gencat}
|
|
|
|
program. The X/Open standard does not specify any option for the
|
|
|
|
program so all of these are GNU extensions.
|
|
|
|
|
|
|
|
@table @samp
|
|
|
|
@item -V
|
|
|
|
@itemx --version
|
|
|
|
Print the version information and exit.
|
|
|
|
@item -h
|
|
|
|
@itemx --help
|
|
|
|
Print a usage message listing all available options, then exit successfully.
|
|
|
|
@item --new
|
|
|
|
Do never merge the new messages from the input files with the old content
|
|
|
|
of the output files. The old content of the output file is discarded.
|
|
|
|
@item -H
|
|
|
|
@itemx --header=name
|
|
|
|
This option is used to emit the symbolic names given to sets and
|
|
|
|
messages in the input files for use in the program. Details about how
|
|
|
|
to use this are given in the next section. The @var{name} parameter to
|
|
|
|
this option specifies the name of the output file. It will contain a
|
|
|
|
number of C preprocessor @code{#define}s to associate a name with a
|
|
|
|
number.
|
|
|
|
|
|
|
|
Please note that the generated file only contains the symbols from the
|
|
|
|
input files. If the output is merged with the previous content of the
|
|
|
|
output file the possibly existing symbols from the file(s) which
|
|
|
|
generated the old output files are not in the generated header file.
|
|
|
|
@end table
|
|
|
|
|
|
|
|
|
|
|
|
@node Common Usage
|
|
|
|
@subsection How to use the @code{catgets} interface
|
|
|
|
|
|
|
|
The @code{catgets} functions can be used in two different ways. By
|
|
|
|
following slavishly the X/Open specs and not relying on the extension
|
|
|
|
and by using the GNU extensions. We will take a look at the former
|
|
|
|
method first to understand the benefits of extensions.
|
|
|
|
|
1998-06-15 20:12:05 +02:00
|
|
|
@subsubsection Not using symbolic names
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
Since the X/Open format of the message catalog files does not allow
|
|
|
|
symbol names we have to work with numbers all the time. When we start
|
1997-10-15 07:34:02 +02:00
|
|
|
writing a program we have to replace all appearances of translatable
|
|
|
|
strings with something like
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
@smallexample
|
|
|
|
catgets (catdesc, set, msg, "string")
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
@var{catgets} is retrieved from a call to @code{catopen} which is
|
|
|
|
normally done once at the program start. The @code{"string"} is the
|
|
|
|
string we want to translate. The problems start with the set and
|
|
|
|
message numbers.
|
|
|
|
|
|
|
|
In a bigger program several programmers usually work at the same time on
|
|
|
|
the program and so coordinating the number allocation is crucial.
|
1997-10-15 07:34:02 +02:00
|
|
|
Though no two different strings must be indexed by the same tuple of
|
|
|
|
numbers it is highly desirable to reuse the numbers for equal strings
|
1997-08-20 05:53:21 +02:00
|
|
|
with equal translations (please note that there might be strings which
|
|
|
|
are equal in one language but have different translations due to
|
|
|
|
difference contexts).
|
|
|
|
|
|
|
|
The allocation process can be relaxed a bit by different set numbers for
|
|
|
|
different parts of the program. So the number of developers who have to
|
|
|
|
coordinate the allocation can be reduced. But still lists must be keep
|
|
|
|
track of the allocation and errors can easily happen. These errors
|
|
|
|
cannot be discovered by the compiler or the @code{catgets} functions.
|
|
|
|
Only the user of the program might see wrong messages printed. In the
|
|
|
|
worst cases the messages are so irritating that they cannot be
|
|
|
|
recognized as wrong. Think about the translations for @code{"true"} and
|
1997-10-15 07:34:02 +02:00
|
|
|
@code{"false"} being exchanged. This could result in a disaster.
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
|
|
|
|
@subsubsection Using symbolic names
|
|
|
|
|
|
|
|
The problems mentioned in the last section derive from the fact that:
|
|
|
|
|
|
|
|
@enumerate
|
|
|
|
@item
|
|
|
|
the numbers are allocated once and due to the possibly frequent use of
|
|
|
|
them it is difficult to change a number later.
|
|
|
|
@item
|
|
|
|
the numbers do not allow to guess anything about the string and
|
|
|
|
therefore collisions can easily happen.
|
|
|
|
@end enumerate
|
|
|
|
|
|
|
|
By constantly using symbolic names and by providing a method which maps
|
|
|
|
the string content to a symbolic name (however this will happen) one can
|
|
|
|
prevent both problems above. The cost of this is that the programmer
|
|
|
|
has to write a complete message catalog file while s/he is writing the
|
|
|
|
program itself.
|
|
|
|
|
|
|
|
This is necessary since the symbolic names must be mapped to numbers
|
|
|
|
before the program sources can be compiled. In the last section it was
|
|
|
|
described how to generate a header containing the mapping of the names.
|
|
|
|
E.g., for the example message file given in the last section we could
|
|
|
|
call the @code{gencat} program as follow (assume @file{ex.msg} contains
|
|
|
|
the sources).
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
gencat -H ex.h -o ex.cat ex.msg
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
This generates a header file with the following content:
|
|
|
|
|
|
|
|
@smallexample
|
2000-01-22 10:20:14 +01:00
|
|
|
#define SetTwoSet 0x2 /* ex.msg:8 */
|
1997-08-20 05:53:21 +02:00
|
|
|
|
2000-01-22 10:20:14 +01:00
|
|
|
#define SetOneSet 0x1 /* ex.msg:4 */
|
|
|
|
#define SetOnetwo 0x2 /* ex.msg:6 */
|
1997-08-20 05:53:21 +02:00
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
As can be seen the various symbols given in the source file are mangled
|
|
|
|
to generate unique identifiers and these identifiers get numbers
|
|
|
|
assigned. Reading the source file and knowing about the rules will
|
|
|
|
allow to predict the content of the header file (it is deterministic)
|
|
|
|
but this is not necessary. The @code{gencat} program can take care for
|
|
|
|
everything. All the programmer has to do is to put the generated header
|
|
|
|
file in the dependency list of the source files of her/his project and
|
|
|
|
to add a rules to regenerate the header of any of the input files
|
|
|
|
change.
|
|
|
|
|
|
|
|
One word about the symbol mangling. Every symbol consists of two parts:
|
|
|
|
the name of the message set plus the name of the message or the special
|
|
|
|
string @code{Set}. So @code{SetOnetwo} means this macro can be used to
|
|
|
|
access the translation with identifier @code{two} in the message set
|
|
|
|
@code{SetOne}.
|
|
|
|
|
|
|
|
The other names denote the names of the message sets. The special
|
|
|
|
string @code{Set} is used in the place of the message identifier.
|
|
|
|
|
|
|
|
If in the code the second string of the set @code{SetOne} is used the C
|
|
|
|
code should look like this:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
catgets (catdesc, SetOneSet, SetOnetwo,
|
|
|
|
" Message with ID \"two\", which gets the value 2 assigned")
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
Writing the function this way will allow to change the message number
|
|
|
|
and even the set number without requiring any change in the C source
|
|
|
|
code. (The text of the string is normally not the same; this is only
|
|
|
|
for this example.)
|
|
|
|
|
|
|
|
|
|
|
|
@subsubsection How does to this allow to develop
|
|
|
|
|
|
|
|
To illustrate the usual way to work with the symbolic version numbers
|
|
|
|
here is a little example. Assume we want to write the very complex and
|
|
|
|
famous greeting program. We start by writing the code as usual:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
#include <stdio.h>
|
|
|
|
int
|
|
|
|
main (void)
|
|
|
|
@{
|
|
|
|
printf ("Hello, world!\n");
|
|
|
|
return 0;
|
|
|
|
@}
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
Now we want to internationalize the message and therefore replace the
|
|
|
|
message with whatever the user wants.
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
#include <nl_types.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "msgnrs.h"
|
|
|
|
int
|
|
|
|
main (void)
|
|
|
|
@{
|
|
|
|
nl_catd catdesc = catopen ("hello.cat", NL_CAT_LOCALE);
|
1998-06-15 20:12:05 +02:00
|
|
|
printf (catgets (catdesc, SetMainSet, SetMainHello,
|
1998-03-19 15:32:08 +01:00
|
|
|
"Hello, world!\n"));
|
1997-08-20 05:53:21 +02:00
|
|
|
catclose (catdesc);
|
|
|
|
return 0;
|
|
|
|
@}
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
We see how the catalog object is opened and the returned descriptor used
|
|
|
|
in the other function calls. It is not really necessary to check for
|
|
|
|
failure of any of the functions since even in these situations the
|
|
|
|
functions will behave reasonable. They simply will be return a
|
|
|
|
translation.
|
|
|
|
|
|
|
|
What remains unspecified here are the constants @code{SetMainSet} and
|
|
|
|
@code{SetMainHello}. These are the symbolic names describing the
|
|
|
|
message. To get the actual definitions which match the information in
|
|
|
|
the catalog file we have to create the message catalog source file and
|
|
|
|
process it using the @code{gencat} program.
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
$ Messages for the famous greeting program.
|
|
|
|
$quote "
|
|
|
|
|
|
|
|
$set Main
|
|
|
|
Hello "Hallo, Welt!\n"
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
Now we can start building the program (assume the message catalog source
|
|
|
|
file is named @file{hello.msg} and the program source file @file{hello.c}):
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
@cartouche
|
|
|
|
% gencat -H msgnrs.h -o hello.cat hello.msg
|
|
|
|
% cat msgnrs.h
|
|
|
|
#define MainSet 0x1 /* hello.msg:4 */
|
|
|
|
#define MainHello 0x1 /* hello.msg:5 */
|
|
|
|
% gcc -o hello hello.c -I.
|
|
|
|
% cp hello.cat /usr/share/locale/de/LC_MESSAGES
|
|
|
|
% echo $LC_ALL
|
|
|
|
de
|
|
|
|
% ./hello
|
|
|
|
Hallo, Welt!
|
|
|
|
%
|
|
|
|
@end cartouche
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
The call of the @code{gencat} program creates the missing header file
|
|
|
|
@file{msgnrs.h} as well as the message catalog binary. The former is
|
|
|
|
used in the compilation of @file{hello.c} while the later is placed in a
|
|
|
|
directory in which the @code{catopen} function will try to locate it.
|
|
|
|
Please check the @code{LC_ALL} environment variable and the default path
|
|
|
|
for @code{catopen} presented in the description above.
|
|
|
|
|
|
|
|
|
|
|
|
@node The Uniforum approach
|
|
|
|
@section The Uniforum approach to Message Translation
|
|
|
|
|
|
|
|
Sun Microsystems tried to standardize a different approach to message
|
|
|
|
translation in the Uniforum group. There never was a real standard
|
|
|
|
defined but still the interface was used in Sun's operation systems.
|
|
|
|
Since this approach fits better in the development process of free
|
2000-10-26 04:37:46 +02:00
|
|
|
software it is also used throughout the GNU project and the GNU
|
1997-08-20 05:53:21 +02:00
|
|
|
@file{gettext} package provides support for this outside the GNU C
|
|
|
|
Library.
|
|
|
|
|
|
|
|
The code of the @file{libintl} from GNU @file{gettext} is the same as
|
|
|
|
the code in the GNU C Library. So the documentation in the GNU
|
|
|
|
@file{gettext} manual is also valid for the functionality here. The
|
|
|
|
following text will describe the library functions in detail. But the
|
|
|
|
numerous helper programs are not described in this manual. Instead
|
|
|
|
people should read the GNU @file{gettext} manual
|
|
|
|
(@pxref{Top,,GNU gettext utilities,gettext,Native Language Support Library and Tools}).
|
|
|
|
We will only give a short overview.
|
|
|
|
|
|
|
|
Though the @code{catgets} functions are available by default on more
|
|
|
|
systems the @code{gettext} interface is at least as portable as the
|
|
|
|
former. The GNU @file{gettext} package can be used wherever the
|
|
|
|
functions are not available.
|
|
|
|
|
|
|
|
|
|
|
|
@menu
|
|
|
|
* Message catalogs with gettext:: The @code{gettext} family of functions.
|
|
|
|
* Helper programs for gettext:: Programs to handle message catalogs
|
|
|
|
for @code{gettext}.
|
|
|
|
@end menu
|
|
|
|
|
|
|
|
|
|
|
|
@node Message catalogs with gettext
|
|
|
|
@subsection The @code{gettext} family of functions
|
|
|
|
|
|
|
|
The paradigms underlying the @code{gettext} approach to message
|
|
|
|
translations is different from that of the @code{catgets} functions the
|
|
|
|
basic functionally is equivalent. There are functions of the following
|
|
|
|
categories:
|
|
|
|
|
|
|
|
@menu
|
2000-05-04 04:46:54 +02:00
|
|
|
* Translation with gettext:: What has to be done to translate a message.
|
|
|
|
* Locating gettext catalog:: How to determine which catalog to be used.
|
|
|
|
* Advanced gettext functions:: Additional functions for more complicated
|
|
|
|
situations.
|
|
|
|
* Charset conversion in gettext:: How to specify the output character set
|
|
|
|
@code{gettext} uses.
|
|
|
|
* GUI program problems:: How to use @code{gettext} in GUI programs.
|
|
|
|
* Using gettextized software:: The possibilities of the user to influence
|
|
|
|
the way @code{gettext} works.
|
1997-08-20 05:53:21 +02:00
|
|
|
@end menu
|
|
|
|
|
|
|
|
@node Translation with gettext
|
|
|
|
@subsubsection What has to be done to translate a message?
|
|
|
|
|
|
|
|
The @code{gettext} functions have a very simple interface. The most
|
|
|
|
basic function just takes the string which shall be translated as the
|
|
|
|
argument and it returns the translation. This is fundamentally
|
|
|
|
different from the @code{catgets} approach where an extra key is
|
|
|
|
necessary and the original string is only used for the error case.
|
|
|
|
|
|
|
|
If the string which has to be translated is the only argument this of
|
|
|
|
course means the string itself is the key. I.e., the translation will
|
|
|
|
be selected based on the original string. The message catalogs must
|
|
|
|
therefore contain the original strings plus one translation for any such
|
|
|
|
string. The task of the @code{gettext} function is it to compare the
|
|
|
|
argument string with the available strings in the catalog and return the
|
|
|
|
appropriate translation. Of course this process is optimized so that
|
|
|
|
this process is not more expensive than an access using an atomic key
|
|
|
|
like in @code{catgets}.
|
|
|
|
|
|
|
|
The @code{gettext} approach has some advantages but also some
|
|
|
|
disadvantages. Please see the GNU @file{gettext} manual for a detailed
|
|
|
|
discussion of the pros and cons.
|
|
|
|
|
|
|
|
All the definitions and declarations for @code{gettext} can be found in
|
|
|
|
the @file{libintl.h} header file. On systems where these functions are
|
|
|
|
not part of the C library they can be found in a separate library named
|
|
|
|
@file{libintl.a} (or accordingly different for shared libraries).
|
|
|
|
|
2000-01-22 10:20:14 +01:00
|
|
|
@comment libintl.h
|
|
|
|
@comment GNU
|
1997-08-20 05:53:21 +02:00
|
|
|
@deftypefun {char *} gettext (const char *@var{msgid})
|
|
|
|
The @code{gettext} function searches the currently selected message
|
|
|
|
catalogs for a string which is equal to @var{msgid}. If there is such a
|
|
|
|
string available it is returned. Otherwise the argument string
|
|
|
|
@var{msgid} is returned.
|
|
|
|
|
|
|
|
Please note that all though the return value is @code{char *} the
|
|
|
|
returned string must not be changed. This broken type results from the
|
|
|
|
history of the function and does not reflect the way the function should
|
|
|
|
be used.
|
|
|
|
|
|
|
|
Please note that above we wrote ``message catalogs'' (plural). This is
|
2000-01-24 05:18:43 +01:00
|
|
|
a specialty of the GNU implementation of these functions and we will
|
1998-11-16 13:02:08 +01:00
|
|
|
say more about this when we talk about the ways message catalogs are
|
|
|
|
selected (@pxref{Locating gettext catalog}).
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
The @code{gettext} function does not modify the value of the global
|
|
|
|
@var{errno} variable. This is necessary to make it possible to write
|
|
|
|
something like
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
printf (gettext ("Operation failed: %m\n"));
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
Here the @var{errno} value is used in the @code{printf} function while
|
|
|
|
processing the @code{%m} format element and if the @code{gettext}
|
|
|
|
function would change this value (it is called before @code{printf} is
|
1997-10-15 07:34:02 +02:00
|
|
|
called) we would get a wrong message.
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
So there is no easy way to detect a missing message catalog beside
|
|
|
|
comparing the argument string with the result. But it is normally the
|
|
|
|
task of the user to react on missing catalogs. The program cannot guess
|
2000-10-26 04:37:46 +02:00
|
|
|
when a message catalog is really necessary since for a user who speaks
|
1997-08-20 05:53:21 +02:00
|
|
|
the language the program was developed in does not need any translation.
|
|
|
|
@end deftypefun
|
|
|
|
|
|
|
|
The remaining two functions to access the message catalog add some
|
|
|
|
functionality to select a message catalog which is not the default one.
|
|
|
|
This is important if parts of the program are developed independently.
|
|
|
|
Every part can have its own message catalog and all of them can be used
|
|
|
|
at the same time. The C library itself is an example: internally it
|
|
|
|
uses the @code{gettext} functions but since it must not depend on a
|
|
|
|
currently selected default message catalog it must specify all ambiguous
|
|
|
|
information.
|
|
|
|
|
2000-01-22 10:20:14 +01:00
|
|
|
@comment libintl.h
|
|
|
|
@comment GNU
|
1997-08-20 05:53:21 +02:00
|
|
|
@deftypefun {char *} dgettext (const char *@var{domainname}, const char *@var{msgid})
|
|
|
|
The @code{dgettext} functions acts just like the @code{gettext}
|
|
|
|
function. It only takes an additional first argument @var{domainname}
|
|
|
|
which guides the selection of the message catalogs which are searched
|
|
|
|
for the translation. If the @var{domainname} parameter is the null
|
|
|
|
pointer the @code{dgettext} function is exactly equivalent to
|
|
|
|
@code{gettext} since the default value for the domain name is used.
|
|
|
|
|
|
|
|
As for @code{gettext} the return value type is @code{char *} which is an
|
1997-10-15 07:34:02 +02:00
|
|
|
anachronism. The returned string must never be modified.
|
1997-08-20 05:53:21 +02:00
|
|
|
@end deftypefun
|
|
|
|
|
2000-01-22 10:20:14 +01:00
|
|
|
@comment libintl.h
|
|
|
|
@comment GNU
|
1997-08-20 05:53:21 +02:00
|
|
|
@deftypefun {char *} dcgettext (const char *@var{domainname}, const char *@var{msgid}, int @var{category})
|
|
|
|
The @code{dcgettext} adds another argument to those which
|
|
|
|
@code{dgettext} takes. This argument @var{category} specifies the last
|
|
|
|
piece of information needed to localize the message catalog. I.e., the
|
|
|
|
domain name and the locale category exactly specify which message
|
|
|
|
catalog has to be used (relative to a given directory, see below).
|
|
|
|
|
|
|
|
The @code{dgettext} function can be expressed in terms of
|
|
|
|
@code{dcgettext} by using
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
dcgettext (domain, string, LC_MESSAGES)
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
instead of
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
dgettext (domain, string)
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
This also shows which values are expected for the third parameter. One
|
|
|
|
has to use the available selectors for the categories available in
|
|
|
|
@file{locale.h}. Normally the available values are @code{LC_CTYPE},
|
|
|
|
@code{LC_COLLATE}, @code{LC_MESSAGES}, @code{LC_MONETARY},
|
|
|
|
@code{LC_NUMERIC}, and @code{LC_TIME}. Please note that @code{LC_ALL}
|
|
|
|
must not be used and even though the names might suggest this, there is
|
|
|
|
no relation to the environments variables of this name.
|
|
|
|
|
|
|
|
The @code{dcgettext} function is only implemented for compatibility with
|
|
|
|
other systems which have @code{gettext} functions. There is not really
|
|
|
|
any situation where it is necessary (or useful) to use a different value
|
|
|
|
but @code{LC_MESSAGES} in for the @var{category} parameter. We are
|
|
|
|
dealing with messages here and any other choice can only be irritating.
|
|
|
|
|
|
|
|
As for @code{gettext} the return value type is @code{char *} which is an
|
1997-10-15 07:34:02 +02:00
|
|
|
anachronism. The returned string must never be modified.
|
1997-08-20 05:53:21 +02:00
|
|
|
@end deftypefun
|
|
|
|
|
|
|
|
When using the three functions above in a program it is a frequent case
|
|
|
|
that the @var{msgid} argument is a constant string. So it is worth to
|
|
|
|
optimize this case. Thinking shortly about this one will realize that
|
|
|
|
as long as no new message catalog is loaded the translation of a message
|
2000-10-26 04:37:46 +02:00
|
|
|
will not change. This optimization is actually implemented by the
|
|
|
|
@code{gettext}, @code{dgettext} and @code{dcgettext} functions.
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
|
|
|
|
@node Locating gettext catalog
|
|
|
|
@subsubsection How to determine which catalog to be used
|
|
|
|
|
1997-10-15 07:34:02 +02:00
|
|
|
The functions to retrieve the translations for a given message have a
|
1997-08-20 05:53:21 +02:00
|
|
|
remarkable simple interface. But to provide the user of the program
|
|
|
|
still the opportunity to select exactly the translation s/he wants and
|
|
|
|
also to provide the programmer the possibility to influence the way to
|
|
|
|
locate the search for catalogs files there is a quite complicated
|
|
|
|
underlying mechanism which controls all this. The code is complicated
|
|
|
|
the use is easy.
|
|
|
|
|
|
|
|
Basically we have two different tasks to perform which can also be
|
|
|
|
performed by the @code{catgets} functions:
|
|
|
|
|
|
|
|
@enumerate
|
|
|
|
@item
|
|
|
|
Locate the set of message catalogs. There are a number of files for
|
|
|
|
different languages and which all belong to the package. Usually they
|
|
|
|
are all stored in the filesystem below a certain directory.
|
|
|
|
|
|
|
|
There can be arbitrary many packages installed and they can follow
|
|
|
|
different guidelines for the placement of their files.
|
|
|
|
|
|
|
|
@item
|
|
|
|
Relative to the location specified by the package the actual translation
|
|
|
|
files must be searched, based on the wishes of the user. I.e., for each
|
|
|
|
language the user selects the program should be able to locate the
|
|
|
|
appropriate file.
|
|
|
|
@end enumerate
|
|
|
|
|
|
|
|
This is the functionality required by the specifications for
|
|
|
|
@code{gettext} and this is also what the @code{catgets} functions are
|
|
|
|
able to do. But there are some problems unresolved:
|
|
|
|
|
|
|
|
@itemize @bullet
|
|
|
|
@item
|
|
|
|
The language to be used can be specified in several different ways.
|
|
|
|
There is no generally accepted standard for this and the user always
|
|
|
|
expects the program understand what s/he means. E.g., to select the
|
|
|
|
German translation one could write @code{de}, @code{german}, or
|
|
|
|
@code{deutsch} and the program should always react the same.
|
|
|
|
|
|
|
|
@item
|
|
|
|
Sometimes the specification of the user is too detailed. If s/he, e.g.,
|
|
|
|
specifies @code{de_DE.ISO-8859-1} which means German, spoken in Germany,
|
|
|
|
coded using the @w{ISO 8859-1} character set there is the possibility
|
|
|
|
that a message catalog matching this exactly is not available. But
|
|
|
|
there could be a catalog matching @code{de} and if the character set
|
|
|
|
used on the machine is always @w{ISO 8859-1} there is no reason why this
|
|
|
|
later message catalog should not be used. (We call this @dfn{message
|
|
|
|
inheritance}.)
|
|
|
|
|
|
|
|
@item
|
|
|
|
If a catalog for a wanted language is not available it is not always the
|
|
|
|
second best choice to fall back on the language of the developer and
|
|
|
|
simply not translate any message. Instead a user might be better able
|
|
|
|
to read the messages in another language and so the user of the program
|
|
|
|
should be able to define an precedence order of languages.
|
|
|
|
@end itemize
|
|
|
|
|
1997-10-15 07:34:02 +02:00
|
|
|
We can divide the configuration actions in two parts: the one is
|
1997-08-20 05:53:21 +02:00
|
|
|
performed by the programmer, the other by the user. We will start with
|
|
|
|
the functions the programmer can use since the user configuration will
|
|
|
|
be based on this.
|
|
|
|
|
|
|
|
As the functions described in the last sections already mention separate
|
|
|
|
sets of messages can be selected by a @dfn{domain name}. This is a
|
|
|
|
simple string which should be unique for each program part with uses a
|
|
|
|
separate domain. It is possible to use in one program arbitrary many
|
|
|
|
domains at the same time. E.g., the GNU C Library itself uses a domain
|
|
|
|
named @code{libc} while the program using the C Library could use a
|
|
|
|
domain named @code{foo}. The important point is that at any time
|
|
|
|
exactly one domain is active. This is controlled with the following
|
|
|
|
function.
|
|
|
|
|
2000-01-22 10:20:14 +01:00
|
|
|
@comment libintl.h
|
|
|
|
@comment GNU
|
1997-08-20 05:53:21 +02:00
|
|
|
@deftypefun {char *} textdomain (const char *@var{domainname})
|
|
|
|
The @code{textdomain} function sets the default domain, which is used in
|
|
|
|
all future @code{gettext} calls, to @var{domainname}. Please note that
|
|
|
|
@code{dgettext} and @code{dcgettext} calls are not influenced if the
|
|
|
|
@var{domainname} parameter of these functions is not the null pointer.
|
|
|
|
|
|
|
|
Before the first call to @code{textdomain} the default domain is
|
1997-10-15 07:34:02 +02:00
|
|
|
@code{messages}. This is the name specified in the specification of
|
1997-08-20 05:53:21 +02:00
|
|
|
the @code{gettext} API. This name is as good as any other name. No
|
|
|
|
program should ever really use a domain with this name since this can
|
|
|
|
only lead to problems.
|
|
|
|
|
|
|
|
The function returns the value which is from now on taken as the default
|
|
|
|
domain. If the system went out of memory the returned value is
|
|
|
|
@code{NULL} and the global variable @var{errno} is set to @code{ENOMEM}.
|
|
|
|
Despite the return value type being @code{char *} the return string must
|
|
|
|
not be changed. It is allocated internally by the @code{textdomain}
|
|
|
|
function.
|
|
|
|
|
|
|
|
If the @var{domainname} parameter is the null pointer no new default
|
|
|
|
domain is set. Instead the currently selected default domain is
|
|
|
|
returned.
|
|
|
|
|
|
|
|
If the @var{domainname} parameter is the empty string the default domain
|
|
|
|
is reset to its initial value, the domain with the name @code{messages}.
|
|
|
|
This possibility is questionable to use since the domain @code{messages}
|
|
|
|
really never should be used.
|
|
|
|
@end deftypefun
|
|
|
|
|
2000-01-22 10:20:14 +01:00
|
|
|
@comment libintl.h
|
|
|
|
@comment GNU
|
1997-08-20 05:53:21 +02:00
|
|
|
@deftypefun {char *} bindtextdomain (const char *@var{domainname}, const char *@var{dirname})
|
1999-09-28 06:54:04 +02:00
|
|
|
The @code{bindtextdomain} function can be used to specify the directory
|
1997-08-20 05:53:21 +02:00
|
|
|
which contains the message catalogs for domain @var{domainname} for the
|
|
|
|
different languages. To be correct, this is the directory where the
|
1997-10-15 07:34:02 +02:00
|
|
|
hierarchy of directories is expected. Details are explained below.
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
For the programmer it is important to note that the translations which
|
1997-10-15 07:34:02 +02:00
|
|
|
come with the program have be placed in a directory hierarchy starting
|
1997-08-20 05:53:21 +02:00
|
|
|
at, say, @file{/foo/bar}. Then the program should make a
|
|
|
|
@code{bindtextdomain} call to bind the domain for the current program to
|
|
|
|
this directory. So it is made sure the catalogs are found. A correctly
|
|
|
|
running program does not depend on the user setting an environment
|
|
|
|
variable.
|
|
|
|
|
|
|
|
The @code{bindtextdomain} function can be used several times and if the
|
2000-05-04 04:46:54 +02:00
|
|
|
@var{domainname} argument is different the previously bound domains
|
1997-08-20 05:53:21 +02:00
|
|
|
will not be overwritten.
|
|
|
|
|
1997-09-05 03:43:20 +02:00
|
|
|
If the program which wish to use @code{bindtextdomain} at some point of
|
|
|
|
time use the @code{chdir} function to change the current working
|
|
|
|
directory it is important that the @var{dirname} strings ought to be an
|
|
|
|
absolute pathname. Otherwise the addressed directory might vary with
|
|
|
|
the time.
|
|
|
|
|
1997-08-20 05:53:21 +02:00
|
|
|
If the @var{dirname} parameter is the null pointer @code{bindtextdomain}
|
|
|
|
returns the currently selected directory for the domain with the name
|
|
|
|
@var{domainname}.
|
|
|
|
|
1999-09-28 06:54:04 +02:00
|
|
|
The @code{bindtextdomain} function returns a pointer to a string
|
1997-08-20 05:53:21 +02:00
|
|
|
containing the name of the selected directory name. The string is
|
|
|
|
allocated internally in the function and must not be changed by the
|
|
|
|
user. If the system went out of core during the execution of
|
|
|
|
@code{bindtextdomain} the return value is @code{NULL} and the global
|
|
|
|
variable @var{errno} is set accordingly.
|
|
|
|
@end deftypefun
|
|
|
|
|
|
|
|
|
2000-01-22 10:20:14 +01:00
|
|
|
@node Advanced gettext functions
|
|
|
|
@subsubsection Additional functions for more complicated situations
|
|
|
|
|
|
|
|
The functions of the @code{gettext} family described so far (and all the
|
|
|
|
@code{catgets} functions as well) have one problem in the real world
|
|
|
|
which have been neglected completely in all existing approaches. What
|
|
|
|
is meant here is the handling of plural forms.
|
|
|
|
|
|
|
|
Looking through Unix source code before the time anybody thought about
|
|
|
|
internationalization (and, sadly, even afterwards) one can often find
|
|
|
|
code similar to the following:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
printf ("%d file%s deleted", n, n == 1 ? "" : "s");
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
2001-04-04 02:01:02 +02:00
|
|
|
After the first complaints from people internationalizing the code people
|
2000-01-22 10:20:14 +01:00
|
|
|
either completely avoided formulations like this or used strings like
|
|
|
|
@code{"file(s)"}. Both look unnatural and should be avoided. First
|
|
|
|
tries to solve the problem correctly looked like this:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
if (n == 1)
|
|
|
|
printf ("%d file deleted", n);
|
|
|
|
else
|
|
|
|
printf ("%d files deleted", n);
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
But this does not solve the problem. It helps languages where the
|
|
|
|
plural form of a noun is not simply constructed by adding an `s' but
|
|
|
|
that is all. Once again people fell into the trap of believing the
|
|
|
|
rules their language is using are universal. But the handling of plural
|
|
|
|
forms differs widely between the language families. There are two
|
|
|
|
things we can differ between (and even inside language families);
|
|
|
|
|
|
|
|
@itemize @bullet
|
|
|
|
@item
|
|
|
|
The form how plural forms are build differs. This is a problem with
|
|
|
|
language which have many irregularities. German, for instance, is a
|
|
|
|
drastic case. Though English and German are part of the same language
|
|
|
|
family (Germanic), the almost regular forming of plural noun forms
|
2000-01-24 05:18:43 +01:00
|
|
|
(appending an `s') is hardly found in German.
|
2000-01-22 10:20:14 +01:00
|
|
|
|
|
|
|
@item
|
|
|
|
The number of plural forms differ. This is somewhat surprising for
|
|
|
|
those who only have experiences with Romanic and Germanic languages
|
|
|
|
since here the number is the same (there are two).
|
|
|
|
|
|
|
|
But other language families have only one form or many forms. More
|
|
|
|
information on this in an extra section.
|
|
|
|
@end itemize
|
|
|
|
|
|
|
|
The consequence of this is that application writers should not try to
|
|
|
|
solve the problem in their code. This would be localization since it is
|
|
|
|
only usable for certain, hardcoded language environments. Instead the
|
|
|
|
extended @code{gettext} interface should be used.
|
|
|
|
|
|
|
|
These extra functions are taking instead of the one key string two
|
|
|
|
strings and an numerical argument. The idea behind this is that using
|
|
|
|
the numerical argument and the first string as a key, the implementation
|
|
|
|
can select using rules specified by the translator the right plural
|
|
|
|
form. The two string arguments then will be used to provide a return
|
|
|
|
value in case no message catalog is found (similar to the normal
|
2000-01-24 05:18:43 +01:00
|
|
|
@code{gettext} behavior). In this case the rules for Germanic language
|
2000-01-22 10:20:14 +01:00
|
|
|
is used and it is assumed that the first string argument is the singular
|
|
|
|
form, the second the plural form.
|
|
|
|
|
|
|
|
This has the consequence that programs without language catalogs can
|
|
|
|
display the correct strings only if the program itself is written using
|
|
|
|
a Germanic language. This is a limitation but since the GNU C library
|
|
|
|
(as well as the GNU @code{gettext} package) are written as part of the
|
|
|
|
GNU package and the coding standards for the GNU project require program
|
|
|
|
being written in English, this solution nevertheless fulfills its
|
|
|
|
purpose.
|
|
|
|
|
|
|
|
@comment libintl.h
|
|
|
|
@comment GNU
|
|
|
|
@deftypefun {char *} ngettext (const char *@var{msgid1}, const char *@var{msgid2}, unsigned long int @var{n})
|
|
|
|
The @code{ngettext} function is similar to the @code{gettext} function
|
|
|
|
as it finds the message catalogs in the same way. But it takes two
|
|
|
|
extra arguments. The @var{msgid1} parameter must contain the singular
|
|
|
|
form of the string to be converted. It is also used as the key for the
|
|
|
|
search in the catalog. The @var{msgid2} parameter is the plural form.
|
|
|
|
The parameter @var{n} is used to determine the plural form. If no
|
|
|
|
message catalog is found @var{msgid1} is returned if @code{n == 1},
|
|
|
|
otherwise @code{msgid2}.
|
|
|
|
|
|
|
|
An example for the us of this function is:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
printf (ngettext ("%d file removed", "%d files removed", n), n);
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
Please note that the numeric value @var{n} has to be passed to the
|
|
|
|
@code{printf} function as well. It is not sufficient to pass it only to
|
|
|
|
@code{ngettext}.
|
|
|
|
@end deftypefun
|
|
|
|
|
|
|
|
@comment libintl.h
|
|
|
|
@comment GNU
|
|
|
|
@deftypefun {char *} dngettext (const char *@var{domain}, const char *@var{msgid1}, const char *@var{msgid2}, unsigned long int @var{n})
|
|
|
|
The @code{dngettext} is similar to the @code{dgettext} function in the
|
|
|
|
way the message catalog is selected. The difference is that it takes
|
|
|
|
two extra parameter to provide the correct plural form. These two
|
|
|
|
parameters are handled in the same way @code{ngettext} handles them.
|
|
|
|
@end deftypefun
|
|
|
|
|
|
|
|
@comment libintl.h
|
|
|
|
@comment GNU
|
|
|
|
@deftypefun {char *} dcngettext (const char *@var{domain}, const char *@var{msgid1}, const char *@var{msgid2}, unsigned long int @var{n}, int @var{category})
|
|
|
|
The @code{dcngettext} is similar to the @code{dcgettext} function in the
|
|
|
|
way the message catalog is selected. The difference is that it takes
|
|
|
|
two extra parameter to provide the correct plural form. These two
|
|
|
|
parameters are handled in the same way @code{ngettext} handles them.
|
|
|
|
@end deftypefun
|
|
|
|
|
|
|
|
@subsubheading The problem of plural forms
|
|
|
|
|
|
|
|
A description of the problem can be found at the beginning of the last
|
|
|
|
section. Now there is the question how to solve it. Without the input
|
|
|
|
of linguists (which was not available) it was not possible to determine
|
|
|
|
whether there are only a few different forms in which plural forms are
|
|
|
|
formed or whether the number can increase with every new supported
|
|
|
|
language.
|
|
|
|
|
|
|
|
Therefore the solution implemented is to allow the translator to specify
|
|
|
|
the rules of how to select the plural form. Since the formula varies
|
|
|
|
with every language this is the only viable solution except for
|
2000-01-24 05:18:43 +01:00
|
|
|
hardcoding the information in the code (which still would require the
|
|
|
|
possibility of extensions to not prevent the use of new languages). The
|
2006-10-02 18:08:05 +02:00
|
|
|
details are explained in the GNU @code{gettext} manual. Here only a
|
2000-01-22 10:20:14 +01:00
|
|
|
bit of information is provided.
|
|
|
|
|
|
|
|
The information about the plural form selection has to be stored in the
|
2001-04-04 02:01:02 +02:00
|
|
|
header entry (the one with the empty (@code{msgid} string). It looks
|
|
|
|
like this:
|
2000-01-22 10:20:14 +01:00
|
|
|
|
|
|
|
@smallexample
|
2001-04-04 02:01:02 +02:00
|
|
|
Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;
|
2000-01-22 10:20:14 +01:00
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
The @code{nplurals} value must be a decimal number which specifies how
|
|
|
|
many different plural forms exist for this language. The string
|
|
|
|
following @code{plural} is an expression which is using the C language
|
|
|
|
syntax. Exceptions are that no negative number are allowed, numbers
|
|
|
|
must be decimal, and the only variable allowed is @code{n}. This
|
|
|
|
expression will be evaluated whenever one of the functions
|
|
|
|
@code{ngettext}, @code{dngettext}, or @code{dcngettext} is called. The
|
|
|
|
numeric value passed to these functions is then substituted for all uses
|
|
|
|
of the variable @code{n} in the expression. The resulting value then
|
|
|
|
must be greater or equal to zero and smaller than the value given as the
|
|
|
|
value of @code{nplurals}.
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
The following rules are known at this point. The language with families
|
|
|
|
are listed. But this does not necessarily mean the information can be
|
|
|
|
generalized for the whole family (as can be easily seen in the table
|
|
|
|
below).@footnote{Additions are welcome. Send appropriate information to
|
|
|
|
@email{bug-glibc-manual@@gnu.org}.}
|
|
|
|
|
|
|
|
@table @asis
|
|
|
|
@item Only one form:
|
|
|
|
Some languages only require one single form. There is no distinction
|
2001-04-04 02:01:02 +02:00
|
|
|
between the singular and plural form. An appropriate header entry
|
2000-01-22 10:20:14 +01:00
|
|
|
would look like this:
|
|
|
|
|
|
|
|
@smallexample
|
2001-04-04 02:01:02 +02:00
|
|
|
Plural-Forms: nplurals=1; plural=0;
|
2000-01-22 10:20:14 +01:00
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
Languages with this property include:
|
|
|
|
|
|
|
|
@table @asis
|
|
|
|
@item Finno-Ugric family
|
|
|
|
Hungarian
|
|
|
|
@item Asian family
|
2003-08-29 09:16:04 +02:00
|
|
|
Japanese, Korean
|
2000-01-22 10:20:14 +01:00
|
|
|
@item Turkic/Altaic family
|
|
|
|
Turkish
|
|
|
|
@end table
|
|
|
|
|
|
|
|
@item Two forms, singular used for one only
|
2000-09-09 21:47:29 +02:00
|
|
|
This is the form used in most existing programs since it is what English
|
2000-01-22 10:20:14 +01:00
|
|
|
is using. A header entry would look like this:
|
|
|
|
|
|
|
|
@smallexample
|
2001-04-04 02:01:02 +02:00
|
|
|
Plural-Forms: nplurals=2; plural=n != 1;
|
2000-01-22 10:20:14 +01:00
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
(Note: this uses the feature of C expressions that boolean expressions
|
|
|
|
have to value zero or one.)
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
Languages with this property include:
|
|
|
|
|
|
|
|
@table @asis
|
|
|
|
@item Germanic family
|
|
|
|
Danish, Dutch, English, German, Norwegian, Swedish
|
|
|
|
@item Finno-Ugric family
|
2000-12-19 01:53:04 +01:00
|
|
|
Estonian, Finnish
|
2000-01-22 10:20:14 +01:00
|
|
|
@item Latin/Greek family
|
|
|
|
Greek
|
|
|
|
@item Semitic family
|
|
|
|
Hebrew
|
|
|
|
@item Romance family
|
2003-08-29 09:16:04 +02:00
|
|
|
Italian, Portuguese, Spanish
|
2000-01-22 10:20:14 +01:00
|
|
|
@item Artificial
|
|
|
|
Esperanto
|
|
|
|
@end table
|
|
|
|
|
|
|
|
@item Two forms, singular used for zero and one
|
|
|
|
Exceptional case in the language family. The header entry would be:
|
|
|
|
|
|
|
|
@smallexample
|
2001-04-04 02:01:02 +02:00
|
|
|
Plural-Forms: nplurals=2; plural=n>1;
|
2000-01-22 10:20:14 +01:00
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
Languages with this property include:
|
|
|
|
|
|
|
|
@table @asis
|
|
|
|
@item Romanic family
|
2003-08-29 09:16:04 +02:00
|
|
|
French, Brazilian Portuguese
|
|
|
|
@end table
|
|
|
|
|
|
|
|
@item Three forms, special case for zero
|
|
|
|
The header entry would be:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
Languages with this property include:
|
|
|
|
|
|
|
|
@table @asis
|
|
|
|
@item Baltic family
|
|
|
|
Latvian
|
2000-01-22 10:20:14 +01:00
|
|
|
@end table
|
|
|
|
|
|
|
|
@item Three forms, special cases for one and two
|
|
|
|
The header entry would be:
|
|
|
|
|
|
|
|
@smallexample
|
2001-04-04 02:01:02 +02:00
|
|
|
Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;
|
2000-01-22 10:20:14 +01:00
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
Languages with this property include:
|
|
|
|
|
|
|
|
@table @asis
|
|
|
|
@item Celtic
|
2003-08-29 09:16:04 +02:00
|
|
|
Gaeilge (Irish)
|
|
|
|
@end table
|
|
|
|
|
|
|
|
@item Three forms, special case for numbers ending in 1[2-9]
|
|
|
|
The header entry would look like this:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
Plural-Forms: nplurals=3; \
|
|
|
|
plural=n%10==1 && n%100!=11 ? 0 : \
|
|
|
|
n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
Languages with this property include:
|
|
|
|
|
|
|
|
@table @asis
|
|
|
|
@item Baltic family
|
|
|
|
Lithuanian
|
2000-01-22 10:20:14 +01:00
|
|
|
@end table
|
|
|
|
|
2000-12-19 01:53:04 +01:00
|
|
|
@item Three forms, special cases for numbers ending in 1 and 2, 3, 4, except those ending in 1[1-4]
|
2000-01-22 10:20:14 +01:00
|
|
|
The header entry would look like this:
|
|
|
|
|
|
|
|
@smallexample
|
2001-04-04 02:01:02 +02:00
|
|
|
Plural-Forms: nplurals=3; \
|
|
|
|
plural=n%100/10==1 ? 2 : n%10==1 ? 0 : (n+9)%10>3 ? 2 : 1;
|
2000-01-22 10:20:14 +01:00
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
Languages with this property include:
|
|
|
|
|
|
|
|
@table @asis
|
|
|
|
@item Slavic family
|
2003-08-29 09:16:04 +02:00
|
|
|
Croatian, Czech, Russian, Ukrainian
|
2001-08-26 19:37:42 +02:00
|
|
|
@end table
|
|
|
|
|
|
|
|
@item Three forms, special cases for 1 and 2, 3, 4
|
|
|
|
The header entry would look like this:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
Plural-Forms: nplurals=3; \
|
|
|
|
plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
Languages with this property include:
|
|
|
|
|
|
|
|
@table @asis
|
|
|
|
@item Slavic family
|
|
|
|
Slovak
|
2000-01-22 10:20:14 +01:00
|
|
|
@end table
|
|
|
|
|
|
|
|
@item Three forms, special case for one and some numbers ending in 2, 3, or 4
|
|
|
|
The header entry would look like this:
|
|
|
|
|
|
|
|
@smallexample
|
2001-04-04 02:01:02 +02:00
|
|
|
Plural-Forms: nplurals=3; \
|
|
|
|
plural=n==1 ? 0 : \
|
|
|
|
n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;
|
2000-01-22 10:20:14 +01:00
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
Languages with this property include:
|
|
|
|
|
|
|
|
@table @asis
|
|
|
|
@item Slavic family
|
|
|
|
Polish
|
|
|
|
@end table
|
|
|
|
|
2003-08-29 09:16:04 +02:00
|
|
|
@item Four forms, special case for one and all numbers ending in 02, 03, or 04
|
2000-01-22 10:20:14 +01:00
|
|
|
The header entry would look like this:
|
|
|
|
|
|
|
|
@smallexample
|
2001-04-04 02:01:02 +02:00
|
|
|
Plural-Forms: nplurals=4; \
|
2003-08-29 09:16:04 +02:00
|
|
|
plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;
|
2000-01-22 10:20:14 +01:00
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
Languages with this property include:
|
|
|
|
|
|
|
|
@table @asis
|
|
|
|
@item Slavic family
|
|
|
|
Slovenian
|
|
|
|
@end table
|
|
|
|
@end table
|
|
|
|
|
|
|
|
|
2000-05-04 04:46:54 +02:00
|
|
|
@node Charset conversion in gettext
|
|
|
|
@subsubsection How to specify the output character set @code{gettext} uses
|
|
|
|
|
|
|
|
@code{gettext} not only looks up a translation in a message catalog. It
|
|
|
|
also converts the translation on the fly to the desired output character
|
|
|
|
set. This is useful if the user is working in a different character set
|
|
|
|
than the translator who created the message catalog, because it avoids
|
|
|
|
distributing variants of message catalogs which differ only in the
|
|
|
|
character set.
|
|
|
|
|
|
|
|
The output character set is, by default, the value of @code{nl_langinfo
|
|
|
|
(CODESET)}, which depends on the @code{LC_CTYPE} part of the current
|
|
|
|
locale. But programs which store strings in a locale independent way
|
|
|
|
(e.g. UTF-8) can request that @code{gettext} and related functions
|
|
|
|
return the translations in that encoding, by use of the
|
|
|
|
@code{bind_textdomain_codeset} function.
|
|
|
|
|
|
|
|
Note that the @var{msgid} argument to @code{gettext} is not subject to
|
|
|
|
character set conversion. Also, when @code{gettext} does not find a
|
|
|
|
translation for @var{msgid}, it returns @var{msgid} unchanged --
|
|
|
|
independently of the current output character set. It is therefore
|
|
|
|
recommended that all @var{msgid}s be US-ASCII strings.
|
|
|
|
|
|
|
|
@comment libintl.h
|
|
|
|
@comment GNU
|
|
|
|
@deftypefun {char *} bind_textdomain_codeset (const char *@var{domainname}, const char *@var{codeset})
|
|
|
|
The @code{bind_textdomain_codeset} function can be used to specify the
|
|
|
|
output character set for message catalogs for domain @var{domainname}.
|
2000-10-26 04:37:46 +02:00
|
|
|
The @var{codeset} argument must be a valid codeset name which can be used
|
|
|
|
for the @code{iconv_open} function, or a null pointer.
|
2000-05-04 04:46:54 +02:00
|
|
|
|
|
|
|
If the @var{codeset} parameter is the null pointer,
|
|
|
|
@code{bind_textdomain_codeset} returns the currently selected codeset
|
|
|
|
for the domain with the name @var{domainname}. It returns @code{NULL} if
|
|
|
|
no codeset has yet been selected.
|
|
|
|
|
2001-08-26 19:37:42 +02:00
|
|
|
The @code{bind_textdomain_codeset} function can be used several times.
|
2000-05-04 04:46:54 +02:00
|
|
|
If used multiple times with the same @var{domainname} argument, the
|
|
|
|
later call overrides the settings made by the earlier one.
|
|
|
|
|
|
|
|
The @code{bind_textdomain_codeset} function returns a pointer to a
|
|
|
|
string containing the name of the selected codeset. The string is
|
|
|
|
allocated internally in the function and must not be changed by the
|
|
|
|
user. If the system went out of core during the execution of
|
|
|
|
@code{bind_textdomain_codeset}, the return value is @code{NULL} and the
|
|
|
|
global variable @var{errno} is set accordingly. @end deftypefun
|
|
|
|
|
|
|
|
|
2000-01-24 05:18:43 +01:00
|
|
|
@node GUI program problems
|
|
|
|
@subsubsection How to use @code{gettext} in GUI programs
|
|
|
|
|
2000-10-26 04:37:46 +02:00
|
|
|
One place where the @code{gettext} functions, if used normally, have big
|
|
|
|
problems is within programs with graphical user interfaces (GUIs). The
|
2000-01-24 05:18:43 +01:00
|
|
|
problem is that many of the strings which have to be translated are very
|
|
|
|
short. They have to appear in pull-down menus which restricts the
|
|
|
|
length. But strings which are not containing entire sentences or at
|
|
|
|
least large fragments of a sentence may appear in more than one
|
|
|
|
situation in the program but might have different translations. This is
|
|
|
|
especially true for the one-word strings which are frequently used in
|
|
|
|
GUI programs.
|
|
|
|
|
|
|
|
As a consequence many people say that the @code{gettext} approach is
|
|
|
|
wrong and instead @code{catgets} should be used which indeed does not
|
|
|
|
have this problem. But there is a very simple and powerful method to
|
|
|
|
handle these kind of problems with the @code{gettext} functions.
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
As as example consider the following fictional situation. A GUI program
|
|
|
|
has a menu bar with the following entries:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
+------------+------------+--------------------------------------+
|
|
|
|
| File | Printer | |
|
|
|
|
+------------+------------+--------------------------------------+
|
|
|
|
| Open | | Select |
|
|
|
|
| New | | Open |
|
|
|
|
+----------+ | Connect |
|
|
|
|
+----------+
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
To have the strings @code{File}, @code{Printer}, @code{Open},
|
|
|
|
@code{New}, @code{Select}, and @code{Connect} translated there has to be
|
|
|
|
at some point in the code a call to a function of the @code{gettext}
|
|
|
|
family. But in two places the string passed into the function would be
|
|
|
|
@code{Open}. The translations might not be the same and therefore we
|
|
|
|
are in the dilemma described above.
|
|
|
|
|
|
|
|
One solution to this problem is to artificially enlengthen the strings
|
|
|
|
to make them unambiguous. But what would the program do if no
|
|
|
|
translation is available? The enlengthened string is not what should be
|
|
|
|
printed. So we should use a little bit modified version of the functions.
|
|
|
|
|
|
|
|
To enlengthen the strings a uniform method should be used. E.g., in the
|
|
|
|
example above the strings could be chosen as
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
Menu|File
|
|
|
|
Menu|Printer
|
|
|
|
Menu|File|Open
|
|
|
|
Menu|File|New
|
|
|
|
Menu|Printer|Select
|
|
|
|
Menu|Printer|Open
|
|
|
|
Menu|Printer|Connect
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
Now all the strings are different and if now instead of @code{gettext}
|
|
|
|
the following little wrapper function is used, everything works just
|
|
|
|
fine:
|
|
|
|
|
|
|
|
@cindex sgettext
|
|
|
|
@smallexample
|
|
|
|
char *
|
|
|
|
sgettext (const char *msgid)
|
|
|
|
@{
|
|
|
|
char *msgval = gettext (msgid);
|
|
|
|
if (msgval == msgid)
|
|
|
|
msgval = strrchr (msgid, '|') + 1;
|
|
|
|
return msgval;
|
|
|
|
@}
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
What this little function does is to recognize the case when no
|
|
|
|
translation is available. This can be done very efficiently by a
|
|
|
|
pointer comparison since the return value is the input value. If there
|
|
|
|
is no translation we know that the input string is in the format we used
|
|
|
|
for the Menu entries and therefore contains a @code{|} character. We
|
|
|
|
simply search for the last occurrence of this character and return a
|
|
|
|
pointer to the character following it. That's it!
|
|
|
|
|
|
|
|
If one now consistently uses the enlengthened string form and replaces
|
|
|
|
the @code{gettext} calls with calls to @code{sgettext} (this is normally
|
|
|
|
limited to very few places in the GUI implementation) then it is
|
|
|
|
possible to produce a program which can be internationalized.
|
|
|
|
|
|
|
|
With advanced compilers (such as GNU C) one can write the
|
|
|
|
@code{sgettext} functions as an inline function or as a macro like this:
|
|
|
|
|
|
|
|
@cindex sgettext
|
|
|
|
@smallexample
|
|
|
|
#define sgettext(msgid) \
|
|
|
|
(@{ const char *__msgid = (msgid); \
|
|
|
|
char *__msgstr = gettext (__msgid); \
|
|
|
|
if (__msgval == __msgid) \
|
|
|
|
__msgval = strrchr (__msgid, '|') + 1; \
|
|
|
|
__msgval; @})
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
The other @code{gettext} functions (@code{dgettext}, @code{dcgettext}
|
|
|
|
and the @code{ngettext} equivalents) can and should have corresponding
|
|
|
|
functions as well which look almost identical, except for the parameters
|
|
|
|
and the call to the underlying function.
|
|
|
|
|
|
|
|
Now there is of course the question why such functions do not exist in
|
|
|
|
the GNU C library? There are two parts of the answer to this question.
|
|
|
|
|
|
|
|
@itemize @bullet
|
|
|
|
@item
|
|
|
|
They are easy to write and therefore can be provided by the project they
|
|
|
|
are used in. This is not an answer by itself and must be seen together
|
|
|
|
with the second part which is:
|
|
|
|
|
|
|
|
@item
|
|
|
|
There is no way the C library can contain a version which can work
|
|
|
|
everywhere. The problem is the selection of the character to separate
|
|
|
|
the prefix from the actual string in the enlenghtened string. The
|
|
|
|
examples above used @code{|} which is a quite good choice because it
|
|
|
|
resembles a notation frequently used in this context and it also is a
|
|
|
|
character not often used in message strings.
|
|
|
|
|
|
|
|
But what if the character is used in message strings. Or if the chose
|
|
|
|
character is not available in the character set on the machine one
|
|
|
|
compiles (e.g., @code{|} is not required to exist for @w{ISO C}; this is
|
|
|
|
why the @file{iso646.h} file exists in @w{ISO C} programming environments).
|
|
|
|
@end itemize
|
|
|
|
|
|
|
|
There is only one more comment to make left. The wrapper function above
|
|
|
|
require that the translations strings are not enlengthened themselves.
|
|
|
|
This is only logical. There is no need to disambiguate the strings
|
|
|
|
(since they are never used as keys for a search) and one also saves
|
|
|
|
quite some memory and disk space by doing this.
|
|
|
|
|
|
|
|
|
1997-08-20 05:53:21 +02:00
|
|
|
@node Using gettextized software
|
|
|
|
@subsubsection User influence on @code{gettext}
|
|
|
|
|
|
|
|
The last sections described what the programmer can do to
|
|
|
|
internationalize the messages of the program. But it is finally up to
|
|
|
|
the user to select the message s/he wants to see. S/He must understand
|
|
|
|
them.
|
|
|
|
|
|
|
|
The POSIX locale model uses the environment variables @code{LC_COLLATE},
|
2006-10-02 18:08:05 +02:00
|
|
|
@code{LC_CTYPE}, @code{LC_MESSAGES}, @code{LC_MONETARY}, @code{LC_NUMERIC},
|
1997-08-20 05:53:21 +02:00
|
|
|
and @code{LC_TIME} to select the locale which is to be used. This way
|
|
|
|
the user can influence lots of functions. As we mentioned above the
|
|
|
|
@code{gettext} functions also take advantage of this.
|
|
|
|
|
|
|
|
To understand how this happens it is necessary to take a look at the
|
|
|
|
various components of the filename which gets computed to locate a
|
|
|
|
message catalog. It is composed as follows:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
@var{dir_name}/@var{locale}/LC_@var{category}/@var{domain_name}.mo
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
The default value for @var{dir_name} is system specific. It is computed
|
|
|
|
from the value given as the prefix while configuring the C library.
|
|
|
|
This value normally is @file{/usr} or @file{/}. For the former the
|
|
|
|
complete @var{dir_name} is:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
/usr/share/locale
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
We can use @file{/usr/share} since the @file{.mo} files containing the
|
2000-03-10 09:41:39 +01:00
|
|
|
message catalogs are system independent, so all systems can use the same
|
1997-08-20 05:53:21 +02:00
|
|
|
files. If the program executed the @code{bindtextdomain} function for
|
2000-03-10 09:41:39 +01:00
|
|
|
the message domain that is currently handled, the @code{dir_name}
|
|
|
|
component is exactly the value which was given to the function as
|
|
|
|
the second parameter. I.e., @code{bindtextdomain} allows overwriting
|
1997-10-15 07:34:02 +02:00
|
|
|
the only system dependent and fixed value to make it possible to
|
2000-03-10 09:41:39 +01:00
|
|
|
address files anywhere in the filesystem.
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
The @var{category} is the name of the locale category which was selected
|
|
|
|
in the program code. For @code{gettext} and @code{dgettext} this is
|
|
|
|
always @code{LC_MESSAGES}, for @code{dcgettext} this is selected by the
|
|
|
|
value of the third parameter. As said above it should be avoided to
|
|
|
|
ever use a category other than @code{LC_MESSAGES}.
|
|
|
|
|
|
|
|
The @var{locale} component is computed based on the category used. Just
|
|
|
|
like for the @code{setlocale} function here comes the user selection
|
|
|
|
into the play. Some environment variables are examined in a fixed order
|
|
|
|
and the first environment variable set determines the return value of
|
|
|
|
the lookup process. In detail, for the category @code{LC_xxx} the
|
|
|
|
following variables in this order are examined:
|
|
|
|
|
|
|
|
@table @code
|
|
|
|
@item LANGUAGE
|
|
|
|
@item LC_ALL
|
|
|
|
@item LC_xxx
|
|
|
|
@item LANG
|
|
|
|
@end table
|
|
|
|
|
|
|
|
This looks very familiar. With the exception of the @code{LANGUAGE}
|
|
|
|
environment variable this is exactly the lookup order the
|
|
|
|
@code{setlocale} function uses. But why introducing the @code{LANGUAGE}
|
|
|
|
variable?
|
|
|
|
|
|
|
|
The reason is that the syntax of the values these variables can have is
|
|
|
|
different to what is expected by the @code{setlocale} function. If we
|
|
|
|
would set @code{LC_ALL} to a value following the extended syntax that
|
|
|
|
would mean the @code{setlocale} function will never be able to use the
|
|
|
|
value of this variable as well. An additional variable removes this
|
|
|
|
problem plus we can select the language independently of the locale
|
|
|
|
setting which sometimes is useful.
|
|
|
|
|
|
|
|
While for the @code{LC_xxx} variables the value should consist of
|
|
|
|
exactly one specification of a locale the @code{LANGUAGE} variable's
|
|
|
|
value can consist of a colon separated list of locale names. The
|
|
|
|
attentive reader will realize that this is the way we manage to
|
|
|
|
implement one of our additional demands above: we want to be able to
|
|
|
|
specify an ordered list of language.
|
|
|
|
|
|
|
|
Back to the constructed filename we have only one component missing.
|
|
|
|
The @var{domain_name} part is the name which was either registered using
|
|
|
|
the @code{textdomain} function or which was given to @code{dgettext} or
|
|
|
|
@code{dcgettext} as the first parameter. Now it becomes obvious that a
|
|
|
|
good choice for the domain name in the program code is a string which is
|
|
|
|
closely related to the program/package name. E.g., for the GNU C
|
|
|
|
Library the domain name is @code{libc}.
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
A limit piece of example code should show how the programmer is supposed
|
|
|
|
to work:
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
@{
|
2000-10-26 04:37:46 +02:00
|
|
|
setlocale (LC_ALL, "");
|
1997-08-20 05:53:21 +02:00
|
|
|
textdomain ("test-package");
|
|
|
|
bindtextdomain ("test-package", "/usr/local/share/locale");
|
2000-05-04 04:46:54 +02:00
|
|
|
puts (gettext ("Hello, world!"));
|
1997-08-20 05:53:21 +02:00
|
|
|
@}
|
|
|
|
@end smallexample
|
|
|
|
|
2000-10-26 04:37:46 +02:00
|
|
|
At the program start the default domain is @code{messages}, and the
|
|
|
|
default locale is "C". The @code{setlocale} call sets the locale
|
|
|
|
according to the user's environment variables; remember that correct
|
|
|
|
functioning of @code{gettext} relies on the correct setting of the
|
|
|
|
@code{LC_MESSAGES} locale (for looking up the message catalog) and
|
|
|
|
of the @code{LC_CTYPE} locale (for the character set conversion).
|
|
|
|
The @code{textdomain} call changes the default domain to
|
|
|
|
@code{test-package}. The @code{bindtextdomain} call specifies that
|
|
|
|
the message catalogs for the domain @code{test-package} can be found
|
|
|
|
below the directory @file{/usr/local/share/locale}.
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
If now the user set in her/his environment the variable @code{LANGUAGE}
|
|
|
|
to @code{de} the @code{gettext} function will try to use the
|
|
|
|
translations from the file
|
|
|
|
|
|
|
|
@smallexample
|
|
|
|
/usr/local/share/locale/de/LC_MESSAGES/test-package.mo
|
|
|
|
@end smallexample
|
|
|
|
|
|
|
|
From the above descriptions it should be clear which component of this
|
Update.
1997-08-24 12:24 Ulrich Drepper <drepper@cygnus.com>
* configure.in (INSTALL): Quote `$'.
* libc.map: Add __xpg_basename.
* csu/Makefile (initfini.s): Disable optimization.
* elf/dl-deps.c: Implement handling of DL_FILTER.
* elf/dl-load.c (_dl_init_paths): Add error check.
* intl/finddomain.c (_nl_find_domain): Correct comment.
* intl/localealias.c: Include <bits/libc-lock.h> not <libc-lock.h>.
* libio/stdio.h: Make {,v}snprintf available if __USE_BSD.
Change extern inline functions to work correctly in C++.
* locale/iso-4217.def: Update for more recent ISO 4217 version.
* locale/loadlocale.c (_nl_load_locale): Add cast.
* manual/message.texi: Finish gettext section.
* posix/getopt_init.c: Don't use relative #include path.
(__getopt_clean_environment): Change function to take pointer to
environment as argument. Optimize generation of test string a bit.
* sysdeps/unix/sysv/linux/init-first.c: Call __getopt_clean_environment
with additional argument.
* poisx/glob.c: Add prototype for next_brace_sub.
* sysdeps/generic/dl-sysdep.c: Recognize AT_BASE value on auxiliary
vector.
* sysdeps/i386/dl-machine.h (elf_machine_load_address): Rewrite
to not generate relocation entry. Suggested by Richard Henderson.
(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
(elf_machine_runtime_setup): Add .aligns.
* sysdeps/i386/fpu/fraiseexcpt.c: Add volatile to asms.
* sysdeps/i386/fpu/bits/mathinline.h: Partially undo change of
1997-08-14 03:14. gcc 2.7.2* is really broken in some aspects.
* sysdeps/standalone/i386/i386.h: Clean up asm statements a bit.
* sysdeps/standalone/i960/i960ca.h: Likewise.
1997-08-22 19:04 Richard Henderson <rth@cygnus.com>
* elf/rtld.c (_dl_start): Init _dl_rtld_map.l_opencount due to
undocumented test addition in _dl_map_object.
Support ET_EXEC versions of ld.so, for debugging at least:
* elf/dl-load.c (_dl_map_object): Add_name_to_object could get
called despite the DT_SONAME != NULL test, segfaulting. Simplify
the code here as well.
* elf/dl-lookup.c (do_lookup): Skip objects with no symtab.
(_dl_setup_hash): Likewise for hash tables.
* elf/dl-version.c (_dl_check_map_versions): Likewise for strtabs.
* elf/rtld.c (_dl_start): Likewise for rpath.
(_dl_rtld_libname2): New variable.
(dl_main): Use it to add an soname for ourselves when we don't have
one of our own. Base it on the target's .interp.
(dl_main): Again, skip printing of objects that don't have strtabs.
Sparc 32 merge:
* elf/dl-runtime.c (ELF_FIXUP_RETURN_VALUE): Provide default value.
(fixup): Simplify code. Use ELF_FIXUP_RETURN_VALUE.
(profile_fixup): Likewise, though this still needs fixing for
Sparc32 and PPC.
* sysdeps/powerpc/dl-machine.h: Transmute ELF_FIXUP_RETURNS_ADDRESS
to ELF_FIXUP_RETURN_VALUE.
* sysdeps/sparc/sparc32/dl-machine.h: Implement lazy relocation.
Fix up _dl_start_user to handle _dl_skip_args properly.
Use _dl_hwcap to determine if "flush" is available/needed.
* sysdeps/sparc/configure.in: Remove. It doesn't actually do
anything anymore, and what it did do is done somewhere else.
* sysdeps/sparc/configure: Likewise.
* sysdeps/sparc/fpu/bits/mathdef.h (FP_ILOGB0, FP_ILOGBNAN): New.
* sysdeps/sparc/fpu/fraiseexcpt.c: Rearrange for smaller code.
* sysdeps/sparc/sparc32/Makefile: Fix sparc->sparc/sparc32 bits
in divrem expansions.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (END, LOC): New
definitions for assembly syntax differences.
* sysdeps/sparc/sparc32/__longjmp.S: %g6,%g7 are reserved to the
"system". Use %g2,%g3 instead. Use new local label macro.
* sysdeps/sparc/sparc32/add_n.S: Use <sysdep.h> and ENTRY, END,
and LOC for proper assembly headers/footers.
* sysdeps/sparc/sparc32/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/alloca.S: Likewise.
* sysdeps/sparc/sparc32/dotmul.S: Likewise.
* sysdeps/sparc/sparc32/lshift.S: Likewise.
* sysdeps/sparc/sparc32/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/rshift.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/sub_n.S: Likewise.
* sysdeps/sparc/sparc32/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/umul.S: Likewise.
* sysdeps/sparc/sparc32/divrem.m4: Likewise.
* sysdeps/sparc/sparc32/rem.S: Regenerate.
* sysdeps/sparc/sparc32/sdiv.S: Regenerate.
* sysdeps/sparc/sparc32/udiv.S: Regenerate.
* sysdeps/sparc/sparc32/urem.S: Regenerate.
* sysdeps/sparc/sparc32/sparcv8/dotmul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/rem.S: New file.
* sysdeps/sparc/sparc32/sparcv8/sdiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/udiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/umul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/urem.S: New file.
* sysdeps/sparc/sparc32/bsd-_setjmp.S: Dike out.
* sysdeps/sparc/sparc32/bsd-setjmp.S: Likewise.
* sysdeps/sparc/sparc32/setjmp.S: Add _setjmp and setjmp entry points.
* sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S:
Clean up PIC code.
* sysdeps/sparc/sparc32/elf/start.S: New file, slightly modified
from the sparc64 version.
* sysdeps/sparc/sparc32/elf/start.c: Removed.
* sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Rewrite in
assembly based on the sparc64 version.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: Duh. Use proper syntax
for manipulating %fsr.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Make IEEE conformance
be the default.
* elf/elf.h (HWCAP_SPARC_*): New definitions.
* elf/rtld.c (_dl_hwcap): New variable.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Record AT_HWCAP.
* sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: New file.
Attempt to get hold of the page size based on what we might have
been told at startup time in _dl_pagesize. This will be obsolete
when I finish the kernel hooks for a proper sysconf(), stay tuned.
Sparc 64 merge:
* sysdeps/sparc/sparc64/dl-machine.h (ELF_FIXUP_RETURN_VALUE): New.
Figure out the right thing to return based on the .plt format.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Update comment.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__dev_t):
Should have been 64-bits wide.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: sll->sllx,
optimize for branch delay slot usage.
1997-08-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* csu/Makefile ($(objpfx)crt%.o): Fix a missing *.so -> *.os
change.
1997-08-20 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (identities): Change epsilon.
* sysdeps/i386/fpu/bits/mathinline.h: Correct arguments to fabs,
fabsf, fabsl, __fabsl.
* sysdeps/libm-i387/e_remainderl.S: Pop extra value from FPU stack.
* sysdeps/libm-ieee754/s_csinhl.c: Include <fenv.h>.
1997-08-24 12:55:18 +02:00
|
|
|
filename is determined by which source.
|
|
|
|
|
|
|
|
In the above example we assumed that the @code{LANGUAGE} environment
|
|
|
|
variable to @code{de}. This might be an appropriate selection but what
|
|
|
|
happens if the user wants to use @code{LC_ALL} because of the wider
|
|
|
|
usability and here the required value is @code{de_DE.ISO-8859-1}? We
|
|
|
|
already mentioned above that a situation like this is not infrequent.
|
|
|
|
E.g., a person might prefer reading a dialect and if this is not
|
|
|
|
available fall back on the standard language.
|
|
|
|
|
|
|
|
The @code{gettext} functions know about situations like this and can
|
|
|
|
handle them gracefully. The functions recognize the format of the value
|
|
|
|
of the environment variable. It can split the value is different pieces
|
|
|
|
and by leaving out the only or the other part it can construct new
|
|
|
|
values. This happens of course in a predictable way. To understand
|
|
|
|
this one must know the format of the environment variable value. There
|
2002-07-24 13:18:48 +02:00
|
|
|
is one more or less standardized form, originally from the X/Open
|
|
|
|
specification:
|
Update.
1997-08-24 12:24 Ulrich Drepper <drepper@cygnus.com>
* configure.in (INSTALL): Quote `$'.
* libc.map: Add __xpg_basename.
* csu/Makefile (initfini.s): Disable optimization.
* elf/dl-deps.c: Implement handling of DL_FILTER.
* elf/dl-load.c (_dl_init_paths): Add error check.
* intl/finddomain.c (_nl_find_domain): Correct comment.
* intl/localealias.c: Include <bits/libc-lock.h> not <libc-lock.h>.
* libio/stdio.h: Make {,v}snprintf available if __USE_BSD.
Change extern inline functions to work correctly in C++.
* locale/iso-4217.def: Update for more recent ISO 4217 version.
* locale/loadlocale.c (_nl_load_locale): Add cast.
* manual/message.texi: Finish gettext section.
* posix/getopt_init.c: Don't use relative #include path.
(__getopt_clean_environment): Change function to take pointer to
environment as argument. Optimize generation of test string a bit.
* sysdeps/unix/sysv/linux/init-first.c: Call __getopt_clean_environment
with additional argument.
* poisx/glob.c: Add prototype for next_brace_sub.
* sysdeps/generic/dl-sysdep.c: Recognize AT_BASE value on auxiliary
vector.
* sysdeps/i386/dl-machine.h (elf_machine_load_address): Rewrite
to not generate relocation entry. Suggested by Richard Henderson.
(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
(elf_machine_runtime_setup): Add .aligns.
* sysdeps/i386/fpu/fraiseexcpt.c: Add volatile to asms.
* sysdeps/i386/fpu/bits/mathinline.h: Partially undo change of
1997-08-14 03:14. gcc 2.7.2* is really broken in some aspects.
* sysdeps/standalone/i386/i386.h: Clean up asm statements a bit.
* sysdeps/standalone/i960/i960ca.h: Likewise.
1997-08-22 19:04 Richard Henderson <rth@cygnus.com>
* elf/rtld.c (_dl_start): Init _dl_rtld_map.l_opencount due to
undocumented test addition in _dl_map_object.
Support ET_EXEC versions of ld.so, for debugging at least:
* elf/dl-load.c (_dl_map_object): Add_name_to_object could get
called despite the DT_SONAME != NULL test, segfaulting. Simplify
the code here as well.
* elf/dl-lookup.c (do_lookup): Skip objects with no symtab.
(_dl_setup_hash): Likewise for hash tables.
* elf/dl-version.c (_dl_check_map_versions): Likewise for strtabs.
* elf/rtld.c (_dl_start): Likewise for rpath.
(_dl_rtld_libname2): New variable.
(dl_main): Use it to add an soname for ourselves when we don't have
one of our own. Base it on the target's .interp.
(dl_main): Again, skip printing of objects that don't have strtabs.
Sparc 32 merge:
* elf/dl-runtime.c (ELF_FIXUP_RETURN_VALUE): Provide default value.
(fixup): Simplify code. Use ELF_FIXUP_RETURN_VALUE.
(profile_fixup): Likewise, though this still needs fixing for
Sparc32 and PPC.
* sysdeps/powerpc/dl-machine.h: Transmute ELF_FIXUP_RETURNS_ADDRESS
to ELF_FIXUP_RETURN_VALUE.
* sysdeps/sparc/sparc32/dl-machine.h: Implement lazy relocation.
Fix up _dl_start_user to handle _dl_skip_args properly.
Use _dl_hwcap to determine if "flush" is available/needed.
* sysdeps/sparc/configure.in: Remove. It doesn't actually do
anything anymore, and what it did do is done somewhere else.
* sysdeps/sparc/configure: Likewise.
* sysdeps/sparc/fpu/bits/mathdef.h (FP_ILOGB0, FP_ILOGBNAN): New.
* sysdeps/sparc/fpu/fraiseexcpt.c: Rearrange for smaller code.
* sysdeps/sparc/sparc32/Makefile: Fix sparc->sparc/sparc32 bits
in divrem expansions.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (END, LOC): New
definitions for assembly syntax differences.
* sysdeps/sparc/sparc32/__longjmp.S: %g6,%g7 are reserved to the
"system". Use %g2,%g3 instead. Use new local label macro.
* sysdeps/sparc/sparc32/add_n.S: Use <sysdep.h> and ENTRY, END,
and LOC for proper assembly headers/footers.
* sysdeps/sparc/sparc32/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/alloca.S: Likewise.
* sysdeps/sparc/sparc32/dotmul.S: Likewise.
* sysdeps/sparc/sparc32/lshift.S: Likewise.
* sysdeps/sparc/sparc32/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/rshift.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/sub_n.S: Likewise.
* sysdeps/sparc/sparc32/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/umul.S: Likewise.
* sysdeps/sparc/sparc32/divrem.m4: Likewise.
* sysdeps/sparc/sparc32/rem.S: Regenerate.
* sysdeps/sparc/sparc32/sdiv.S: Regenerate.
* sysdeps/sparc/sparc32/udiv.S: Regenerate.
* sysdeps/sparc/sparc32/urem.S: Regenerate.
* sysdeps/sparc/sparc32/sparcv8/dotmul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/rem.S: New file.
* sysdeps/sparc/sparc32/sparcv8/sdiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/udiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/umul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/urem.S: New file.
* sysdeps/sparc/sparc32/bsd-_setjmp.S: Dike out.
* sysdeps/sparc/sparc32/bsd-setjmp.S: Likewise.
* sysdeps/sparc/sparc32/setjmp.S: Add _setjmp and setjmp entry points.
* sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S:
Clean up PIC code.
* sysdeps/sparc/sparc32/elf/start.S: New file, slightly modified
from the sparc64 version.
* sysdeps/sparc/sparc32/elf/start.c: Removed.
* sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Rewrite in
assembly based on the sparc64 version.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: Duh. Use proper syntax
for manipulating %fsr.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Make IEEE conformance
be the default.
* elf/elf.h (HWCAP_SPARC_*): New definitions.
* elf/rtld.c (_dl_hwcap): New variable.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Record AT_HWCAP.
* sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: New file.
Attempt to get hold of the page size based on what we might have
been told at startup time in _dl_pagesize. This will be obsolete
when I finish the kernel hooks for a proper sysconf(), stay tuned.
Sparc 64 merge:
* sysdeps/sparc/sparc64/dl-machine.h (ELF_FIXUP_RETURN_VALUE): New.
Figure out the right thing to return based on the .plt format.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Update comment.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__dev_t):
Should have been 64-bits wide.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: sll->sllx,
optimize for branch delay slot usage.
1997-08-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* csu/Makefile ($(objpfx)crt%.o): Fix a missing *.so -> *.os
change.
1997-08-20 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (identities): Change epsilon.
* sysdeps/i386/fpu/bits/mathinline.h: Correct arguments to fabs,
fabsf, fabsl, __fabsl.
* sysdeps/libm-i387/e_remainderl.S: Pop extra value from FPU stack.
* sysdeps/libm-ieee754/s_csinhl.c: Include <fenv.h>.
1997-08-24 12:55:18 +02:00
|
|
|
|
|
|
|
@code{language[_territory[.codeset]][@@modifier]}
|
|
|
|
|
2002-07-24 13:18:48 +02:00
|
|
|
Less specific locale names will be stripped of in the order of the
|
|
|
|
following list:
|
1997-08-20 05:53:21 +02:00
|
|
|
|
Update.
1997-08-24 12:24 Ulrich Drepper <drepper@cygnus.com>
* configure.in (INSTALL): Quote `$'.
* libc.map: Add __xpg_basename.
* csu/Makefile (initfini.s): Disable optimization.
* elf/dl-deps.c: Implement handling of DL_FILTER.
* elf/dl-load.c (_dl_init_paths): Add error check.
* intl/finddomain.c (_nl_find_domain): Correct comment.
* intl/localealias.c: Include <bits/libc-lock.h> not <libc-lock.h>.
* libio/stdio.h: Make {,v}snprintf available if __USE_BSD.
Change extern inline functions to work correctly in C++.
* locale/iso-4217.def: Update for more recent ISO 4217 version.
* locale/loadlocale.c (_nl_load_locale): Add cast.
* manual/message.texi: Finish gettext section.
* posix/getopt_init.c: Don't use relative #include path.
(__getopt_clean_environment): Change function to take pointer to
environment as argument. Optimize generation of test string a bit.
* sysdeps/unix/sysv/linux/init-first.c: Call __getopt_clean_environment
with additional argument.
* poisx/glob.c: Add prototype for next_brace_sub.
* sysdeps/generic/dl-sysdep.c: Recognize AT_BASE value on auxiliary
vector.
* sysdeps/i386/dl-machine.h (elf_machine_load_address): Rewrite
to not generate relocation entry. Suggested by Richard Henderson.
(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
(elf_machine_runtime_setup): Add .aligns.
* sysdeps/i386/fpu/fraiseexcpt.c: Add volatile to asms.
* sysdeps/i386/fpu/bits/mathinline.h: Partially undo change of
1997-08-14 03:14. gcc 2.7.2* is really broken in some aspects.
* sysdeps/standalone/i386/i386.h: Clean up asm statements a bit.
* sysdeps/standalone/i960/i960ca.h: Likewise.
1997-08-22 19:04 Richard Henderson <rth@cygnus.com>
* elf/rtld.c (_dl_start): Init _dl_rtld_map.l_opencount due to
undocumented test addition in _dl_map_object.
Support ET_EXEC versions of ld.so, for debugging at least:
* elf/dl-load.c (_dl_map_object): Add_name_to_object could get
called despite the DT_SONAME != NULL test, segfaulting. Simplify
the code here as well.
* elf/dl-lookup.c (do_lookup): Skip objects with no symtab.
(_dl_setup_hash): Likewise for hash tables.
* elf/dl-version.c (_dl_check_map_versions): Likewise for strtabs.
* elf/rtld.c (_dl_start): Likewise for rpath.
(_dl_rtld_libname2): New variable.
(dl_main): Use it to add an soname for ourselves when we don't have
one of our own. Base it on the target's .interp.
(dl_main): Again, skip printing of objects that don't have strtabs.
Sparc 32 merge:
* elf/dl-runtime.c (ELF_FIXUP_RETURN_VALUE): Provide default value.
(fixup): Simplify code. Use ELF_FIXUP_RETURN_VALUE.
(profile_fixup): Likewise, though this still needs fixing for
Sparc32 and PPC.
* sysdeps/powerpc/dl-machine.h: Transmute ELF_FIXUP_RETURNS_ADDRESS
to ELF_FIXUP_RETURN_VALUE.
* sysdeps/sparc/sparc32/dl-machine.h: Implement lazy relocation.
Fix up _dl_start_user to handle _dl_skip_args properly.
Use _dl_hwcap to determine if "flush" is available/needed.
* sysdeps/sparc/configure.in: Remove. It doesn't actually do
anything anymore, and what it did do is done somewhere else.
* sysdeps/sparc/configure: Likewise.
* sysdeps/sparc/fpu/bits/mathdef.h (FP_ILOGB0, FP_ILOGBNAN): New.
* sysdeps/sparc/fpu/fraiseexcpt.c: Rearrange for smaller code.
* sysdeps/sparc/sparc32/Makefile: Fix sparc->sparc/sparc32 bits
in divrem expansions.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (END, LOC): New
definitions for assembly syntax differences.
* sysdeps/sparc/sparc32/__longjmp.S: %g6,%g7 are reserved to the
"system". Use %g2,%g3 instead. Use new local label macro.
* sysdeps/sparc/sparc32/add_n.S: Use <sysdep.h> and ENTRY, END,
and LOC for proper assembly headers/footers.
* sysdeps/sparc/sparc32/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/alloca.S: Likewise.
* sysdeps/sparc/sparc32/dotmul.S: Likewise.
* sysdeps/sparc/sparc32/lshift.S: Likewise.
* sysdeps/sparc/sparc32/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/rshift.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/sub_n.S: Likewise.
* sysdeps/sparc/sparc32/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/umul.S: Likewise.
* sysdeps/sparc/sparc32/divrem.m4: Likewise.
* sysdeps/sparc/sparc32/rem.S: Regenerate.
* sysdeps/sparc/sparc32/sdiv.S: Regenerate.
* sysdeps/sparc/sparc32/udiv.S: Regenerate.
* sysdeps/sparc/sparc32/urem.S: Regenerate.
* sysdeps/sparc/sparc32/sparcv8/dotmul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/rem.S: New file.
* sysdeps/sparc/sparc32/sparcv8/sdiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/udiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/umul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/urem.S: New file.
* sysdeps/sparc/sparc32/bsd-_setjmp.S: Dike out.
* sysdeps/sparc/sparc32/bsd-setjmp.S: Likewise.
* sysdeps/sparc/sparc32/setjmp.S: Add _setjmp and setjmp entry points.
* sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S:
Clean up PIC code.
* sysdeps/sparc/sparc32/elf/start.S: New file, slightly modified
from the sparc64 version.
* sysdeps/sparc/sparc32/elf/start.c: Removed.
* sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Rewrite in
assembly based on the sparc64 version.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: Duh. Use proper syntax
for manipulating %fsr.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Make IEEE conformance
be the default.
* elf/elf.h (HWCAP_SPARC_*): New definitions.
* elf/rtld.c (_dl_hwcap): New variable.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Record AT_HWCAP.
* sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: New file.
Attempt to get hold of the page size based on what we might have
been told at startup time in _dl_pagesize. This will be obsolete
when I finish the kernel hooks for a proper sysconf(), stay tuned.
Sparc 64 merge:
* sysdeps/sparc/sparc64/dl-machine.h (ELF_FIXUP_RETURN_VALUE): New.
Figure out the right thing to return based on the .plt format.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Update comment.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__dev_t):
Should have been 64-bits wide.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: sll->sllx,
optimize for branch delay slot usage.
1997-08-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* csu/Makefile ($(objpfx)crt%.o): Fix a missing *.so -> *.os
change.
1997-08-20 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (identities): Change epsilon.
* sysdeps/i386/fpu/bits/mathinline.h: Correct arguments to fabs,
fabsf, fabsl, __fabsl.
* sysdeps/libm-i387/e_remainderl.S: Pop extra value from FPU stack.
* sysdeps/libm-ieee754/s_csinhl.c: Include <fenv.h>.
1997-08-24 12:55:18 +02:00
|
|
|
@enumerate
|
|
|
|
@item
|
|
|
|
@code{codeset}
|
|
|
|
@item
|
|
|
|
@code{normalized codeset}
|
|
|
|
@item
|
|
|
|
@code{territory}
|
|
|
|
@item
|
2002-07-24 13:18:48 +02:00
|
|
|
@code{modifier}
|
Update.
1997-08-24 12:24 Ulrich Drepper <drepper@cygnus.com>
* configure.in (INSTALL): Quote `$'.
* libc.map: Add __xpg_basename.
* csu/Makefile (initfini.s): Disable optimization.
* elf/dl-deps.c: Implement handling of DL_FILTER.
* elf/dl-load.c (_dl_init_paths): Add error check.
* intl/finddomain.c (_nl_find_domain): Correct comment.
* intl/localealias.c: Include <bits/libc-lock.h> not <libc-lock.h>.
* libio/stdio.h: Make {,v}snprintf available if __USE_BSD.
Change extern inline functions to work correctly in C++.
* locale/iso-4217.def: Update for more recent ISO 4217 version.
* locale/loadlocale.c (_nl_load_locale): Add cast.
* manual/message.texi: Finish gettext section.
* posix/getopt_init.c: Don't use relative #include path.
(__getopt_clean_environment): Change function to take pointer to
environment as argument. Optimize generation of test string a bit.
* sysdeps/unix/sysv/linux/init-first.c: Call __getopt_clean_environment
with additional argument.
* poisx/glob.c: Add prototype for next_brace_sub.
* sysdeps/generic/dl-sysdep.c: Recognize AT_BASE value on auxiliary
vector.
* sysdeps/i386/dl-machine.h (elf_machine_load_address): Rewrite
to not generate relocation entry. Suggested by Richard Henderson.
(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
(elf_machine_runtime_setup): Add .aligns.
* sysdeps/i386/fpu/fraiseexcpt.c: Add volatile to asms.
* sysdeps/i386/fpu/bits/mathinline.h: Partially undo change of
1997-08-14 03:14. gcc 2.7.2* is really broken in some aspects.
* sysdeps/standalone/i386/i386.h: Clean up asm statements a bit.
* sysdeps/standalone/i960/i960ca.h: Likewise.
1997-08-22 19:04 Richard Henderson <rth@cygnus.com>
* elf/rtld.c (_dl_start): Init _dl_rtld_map.l_opencount due to
undocumented test addition in _dl_map_object.
Support ET_EXEC versions of ld.so, for debugging at least:
* elf/dl-load.c (_dl_map_object): Add_name_to_object could get
called despite the DT_SONAME != NULL test, segfaulting. Simplify
the code here as well.
* elf/dl-lookup.c (do_lookup): Skip objects with no symtab.
(_dl_setup_hash): Likewise for hash tables.
* elf/dl-version.c (_dl_check_map_versions): Likewise for strtabs.
* elf/rtld.c (_dl_start): Likewise for rpath.
(_dl_rtld_libname2): New variable.
(dl_main): Use it to add an soname for ourselves when we don't have
one of our own. Base it on the target's .interp.
(dl_main): Again, skip printing of objects that don't have strtabs.
Sparc 32 merge:
* elf/dl-runtime.c (ELF_FIXUP_RETURN_VALUE): Provide default value.
(fixup): Simplify code. Use ELF_FIXUP_RETURN_VALUE.
(profile_fixup): Likewise, though this still needs fixing for
Sparc32 and PPC.
* sysdeps/powerpc/dl-machine.h: Transmute ELF_FIXUP_RETURNS_ADDRESS
to ELF_FIXUP_RETURN_VALUE.
* sysdeps/sparc/sparc32/dl-machine.h: Implement lazy relocation.
Fix up _dl_start_user to handle _dl_skip_args properly.
Use _dl_hwcap to determine if "flush" is available/needed.
* sysdeps/sparc/configure.in: Remove. It doesn't actually do
anything anymore, and what it did do is done somewhere else.
* sysdeps/sparc/configure: Likewise.
* sysdeps/sparc/fpu/bits/mathdef.h (FP_ILOGB0, FP_ILOGBNAN): New.
* sysdeps/sparc/fpu/fraiseexcpt.c: Rearrange for smaller code.
* sysdeps/sparc/sparc32/Makefile: Fix sparc->sparc/sparc32 bits
in divrem expansions.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (END, LOC): New
definitions for assembly syntax differences.
* sysdeps/sparc/sparc32/__longjmp.S: %g6,%g7 are reserved to the
"system". Use %g2,%g3 instead. Use new local label macro.
* sysdeps/sparc/sparc32/add_n.S: Use <sysdep.h> and ENTRY, END,
and LOC for proper assembly headers/footers.
* sysdeps/sparc/sparc32/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/alloca.S: Likewise.
* sysdeps/sparc/sparc32/dotmul.S: Likewise.
* sysdeps/sparc/sparc32/lshift.S: Likewise.
* sysdeps/sparc/sparc32/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/rshift.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/sub_n.S: Likewise.
* sysdeps/sparc/sparc32/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/umul.S: Likewise.
* sysdeps/sparc/sparc32/divrem.m4: Likewise.
* sysdeps/sparc/sparc32/rem.S: Regenerate.
* sysdeps/sparc/sparc32/sdiv.S: Regenerate.
* sysdeps/sparc/sparc32/udiv.S: Regenerate.
* sysdeps/sparc/sparc32/urem.S: Regenerate.
* sysdeps/sparc/sparc32/sparcv8/dotmul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/rem.S: New file.
* sysdeps/sparc/sparc32/sparcv8/sdiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/udiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/umul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/urem.S: New file.
* sysdeps/sparc/sparc32/bsd-_setjmp.S: Dike out.
* sysdeps/sparc/sparc32/bsd-setjmp.S: Likewise.
* sysdeps/sparc/sparc32/setjmp.S: Add _setjmp and setjmp entry points.
* sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S:
Clean up PIC code.
* sysdeps/sparc/sparc32/elf/start.S: New file, slightly modified
from the sparc64 version.
* sysdeps/sparc/sparc32/elf/start.c: Removed.
* sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Rewrite in
assembly based on the sparc64 version.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: Duh. Use proper syntax
for manipulating %fsr.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Make IEEE conformance
be the default.
* elf/elf.h (HWCAP_SPARC_*): New definitions.
* elf/rtld.c (_dl_hwcap): New variable.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Record AT_HWCAP.
* sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: New file.
Attempt to get hold of the page size based on what we might have
been told at startup time in _dl_pagesize. This will be obsolete
when I finish the kernel hooks for a proper sysconf(), stay tuned.
Sparc 64 merge:
* sysdeps/sparc/sparc64/dl-machine.h (ELF_FIXUP_RETURN_VALUE): New.
Figure out the right thing to return based on the .plt format.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Update comment.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__dev_t):
Should have been 64-bits wide.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: sll->sllx,
optimize for branch delay slot usage.
1997-08-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* csu/Makefile ($(objpfx)crt%.o): Fix a missing *.so -> *.os
change.
1997-08-20 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (identities): Change epsilon.
* sysdeps/i386/fpu/bits/mathinline.h: Correct arguments to fabs,
fabsf, fabsl, __fabsl.
* sysdeps/libm-i387/e_remainderl.S: Pop extra value from FPU stack.
* sysdeps/libm-ieee754/s_csinhl.c: Include <fenv.h>.
1997-08-24 12:55:18 +02:00
|
|
|
@end enumerate
|
|
|
|
|
2002-07-24 13:18:48 +02:00
|
|
|
The @code{language} field will never be dropped for obvious reasons.
|
Update.
1997-08-24 12:24 Ulrich Drepper <drepper@cygnus.com>
* configure.in (INSTALL): Quote `$'.
* libc.map: Add __xpg_basename.
* csu/Makefile (initfini.s): Disable optimization.
* elf/dl-deps.c: Implement handling of DL_FILTER.
* elf/dl-load.c (_dl_init_paths): Add error check.
* intl/finddomain.c (_nl_find_domain): Correct comment.
* intl/localealias.c: Include <bits/libc-lock.h> not <libc-lock.h>.
* libio/stdio.h: Make {,v}snprintf available if __USE_BSD.
Change extern inline functions to work correctly in C++.
* locale/iso-4217.def: Update for more recent ISO 4217 version.
* locale/loadlocale.c (_nl_load_locale): Add cast.
* manual/message.texi: Finish gettext section.
* posix/getopt_init.c: Don't use relative #include path.
(__getopt_clean_environment): Change function to take pointer to
environment as argument. Optimize generation of test string a bit.
* sysdeps/unix/sysv/linux/init-first.c: Call __getopt_clean_environment
with additional argument.
* poisx/glob.c: Add prototype for next_brace_sub.
* sysdeps/generic/dl-sysdep.c: Recognize AT_BASE value on auxiliary
vector.
* sysdeps/i386/dl-machine.h (elf_machine_load_address): Rewrite
to not generate relocation entry. Suggested by Richard Henderson.
(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
(elf_machine_runtime_setup): Add .aligns.
* sysdeps/i386/fpu/fraiseexcpt.c: Add volatile to asms.
* sysdeps/i386/fpu/bits/mathinline.h: Partially undo change of
1997-08-14 03:14. gcc 2.7.2* is really broken in some aspects.
* sysdeps/standalone/i386/i386.h: Clean up asm statements a bit.
* sysdeps/standalone/i960/i960ca.h: Likewise.
1997-08-22 19:04 Richard Henderson <rth@cygnus.com>
* elf/rtld.c (_dl_start): Init _dl_rtld_map.l_opencount due to
undocumented test addition in _dl_map_object.
Support ET_EXEC versions of ld.so, for debugging at least:
* elf/dl-load.c (_dl_map_object): Add_name_to_object could get
called despite the DT_SONAME != NULL test, segfaulting. Simplify
the code here as well.
* elf/dl-lookup.c (do_lookup): Skip objects with no symtab.
(_dl_setup_hash): Likewise for hash tables.
* elf/dl-version.c (_dl_check_map_versions): Likewise for strtabs.
* elf/rtld.c (_dl_start): Likewise for rpath.
(_dl_rtld_libname2): New variable.
(dl_main): Use it to add an soname for ourselves when we don't have
one of our own. Base it on the target's .interp.
(dl_main): Again, skip printing of objects that don't have strtabs.
Sparc 32 merge:
* elf/dl-runtime.c (ELF_FIXUP_RETURN_VALUE): Provide default value.
(fixup): Simplify code. Use ELF_FIXUP_RETURN_VALUE.
(profile_fixup): Likewise, though this still needs fixing for
Sparc32 and PPC.
* sysdeps/powerpc/dl-machine.h: Transmute ELF_FIXUP_RETURNS_ADDRESS
to ELF_FIXUP_RETURN_VALUE.
* sysdeps/sparc/sparc32/dl-machine.h: Implement lazy relocation.
Fix up _dl_start_user to handle _dl_skip_args properly.
Use _dl_hwcap to determine if "flush" is available/needed.
* sysdeps/sparc/configure.in: Remove. It doesn't actually do
anything anymore, and what it did do is done somewhere else.
* sysdeps/sparc/configure: Likewise.
* sysdeps/sparc/fpu/bits/mathdef.h (FP_ILOGB0, FP_ILOGBNAN): New.
* sysdeps/sparc/fpu/fraiseexcpt.c: Rearrange for smaller code.
* sysdeps/sparc/sparc32/Makefile: Fix sparc->sparc/sparc32 bits
in divrem expansions.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (END, LOC): New
definitions for assembly syntax differences.
* sysdeps/sparc/sparc32/__longjmp.S: %g6,%g7 are reserved to the
"system". Use %g2,%g3 instead. Use new local label macro.
* sysdeps/sparc/sparc32/add_n.S: Use <sysdep.h> and ENTRY, END,
and LOC for proper assembly headers/footers.
* sysdeps/sparc/sparc32/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/alloca.S: Likewise.
* sysdeps/sparc/sparc32/dotmul.S: Likewise.
* sysdeps/sparc/sparc32/lshift.S: Likewise.
* sysdeps/sparc/sparc32/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/rshift.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/sub_n.S: Likewise.
* sysdeps/sparc/sparc32/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/umul.S: Likewise.
* sysdeps/sparc/sparc32/divrem.m4: Likewise.
* sysdeps/sparc/sparc32/rem.S: Regenerate.
* sysdeps/sparc/sparc32/sdiv.S: Regenerate.
* sysdeps/sparc/sparc32/udiv.S: Regenerate.
* sysdeps/sparc/sparc32/urem.S: Regenerate.
* sysdeps/sparc/sparc32/sparcv8/dotmul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/rem.S: New file.
* sysdeps/sparc/sparc32/sparcv8/sdiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/udiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/umul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/urem.S: New file.
* sysdeps/sparc/sparc32/bsd-_setjmp.S: Dike out.
* sysdeps/sparc/sparc32/bsd-setjmp.S: Likewise.
* sysdeps/sparc/sparc32/setjmp.S: Add _setjmp and setjmp entry points.
* sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S:
Clean up PIC code.
* sysdeps/sparc/sparc32/elf/start.S: New file, slightly modified
from the sparc64 version.
* sysdeps/sparc/sparc32/elf/start.c: Removed.
* sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Rewrite in
assembly based on the sparc64 version.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: Duh. Use proper syntax
for manipulating %fsr.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Make IEEE conformance
be the default.
* elf/elf.h (HWCAP_SPARC_*): New definitions.
* elf/rtld.c (_dl_hwcap): New variable.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Record AT_HWCAP.
* sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: New file.
Attempt to get hold of the page size based on what we might have
been told at startup time in _dl_pagesize. This will be obsolete
when I finish the kernel hooks for a proper sysconf(), stay tuned.
Sparc 64 merge:
* sysdeps/sparc/sparc64/dl-machine.h (ELF_FIXUP_RETURN_VALUE): New.
Figure out the right thing to return based on the .plt format.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Update comment.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__dev_t):
Should have been 64-bits wide.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: sll->sllx,
optimize for branch delay slot usage.
1997-08-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* csu/Makefile ($(objpfx)crt%.o): Fix a missing *.so -> *.os
change.
1997-08-20 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (identities): Change epsilon.
* sysdeps/i386/fpu/bits/mathinline.h: Correct arguments to fabs,
fabsf, fabsl, __fabsl.
* sysdeps/libm-i387/e_remainderl.S: Pop extra value from FPU stack.
* sysdeps/libm-ieee754/s_csinhl.c: Include <fenv.h>.
1997-08-24 12:55:18 +02:00
|
|
|
|
|
|
|
The only new thing is the @code{normalized codeset} entry. This is
|
|
|
|
another goodie which is introduced to help reducing the chaos which
|
|
|
|
derives from the inability of the people to standardize the names of
|
|
|
|
character sets. Instead of @w{ISO-8859-1} one can often see @w{8859-1},
|
|
|
|
@w{88591}, @w{iso8859-1}, or @w{iso_8859-1}. The @code{normalized
|
|
|
|
codeset} value is generated from the user-provided character set name by
|
|
|
|
applying the following rules:
|
|
|
|
|
|
|
|
@enumerate
|
|
|
|
@item
|
|
|
|
Remove all characters beside numbers and letters.
|
|
|
|
@item
|
|
|
|
Fold letters to lowercase.
|
|
|
|
@item
|
|
|
|
If the same only contains digits prepend the string @code{"iso"}.
|
|
|
|
@end enumerate
|
|
|
|
|
|
|
|
@noindent
|
|
|
|
So all of the above name will be normalized to @code{iso88591}. This
|
|
|
|
allows the program user much more freely choosing the locale name.
|
|
|
|
|
|
|
|
Even this extended functionality still does not help to solve the
|
|
|
|
problem that completely different names can be used to denote the same
|
|
|
|
locale (e.g., @code{de} and @code{german}). To be of help in this
|
|
|
|
situation the locale implementation and also the @code{gettext}
|
|
|
|
functions know about aliases.
|
|
|
|
|
|
|
|
The file @file{/usr/share/locale/locale.alias} (replace @file{/usr} with
|
|
|
|
whatever prefix you used for configuring the C library) contains a
|
|
|
|
mapping of alternative names to more regular names. The system manager
|
|
|
|
is free to add new entries to fill her/his own needs. The selected
|
|
|
|
locale from the environment is compared with the entries in the first
|
|
|
|
column of this file ignoring the case. If they match the value of the
|
|
|
|
second column is used instead for the further handling.
|
|
|
|
|
|
|
|
In the description of the format of the environment variables we already
|
|
|
|
mentioned the character set as a factor in the selection of the message
|
|
|
|
catalog. In fact, only catalogs which contain text written using the
|
|
|
|
character set of the system/program can be used (directly; there will
|
|
|
|
come a solution for this some day). This means for the user that s/he
|
|
|
|
will always have to take care for this. If in the collection of the
|
|
|
|
message catalogs there are files for the same language but coded using
|
|
|
|
different character sets the user has to be careful.
|
1997-08-20 05:53:21 +02:00
|
|
|
|
|
|
|
|
|
|
|
@node Helper programs for gettext
|
|
|
|
@subsection Programs to handle message catalogs for @code{gettext}
|
|
|
|
|
Update.
1997-08-24 12:24 Ulrich Drepper <drepper@cygnus.com>
* configure.in (INSTALL): Quote `$'.
* libc.map: Add __xpg_basename.
* csu/Makefile (initfini.s): Disable optimization.
* elf/dl-deps.c: Implement handling of DL_FILTER.
* elf/dl-load.c (_dl_init_paths): Add error check.
* intl/finddomain.c (_nl_find_domain): Correct comment.
* intl/localealias.c: Include <bits/libc-lock.h> not <libc-lock.h>.
* libio/stdio.h: Make {,v}snprintf available if __USE_BSD.
Change extern inline functions to work correctly in C++.
* locale/iso-4217.def: Update for more recent ISO 4217 version.
* locale/loadlocale.c (_nl_load_locale): Add cast.
* manual/message.texi: Finish gettext section.
* posix/getopt_init.c: Don't use relative #include path.
(__getopt_clean_environment): Change function to take pointer to
environment as argument. Optimize generation of test string a bit.
* sysdeps/unix/sysv/linux/init-first.c: Call __getopt_clean_environment
with additional argument.
* poisx/glob.c: Add prototype for next_brace_sub.
* sysdeps/generic/dl-sysdep.c: Recognize AT_BASE value on auxiliary
vector.
* sysdeps/i386/dl-machine.h (elf_machine_load_address): Rewrite
to not generate relocation entry. Suggested by Richard Henderson.
(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
(elf_machine_runtime_setup): Add .aligns.
* sysdeps/i386/fpu/fraiseexcpt.c: Add volatile to asms.
* sysdeps/i386/fpu/bits/mathinline.h: Partially undo change of
1997-08-14 03:14. gcc 2.7.2* is really broken in some aspects.
* sysdeps/standalone/i386/i386.h: Clean up asm statements a bit.
* sysdeps/standalone/i960/i960ca.h: Likewise.
1997-08-22 19:04 Richard Henderson <rth@cygnus.com>
* elf/rtld.c (_dl_start): Init _dl_rtld_map.l_opencount due to
undocumented test addition in _dl_map_object.
Support ET_EXEC versions of ld.so, for debugging at least:
* elf/dl-load.c (_dl_map_object): Add_name_to_object could get
called despite the DT_SONAME != NULL test, segfaulting. Simplify
the code here as well.
* elf/dl-lookup.c (do_lookup): Skip objects with no symtab.
(_dl_setup_hash): Likewise for hash tables.
* elf/dl-version.c (_dl_check_map_versions): Likewise for strtabs.
* elf/rtld.c (_dl_start): Likewise for rpath.
(_dl_rtld_libname2): New variable.
(dl_main): Use it to add an soname for ourselves when we don't have
one of our own. Base it on the target's .interp.
(dl_main): Again, skip printing of objects that don't have strtabs.
Sparc 32 merge:
* elf/dl-runtime.c (ELF_FIXUP_RETURN_VALUE): Provide default value.
(fixup): Simplify code. Use ELF_FIXUP_RETURN_VALUE.
(profile_fixup): Likewise, though this still needs fixing for
Sparc32 and PPC.
* sysdeps/powerpc/dl-machine.h: Transmute ELF_FIXUP_RETURNS_ADDRESS
to ELF_FIXUP_RETURN_VALUE.
* sysdeps/sparc/sparc32/dl-machine.h: Implement lazy relocation.
Fix up _dl_start_user to handle _dl_skip_args properly.
Use _dl_hwcap to determine if "flush" is available/needed.
* sysdeps/sparc/configure.in: Remove. It doesn't actually do
anything anymore, and what it did do is done somewhere else.
* sysdeps/sparc/configure: Likewise.
* sysdeps/sparc/fpu/bits/mathdef.h (FP_ILOGB0, FP_ILOGBNAN): New.
* sysdeps/sparc/fpu/fraiseexcpt.c: Rearrange for smaller code.
* sysdeps/sparc/sparc32/Makefile: Fix sparc->sparc/sparc32 bits
in divrem expansions.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (END, LOC): New
definitions for assembly syntax differences.
* sysdeps/sparc/sparc32/__longjmp.S: %g6,%g7 are reserved to the
"system". Use %g2,%g3 instead. Use new local label macro.
* sysdeps/sparc/sparc32/add_n.S: Use <sysdep.h> and ENTRY, END,
and LOC for proper assembly headers/footers.
* sysdeps/sparc/sparc32/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/alloca.S: Likewise.
* sysdeps/sparc/sparc32/dotmul.S: Likewise.
* sysdeps/sparc/sparc32/lshift.S: Likewise.
* sysdeps/sparc/sparc32/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/rshift.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/sub_n.S: Likewise.
* sysdeps/sparc/sparc32/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/umul.S: Likewise.
* sysdeps/sparc/sparc32/divrem.m4: Likewise.
* sysdeps/sparc/sparc32/rem.S: Regenerate.
* sysdeps/sparc/sparc32/sdiv.S: Regenerate.
* sysdeps/sparc/sparc32/udiv.S: Regenerate.
* sysdeps/sparc/sparc32/urem.S: Regenerate.
* sysdeps/sparc/sparc32/sparcv8/dotmul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/rem.S: New file.
* sysdeps/sparc/sparc32/sparcv8/sdiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/udiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/umul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/urem.S: New file.
* sysdeps/sparc/sparc32/bsd-_setjmp.S: Dike out.
* sysdeps/sparc/sparc32/bsd-setjmp.S: Likewise.
* sysdeps/sparc/sparc32/setjmp.S: Add _setjmp and setjmp entry points.
* sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S:
Clean up PIC code.
* sysdeps/sparc/sparc32/elf/start.S: New file, slightly modified
from the sparc64 version.
* sysdeps/sparc/sparc32/elf/start.c: Removed.
* sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Rewrite in
assembly based on the sparc64 version.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: Duh. Use proper syntax
for manipulating %fsr.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Make IEEE conformance
be the default.
* elf/elf.h (HWCAP_SPARC_*): New definitions.
* elf/rtld.c (_dl_hwcap): New variable.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Record AT_HWCAP.
* sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: New file.
Attempt to get hold of the page size based on what we might have
been told at startup time in _dl_pagesize. This will be obsolete
when I finish the kernel hooks for a proper sysconf(), stay tuned.
Sparc 64 merge:
* sysdeps/sparc/sparc64/dl-machine.h (ELF_FIXUP_RETURN_VALUE): New.
Figure out the right thing to return based on the .plt format.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Update comment.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__dev_t):
Should have been 64-bits wide.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: sll->sllx,
optimize for branch delay slot usage.
1997-08-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* csu/Makefile ($(objpfx)crt%.o): Fix a missing *.so -> *.os
change.
1997-08-20 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (identities): Change epsilon.
* sysdeps/i386/fpu/bits/mathinline.h: Correct arguments to fabs,
fabsf, fabsl, __fabsl.
* sysdeps/libm-i387/e_remainderl.S: Pop extra value from FPU stack.
* sysdeps/libm-ieee754/s_csinhl.c: Include <fenv.h>.
1997-08-24 12:55:18 +02:00
|
|
|
The GNU C Library does not contain the source code for the programs to
|
|
|
|
handle message catalogs for the @code{gettext} functions. As part of
|
|
|
|
the GNU project the GNU gettext package contains everything the
|
|
|
|
developer needs. The functionality provided by the tools in this
|
|
|
|
package by far exceeds the abilities of the @code{gencat} program
|
|
|
|
described above for the @code{catgets} functions.
|
|
|
|
|
|
|
|
There is a program @code{msgfmt} which is the equivalent program to the
|
|
|
|
@code{gencat} program. It generates from the human-readable and
|
|
|
|
-editable form of the message catalog a binary file which can be used by
|
|
|
|
the @code{gettext} functions. But there are several more programs
|
|
|
|
available.
|
|
|
|
|
|
|
|
The @code{xgettext} program can be used to automatically extract the
|
|
|
|
translatable messages from a source file. I.e., the programmer need not
|
|
|
|
take care for the translations and the list of messages which have to be
|
|
|
|
translated. S/He will simply wrap the translatable string in calls to
|
|
|
|
@code{gettext} et.al and the rest will be done by @code{xgettext}. This
|
|
|
|
program has a lot of option which help to customize the output or do
|
|
|
|
help to understand the input better.
|
|
|
|
|
|
|
|
Other programs help to manage development cycle when new messages appear
|
|
|
|
in the source files or when a new translation of the messages appear.
|
[BZ #2510, BZ #2830, BZ #3137, BZ #3313, BZ #3426, BZ #3465, BZ #3480, BZ #3483, BZ #3493, BZ #3514, BZ #3515, BZ #3664, BZ #3673, BZ #3674]
2007-01-11 Jakub Jelinek <jakub@redhat.com>
* sysdeps/i386/soft-fp/sfp-machine.h: Remove.
* sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise.
2007-01-10 Ulrich Drepper <drepper@redhat.com>
* io/fts.c: Make sure fts_cur is always valid after return from
fts_read.
Patch by Miloslav Trmac <mitr@redhat.com>.
2006-10-27 Richard Sandiford <richard@codesourcery.com>
* elf/elf.h (R_MIPS_GLOB_DAT): Define.
(R_MIPS_NUM): Bump by 1.
2007-01-03 Jakub Jelinek <jakub@redhat.com>
* posix/execvp.c: Include alloca.h.
(allocate_scripts_argv): Renamed to...
(scripts_argv): ... this. Don't allocate buffer here nor count
arguments.
(execvp): Use alloca if possible.
* posix/Makefile: Add rules to build and run tst-vfork3 test.
* posix/tst-vfork3.c: New test.
* stdlib/Makefile (tst-strtod3-ENV): Define.
2007-01-02 Ulrich Drepper <drepper@redhat.com>
* posix/getconf.c: Update copyright year.
* nss/getent.c: Likewise.
* iconv/iconvconfig.c: Likewise.
* iconv/iconv_prog.c: Likewise.
* elf/ldconfig.c: Likewise.
* catgets/gencat.c: Likewise.
* csu/version.c: Likewise.
* elf/ldd.bash.in: Likewise.
* elf/sprof.c (print_version): Likewise.
* locale/programs/locale.c: Likewise.
* locale/programs/localedef.c: Likewise.
* nscd/nscd.c (print_version): Likewise.
* debug/xtrace.sh: Likewise.
* malloc/memusage.sh: Likewise.
* malloc/mtrace.pl: Likewise.
* debug/catchsegv.sh: Likewise.
2006-12-24 Ulrich Drepper <drepper@redhat.com>
* malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment
attempts.
2006-12-23 Ulrich Drepper <drepper@redhat.com>
* posix/wordexp.c: Remove some unnecessary tests.
2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp>
* sysdeps/unix/sysv/linux/sh/bits/shm.h: New file.
* nss/getXXbyYY_r.c: Include atomic.h.
(INTERNAL (REENTRANT_NAME)): Write startp after start_fct,
add atomic_write_barrier () in between.
2006-11-28 Jakub Jelinek <jakub@redhat.com>
* elf/dl-support.c: Include dl-procinfo.h.
* sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4,
PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS,
PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X):
Define.
(_dl_string_platform): Use PPC_PLATFORM_* macros instead of
hardcoded constants.
* sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use
PPC_PLATFORM_* macros for array designators.
2006-11-11 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap
names to the beginning.
(_dl_powerpc_platforms): Add "power6x".
* sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease.
(HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP.
(_DL_PLATFORMS_COUNT): Increase.
(_dl_string_platform): Handle power6x case.
* sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP,
PPC_FEATURE_POWER6_EXT): Define.
(PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment.
[-2^31 .. 2^31) range.
* sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME.
* sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
Handle relatime mount option.
2006-12-13 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include
kernel-features.h.
2006-12-11 Ulrich Drepper <drepper@redhat.com>
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand
separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3.
[BZ #3664]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize
empty parsed strings.
* stdlib/Makefile (tests): Add tst-strtod2.
* stdlib/tst-strtod2.c: New file.
[BZ #3673]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit
computation.
* stdlib/Makefile (tests): Add tst-atof2.
* stdlib/tst-atof2.c: New file.
[BZ #3674]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value
correctly if removing trailing zero of hex-float.
* stdlib/Makefile (tests): Add tst-atof1.
* stdlib/tst-atof1.c: New file.
* misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest.
Start searching for next comma at p rather than rest.
* misc/Makefile (tests): Add tst-mntent2.
* misc/tst-mntent2.c: New test.
2006-12-08 Ulrich Drepper <drepper@redhat.com>
* malloc/memusage.c: Handle realloc with new size of zero and
non-NULL pointer correctly.
(me): Really write first record twice.
(struct entry): Make format bi-arch safe.
(dest): Write out more realloc statistics.
* malloc/memusagestat.c (struct entry): Make format bi-arch safe.
2006-12-05 Jakub Jelinek <jakub@redhat.com>
* nis/nis_subr.c (nis_getnames): Revert last change.
2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/sys/io.h: Removed.
2006-11-30 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/i386/i686/memcmp.S: Use jump table as the base of
jump table entries.
2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost
`clone' function to ensure proper unwinding stop of gdb.
* sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise.
2006-12-01 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd.init: Remove obsolete and commented-out -S option
handling.
2006-11-23 Jakub Jelinek <jakub@redhat.com>
[BZ #3514]
* manual/string.texi (strncmp): Fix pastos from wcscmp description.
[BZ #3515]
* manual/string.texi (strtok): Remove duplicate paragraph.
2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with
libgcc not supporting `rflags' unwinding (register # >= 17).
2006-11-30 Jakub Jelinek <jakub@redhat.com>
* sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc
succeeded.
2006-11-29 Daniel Jacobowitz <dan@codesourcery.com>
Jakub Jelinek <jakub@redhat.com>
Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct
unwind information.
* sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for
'restore_rt' even in the 'signal' directory.
* sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list.
malloc crashed. Don't allocate memory unnecessarily in each
loop.
2006-10-21 Jakub Jelinek <jakub@redhat.com>
* resolv/mapv4v6addr.h (map_v4v6_address): Fix last change.
2006-11-20 Ulrich Drepper <drepper@redhat.com>
* resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit.
2006-11-18 Bruno Haible <bruno@clisp.org>
* sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke
__sysconf only after having tried to call getgroups32.
2006-11-19 Ulrich Drepper <drepper@redhat.com>
* nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style
addresses for IPv4 queries if they can be mapped.
2006-11-16 Jakub Jelinek <jakub@redhat.com>
* sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text.
* sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise.
(signmask): Add .size directive.
(othermask): Add .type directive.
2006-11-14 Ulrich Drepper <drepper@redhat.com>
* po/nl.po: Update from translation team.
* timezone/zdump.c: Redo fix for BZ #3137.
2006-11-14 Jakub Jelinek <jakub@redhat.com>
* nss/nss_files/files-alias.c (get_next_alias): Set line back
to first_unused after parsing :include: file.
* timezone/africa: Update from tzdata2006o.
* timezone/antarctica: Likewise.
* timezone/asia: Likewise.
* timezone/australasia: Likewise.
* timezone/backward: Likewise.
* timezone/europe: Likewise.
* timezone/iso3166.tab: Likewise.
* timezone/northamerica: Likewise.
* timezone/southamerica: Likewise.
* timezone/zone.tab: Likewise.
* time/tzfile.c (__tzfile_read): Extend to handle new file format
on machines with 64-bit time_t.
* timezone/checktab.awk: Update from tzcode2006o.
* timezone/ialloc.c: Likewise.
* timezone/private.h: Likewise.
* timezone/scheck.c: Likewise.
* timezone/tzfile.h: Likewise.
* timezone/tzselect.ksh: Likewise.
* timezone/zdump.c: Likewise.
* timezone/zic.c: Likewise.
[BZ #3483]
* elf/ldconfig.c (main): Call setlocale and textdomain.
Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
[BZ #3480]
* manual/argp.texi: Fix typos.
* manual/charset.texi: Likewise.
* manual/errno.texi: Likewise.
* manual/filesys.texi: Likewise.
* manual/lang.texi: Likewise.
* manual/maint.texi: Likewise.
* manual/memory.texi: Likewise.
* manual/message.texi: Likewise.
* manual/resource.texi: Likewise.
* manual/search.texi: Likewise.
* manual/signal.texi: Likewise.
* manual/startup.texi: Likewise.
* manual/stdio.texi: Likewise.
* manual/sysinfo.texi: Likewise.
* manual/syslog.texi: Likewise.
* manual/time.texi: Likewise.
Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
[BZ #3465]
* sunrpc/clnt_raw.c: Minimal message improvements.
* sunrpc/pm_getmaps.c: Likewise.
* nis/nss_nisplus/nisplus-publickey.c: Likewise.
* nis/nis_print_group_entry.c: Likewise.
* locale/programs/repertoire.c: Likewise.
* locale/programs/charmap.c: Likewise.
* malloc/memusage.sh: Likewise.
* elf/dl-deps.c: Likewise.
* locale/programs/ld-collate.c: Likewise.
* libio/vswprintf.c: Likewise.
* malloc/memusagestat.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/rpc_main.c: Likewise.
* nscd/cache.c: Likewise.
* locale/programs/repertoire.c: Unify output messages.
* locale/programs/charmap.c: Likewise.
* locale/programs/ld-ctype.c: Likewise.
* locale/programs/ld-monetary.c: Likewise.
* locale/programs/ld-numeric.c: Likewise.
* locale/programs/ld-time.c: Likewise.
* elf/ldconfig.c: Likewise.
* nscd/selinux.c: Likewise.
* elf/cache.c: Likewise.
Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
2006-11-10 Jakub Jelinek <jakub@redhat.com>
* string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization
if N is one bigger than return value.
* string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1
and l1 last arguments, if buf is defined, verify the return value
equals to strlen (buf) and verify no byte beyond passed length
is modified.
2006-11-10 Ulrich Drepper <drepper@redhat.com>
* po/sv.po: Update from translation team.
* sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev):
Use __new_sys_siglist instead of _sys_siglist_internal as
second macro argument.
(_old_sys_siglist): Use declare_symbol_alias macro instead of
strong_alias.
2006-11-09 Ulrich Drepper <drepper@redhat.com>
[BZ #3493]
* posix/unistd.h (sysconf): Remove const attribute.
* sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for
temporary or deprecated addresses.
Patch by Sridhar Samudrala <sri@us.ibm.com>.
* string/Makefile (tests): Add tst-strxfrm2.
* string/tst-strxfrm2.c: New file.
2006-10-09 Jakub Jelinek <jakub@redhat.com>
* elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0
rather than r->r_brk.
* string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal
optimization even if needed > n.
2006-11-07 Jakub Jelinek <jakub@redhat.com>
* include/libc-symbols.h (declare_symbol): Rename to...
(declare_symbol_alias): ... this. Add ORIGINAL argument, imply
strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes
.size directive.
* sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias
changes.
* sysdeps/gnu/siglist.c: Likewise.
2006-11-03 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/powerpc/fpu/bits/mathinline.h
[__LIBC_INTERNAL_MATH_INLINES]: Moved to ...
* sysdeps/powerpc/fpu/math_private.h: ...here. New file.
2006-11-05 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word):
Update handling of cache descriptor 0x49 for new models.
* sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word):
Likewise.
2006-11-02 Ulrich Drepper <drepper@redhat.com>
* configure.in: Work around ld --help change and avoid -z relro
test completely if the architecture doesn't care about security.
2006-11-01 Ulrich Drepper <drepper@redhat.com>
* po/sv.po: Update from translation team.
2006-10-31 Ulrich Drepper <drepper@redhat.com>
* stdlib/atexit.c (atexit): Don't mark as hidden when used to
generate compatibility version.
2006-10-29 Ulrich Drepper <drepper@redhat.com>
* configure.in: Relax -z relro requirement a bit.
* po/sv.po: Update from translation team.
2006-10-29 Jakub Jelinek <jakub@redhat.com>
* elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P.
* elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise.
* elf/dl-close.c (_dl_close_worker): Likewise.
* elf/dl-open.c (_dl_open_worker): Likewise.
* sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define.
* configure.in: Require assembler support for visibility, compiler
support for visibility and aliases, linker support for various -z
options.
* Makeconfig: Remove conditional code which now is unnecessary.
* config.h.in: Likewise.
* config.make.in: Likewise.
* dlfcn/Makefile: Likewise.
* elf/Makefile: Likewise.
* elf/dl-load.c: Likewise.
* elf/rtld.c: Likewise.
* include/libc-symbols.h: Likewise.
* include/stdio.h: Likewise.
* io/Makefile: Likewise.
* io/fstat.c: Likewise.
* io/fstat64.c: Likewise.
* io/fstatat.c: Likewise.
* io/fstatat64.c: Likewise.
* io/lstat.c: Likewise.
* io/lstat64.c: Likewise.
* io/mknod.c: Likewise.
* io/mknodat.c: Likewise.
* io/stat.c: Likewise.
* io/stat64.c: Likewise.
* libio/stdio.c: Likewise.
* nscd/Makefile: Likewise.
* stdlib/Makefile: Likewise.
* stdlib/atexit.c: Likewise.
* sysdeps/generic/ldsodefs.h: Likewise.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/i386/sysdep.h: Likewise.
* sysdeps/i386/i686/memcmp.S: Likewise.
* sysdeps/powerpc/powerpc32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise.
* Makerules: USE_TLS support is now default.
* tls.make.c: Likewise.
* csu/Versions: Likewise.
* csu/libc-start.c: Likewise.
* csu/libc-tls.c: Likewise.
* csu/version.c: Likewise.
* dlfcn/dlinfo.c: Likewise.
* elf/dl-addr.c: Likewise.
* elf/dl-cache.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-iteratephdr.c: Likewise.
* elf/dl-load.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-reloc.c: Likewise.
* elf/dl-support.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-sysdep.c: Likewise.
* elf/dl-tls.c: Likewise.
* elf/ldconfig.c: Likewise.
* elf/rtld.c: Likewise.
* elf/tst-tls-dlinfo.c: Likewise.
* elf/tst-tls1.c: Likewise.
* elf/tst-tls10.h: Likewise.
* elf/tst-tls14.c: Likewise.
* elf/tst-tls2.c: Likewise.
* elf/tst-tls3.c: Likewise.
* elf/tst-tls4.c: Likewise.
* elf/tst-tls5.c: Likewise.
* elf/tst-tls6.c: Likewise.
* elf/tst-tls7.c: Likewise.
* elf/tst-tls8.c: Likewise.
* elf/tst-tls9.c: Likewise.
* elf/tst-tlsmod1.c: Likewise.
* elf/tst-tlsmod13.c: Likewise.
* elf/tst-tlsmod13a.c: Likewise.
* elf/tst-tlsmod14a.c: Likewise.
* elf/tst-tlsmod2.c: Likewise.
* elf/tst-tlsmod3.c: Likewise.
* elf/tst-tlsmod4.c: Likewise.
* elf/tst-tlsmod5.c: Likewise.
* elf/tst-tlsmod6.c: Likewise.
* include/errno.h: Likewise.
* include/link.h: Likewise.
* include/tls.h: Likewise.
* locale/global-locale.c: Likewise.
* locale/localeinfo.h: Likewise.
* malloc/arena.c: Likewise.
* malloc/hooks.c: Likewise.
* malloc/malloc.c: Likewise.
* resolv/Versions: Likewise.
* sysdeps/alpha/dl-machine.h: Likewise.
* sysdeps/alpha/libc-tls.c: Likewise.
* sysdeps/generic/ldsodefs.h: Likewise.
* sysdeps/generic/tls.h: Likewise.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/ia64/dl-machine.h: Likewise.
* sysdeps/ia64/libc-tls.c: Likewise.
* sysdeps/mach/hurd/fork.c: Likewise.
* sysdeps/mach/hurd/i386/tls.h: Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.c: Likwise.
* sysdeps/powerpc/powerpc32/dl-machine.h: Likewise.
* sysdeps/powerpc/powerpc64/dl-machine.h: Likewise.
* sysdeps/s390/libc-tls.c: Likewise.
* sysdeps/s390/s390-32/dl-machine.h: Likewise.
* sysdeps/s390/s390-64/dl-machine.h: Likewise.
* sysdeps/sh/dl-machine.h: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h: Likewise.
* sysdeps/sparc/sparc64/dl-machine.h: Likewise.
* sysdeps/x86_64/dl-machine.h: Likewise.
[BZ #3426]
* stdlib/stdlib.h: Adjust comment for canonicalize_file_name to
reality.
2006-10-27 Jakub Jelinek <jakub@redhat.com>
* elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope
argument.
(_dl_lookup_symbol_x): Adjust caller.
* sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove
_ns_global_scope.
* elf/rtld.c (dl_main): Don't initialize _ns_global_scope.
* elf/dl-libc.c: Revert l_scope name changes.
* elf/dl-load.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/rtld.c: Likewise.
* elf/dl-close.c (_dl_close): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P,
always use __rtld_mrlock_{change,done}. Always free old scope list
here if not l_scope_mem.
* elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name
change. Never free scope list here. Just __rtld_mrlock_lock before
the lookup and __rtld_mrlock_unlock it after the lookup.
* elf/dl-sym.c: Likewise.
* include/link.h (struct r_scoperec): Remove.
(struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem
with l_scope_mem and l_scoperec_lock with l_scope_lock.
2006-10-25 Ulrich Drepper <drepper@redhat.com>
* sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* configure.in: Disable building profile libraries by default.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to
_dl_lookup_symbol_x code.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
* elf/dl-runtime.c: Include sysdep-cancel.h.
(_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and
scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_*
instead of catomic_* macros.
* elf/dl-sym.c: Include sysdep-cancel.h.
(do_sym): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
* elf/dl-close.c: Include sysdep-cancel.h.
(_dl_close): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
* elf/dl-open.c: Include sysdep-cancel.h.
(dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
[BZ #3313]
* malloc/malloc.c (malloc_consolidate): Set maxfb to address of last
fastbin rather than end of fastbin array.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct
body macro.
* sysdeps/x86_64/bits/atomic.h
(__arch_c_compare_and_exchange_val_64_acq): Add missing casts.
(catomic_decrement): Use correct body macro.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
* include/atomic.h: Add a unique prefix to all local variables
in macros.
* csu/tst-atomic.c (do_test): Test also catomic_* macros.
2006-10-14 Ulrich Drepper <drepper@redhat.com>
* resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated.
[BZ #3313]
* malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to
determine highest fast bin to consolidate, always look into all of
them.
(do_check_malloc_state): Only require for empty bins for large
sizes in main arena.
* libio/stdio.h: Add more __wur attributes.
2006-11-12 Andreas Jaeger <aj@suse.de>
[BZ #2510]
* manual/search.texi (Hash Search Function): Clarify.
(Array Search Function): Clarify.
2006-11-12 Joseph Myers <joseph@codesourcery.com>
[BZ #2830]
* math/atest-exp.c (main): Cast hex value to mp_limb_t before
shifting.
* math/atest-exp2.c (read_mpn_hex): Likewise.
* math/atest-sincos.c (main): Likewise.
* sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait.
* sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait.
* sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for
version GLIBC_2.6.
* Versions.def: Add GLIBC_2.6 for libc.
* sysdeps/i386/i486/bits/atomic.h: Add catomic_* support.
2006-10-11 Jakub Jelinek <jakub@redhat.com>
* malloc/malloc.c (_int_malloc): Remove unused any_larger variable.
* nis/nis_defaults.c (__nis_default_access): Don't call getenv twice.
* nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv.
* sysdeps/generic/unsecvars.h: Add NIS_PATH.
2006-10-11 Ulrich Drepper <drepper@redhat.com>
* include/atomic.c: Define catomic_* operations.
* sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems.
* stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*.
* malloc/memusage.c: Likewise.
* gmon/mcount.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-profile.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-runtime.c: Likewise.
* elf/dl-fptr.c: Likewise.
* resolv/res_libc.c: Likewise.
2006-10-10 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast.
* sysdeps/mach/hurd/futimes.c: Likewise.
* sysdeps/mach/hurd/lutimes.c: Likewise.
2006-10-09 Ulrich Drepper <drepper@redhat.com>
Jakub Jelinek <jakub@redhat.com>
Implement reference counting of scope records.
* elf/dl-close.c (_dl_close): Remove all scopes from removed objects
from the list in objects which remain. Always allocate new scope
record.
* elf/dl-open.c (dl_open_worker): When growing array for scopes,
don't resize, allocate a new one.
* elf/dl-runtime.c: Update reference counters before using a scope
array.
* elf/dl-sym.c: Likewise.
* elf/dl-libc.c: Adjust for l_scope name change.
* elf/dl-load.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/rtld.c: Likewise.
* include/link.h: Include <rtld-lowlevel.h>. Define struct
r_scoperec. Replace r_scope with pointer to r_scoperec structure.
Add l_scoperec_lock.
* sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>.
* sysdeps/generic/rtld-lowlevel.h: New file.
* include/atomic.h: Rename atomic_and to atomic_and_val and
atomic_or to atomic_or_val. Define new macros atomic_and and
atomic_or which do not return values.
* sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or.
Various cleanups.
* sysdeps/i386/i486/bits/atomic.h: Likewise.
* po/sv.po: Update from translation team.
2006-10-07 Ulrich Drepper <drepper@redhat.com>
* Versions.def: Add GLIBC_2.6 to libpthread.
* include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use.
(versioned_symbol): Likewise.
(compat_symbol): Likewise.
* po/tr.po: Update from translation team.
* nis/Banner: Removed. It's been integral part forever and the
author info is incomplete anyway.
* libio/Banner: Likewise.
2006-10-06 Ulrich Drepper <drepper@redhat.com>
* version.h (VERSION): Bump to 2.5.90 for new development tree.
2007-01-11 22:51:07 +01:00
|
|
|
Here it should only be noted that using all the tools in GNU gettext it
|
|
|
|
is possible to @emph{completely} automate the handling of message
|
Update.
1997-08-24 12:24 Ulrich Drepper <drepper@cygnus.com>
* configure.in (INSTALL): Quote `$'.
* libc.map: Add __xpg_basename.
* csu/Makefile (initfini.s): Disable optimization.
* elf/dl-deps.c: Implement handling of DL_FILTER.
* elf/dl-load.c (_dl_init_paths): Add error check.
* intl/finddomain.c (_nl_find_domain): Correct comment.
* intl/localealias.c: Include <bits/libc-lock.h> not <libc-lock.h>.
* libio/stdio.h: Make {,v}snprintf available if __USE_BSD.
Change extern inline functions to work correctly in C++.
* locale/iso-4217.def: Update for more recent ISO 4217 version.
* locale/loadlocale.c (_nl_load_locale): Add cast.
* manual/message.texi: Finish gettext section.
* posix/getopt_init.c: Don't use relative #include path.
(__getopt_clean_environment): Change function to take pointer to
environment as argument. Optimize generation of test string a bit.
* sysdeps/unix/sysv/linux/init-first.c: Call __getopt_clean_environment
with additional argument.
* poisx/glob.c: Add prototype for next_brace_sub.
* sysdeps/generic/dl-sysdep.c: Recognize AT_BASE value on auxiliary
vector.
* sysdeps/i386/dl-machine.h (elf_machine_load_address): Rewrite
to not generate relocation entry. Suggested by Richard Henderson.
(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
(elf_machine_runtime_setup): Add .aligns.
* sysdeps/i386/fpu/fraiseexcpt.c: Add volatile to asms.
* sysdeps/i386/fpu/bits/mathinline.h: Partially undo change of
1997-08-14 03:14. gcc 2.7.2* is really broken in some aspects.
* sysdeps/standalone/i386/i386.h: Clean up asm statements a bit.
* sysdeps/standalone/i960/i960ca.h: Likewise.
1997-08-22 19:04 Richard Henderson <rth@cygnus.com>
* elf/rtld.c (_dl_start): Init _dl_rtld_map.l_opencount due to
undocumented test addition in _dl_map_object.
Support ET_EXEC versions of ld.so, for debugging at least:
* elf/dl-load.c (_dl_map_object): Add_name_to_object could get
called despite the DT_SONAME != NULL test, segfaulting. Simplify
the code here as well.
* elf/dl-lookup.c (do_lookup): Skip objects with no symtab.
(_dl_setup_hash): Likewise for hash tables.
* elf/dl-version.c (_dl_check_map_versions): Likewise for strtabs.
* elf/rtld.c (_dl_start): Likewise for rpath.
(_dl_rtld_libname2): New variable.
(dl_main): Use it to add an soname for ourselves when we don't have
one of our own. Base it on the target's .interp.
(dl_main): Again, skip printing of objects that don't have strtabs.
Sparc 32 merge:
* elf/dl-runtime.c (ELF_FIXUP_RETURN_VALUE): Provide default value.
(fixup): Simplify code. Use ELF_FIXUP_RETURN_VALUE.
(profile_fixup): Likewise, though this still needs fixing for
Sparc32 and PPC.
* sysdeps/powerpc/dl-machine.h: Transmute ELF_FIXUP_RETURNS_ADDRESS
to ELF_FIXUP_RETURN_VALUE.
* sysdeps/sparc/sparc32/dl-machine.h: Implement lazy relocation.
Fix up _dl_start_user to handle _dl_skip_args properly.
Use _dl_hwcap to determine if "flush" is available/needed.
* sysdeps/sparc/configure.in: Remove. It doesn't actually do
anything anymore, and what it did do is done somewhere else.
* sysdeps/sparc/configure: Likewise.
* sysdeps/sparc/fpu/bits/mathdef.h (FP_ILOGB0, FP_ILOGBNAN): New.
* sysdeps/sparc/fpu/fraiseexcpt.c: Rearrange for smaller code.
* sysdeps/sparc/sparc32/Makefile: Fix sparc->sparc/sparc32 bits
in divrem expansions.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (END, LOC): New
definitions for assembly syntax differences.
* sysdeps/sparc/sparc32/__longjmp.S: %g6,%g7 are reserved to the
"system". Use %g2,%g3 instead. Use new local label macro.
* sysdeps/sparc/sparc32/add_n.S: Use <sysdep.h> and ENTRY, END,
and LOC for proper assembly headers/footers.
* sysdeps/sparc/sparc32/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/alloca.S: Likewise.
* sysdeps/sparc/sparc32/dotmul.S: Likewise.
* sysdeps/sparc/sparc32/lshift.S: Likewise.
* sysdeps/sparc/sparc32/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/rshift.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/sub_n.S: Likewise.
* sysdeps/sparc/sparc32/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/umul.S: Likewise.
* sysdeps/sparc/sparc32/divrem.m4: Likewise.
* sysdeps/sparc/sparc32/rem.S: Regenerate.
* sysdeps/sparc/sparc32/sdiv.S: Regenerate.
* sysdeps/sparc/sparc32/udiv.S: Regenerate.
* sysdeps/sparc/sparc32/urem.S: Regenerate.
* sysdeps/sparc/sparc32/sparcv8/dotmul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/rem.S: New file.
* sysdeps/sparc/sparc32/sparcv8/sdiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/udiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/umul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/urem.S: New file.
* sysdeps/sparc/sparc32/bsd-_setjmp.S: Dike out.
* sysdeps/sparc/sparc32/bsd-setjmp.S: Likewise.
* sysdeps/sparc/sparc32/setjmp.S: Add _setjmp and setjmp entry points.
* sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S:
Clean up PIC code.
* sysdeps/sparc/sparc32/elf/start.S: New file, slightly modified
from the sparc64 version.
* sysdeps/sparc/sparc32/elf/start.c: Removed.
* sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Rewrite in
assembly based on the sparc64 version.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: Duh. Use proper syntax
for manipulating %fsr.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Make IEEE conformance
be the default.
* elf/elf.h (HWCAP_SPARC_*): New definitions.
* elf/rtld.c (_dl_hwcap): New variable.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Record AT_HWCAP.
* sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: New file.
Attempt to get hold of the page size based on what we might have
been told at startup time in _dl_pagesize. This will be obsolete
when I finish the kernel hooks for a proper sysconf(), stay tuned.
Sparc 64 merge:
* sysdeps/sparc/sparc64/dl-machine.h (ELF_FIXUP_RETURN_VALUE): New.
Figure out the right thing to return based on the .plt format.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Update comment.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__dev_t):
Should have been 64-bits wide.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: sll->sllx,
optimize for branch delay slot usage.
1997-08-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* csu/Makefile ($(objpfx)crt%.o): Fix a missing *.so -> *.os
change.
1997-08-20 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (identities): Change epsilon.
* sysdeps/i386/fpu/bits/mathinline.h: Correct arguments to fabs,
fabsf, fabsl, __fabsl.
* sysdeps/libm-i387/e_remainderl.S: Pop extra value from FPU stack.
* sysdeps/libm-ieee754/s_csinhl.c: Include <fenv.h>.
1997-08-24 12:55:18 +02:00
|
|
|
catalog. Beside marking the translatable string in the source code and
|
|
|
|
generating the translations the developers do not have anything to do
|
2000-01-24 05:18:43 +01:00
|
|
|
themselves.
|