From 23948bda4bc44868d1959b209ed73b5d7c88d5df Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 24 Apr 2006 04:36:38 +0000 Subject: [PATCH] * nis/nss_nisplus/nisplus-netgrp.c: Cleanups. * posix/regex.h: Remove obsolete comment and special code if possible. Move compatibility code in .text.compat section. --- ChangeLog | 6 +- localedata/ChangeLog | 6 + localedata/SUPPORTED | 1 + localedata/locales/nr_ZA | 281 +++++++++++++++++++++++++++++++++++++++ nis/nss_nisplus/nisplus-netgrp.c | 10 +- 5 files changed, 297 insertions(+), 7 deletions(-) create mode 100644 localedata/locales/nr_ZA diff --git a/ChangeLog b/ChangeLog index c54c3a0..c4813a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-04-23 Ulrich Drepper + * nis/nss_nisplus/nisplus-netgrp.c: Cleanups. + [BZ #1951] * sysdeps/posix/sigset.c (sigset): Return correct value reflecting previous signal state. @@ -16,7 +18,7 @@ 2006-04-21 Ulrich Drepper [BZ #2534, BZ #2535] - * posix/regex.h: Remove obsolete and special + * posix/regex.h: Remove obsolete comment and special handling for VMS. * iconvdata/ibm437.c: Define HAS_HOLES to 0. @@ -35,7 +37,7 @@ * sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_PROC_SELF_FD_SYMLINK. * sysdeps/unix/sysv/linux/ttyname.c: Cleanups. Avoid compatibility - code is possible. Move compatibility code in .text.compat section. + code if possible. Move compatibility code in .text.compat section. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. 2006-04-18 Ulrich Drepper diff --git a/localedata/ChangeLog b/localedata/ChangeLog index b1db1b6..a643af1 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2006-04-23 Ulrich Drepper + + [BZ #1782] + * locales/nr_ZA: New file. + * locales/SUPPORTED: Add nr_ZA.UTF-8. + 2006-04-10 Jakub Jelinek * locales/cs_CZ (LC_TIME): Define week. diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index 9174745..350df70 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -263,6 +263,7 @@ nl_NL/ISO-8859-1 \ nl_NL@euro/ISO-8859-15 \ nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ +nr_ZA/UTF-8 \ nso_ZA/UTF-8 \ oc_FR.UTF-8/UTF-8 \ oc_FR/ISO-8859-1 \ diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA new file mode 100644 index 0000000..916a3fa --- /dev/null +++ b/localedata/locales/nr_ZA @@ -0,0 +1,281 @@ +escape_char / +comment_char % + +% Charset: UTF-8 + +% ChangeLog +% 0.3 (2005-10-13): +% 2005-10-12 Dwayne Bailey +% - Added 'Charset: UTF-8' information +% - Update contact information +% - Allign spellings of month and weekday names with Dept. of +% Art and Culture's: Multilingual Mathematics Dictionary +% 0.2 (2004-11-09): +% 2004-11-09 Dwayne Bailey +% - escape everything +% - Update all contact information +% - Change %d to %-e for d_t_fmt and date_fmt +% - Reset yes/noexpr to English +% - set all abmon, mon, abday, day to English until correct defintions +% are available. +% 2004-03-30 Dwayne Bailey +% - Added country_ab2/3, country_num +% 2004-02-27 Dwayne Bailey +% - Correct capatilisation of lang_name +% 0.1 (2004-02-24): +% - Initial Southern Ndebele locale for South Africa +% by Zuza Software Foundation + +LC_IDENTIFICATION +title "Southern Ndebele locale for South Africa" +source "Zuza Software Foundation (Translate.org.za)" +address "PO Box 28364, Sunnyside, 0132, South Africa" +contact "Dwayne Bailey" +email "dwayne@translate.org.za" +tel "+27 12 460 1095" +fax "+27 12 460 1095" +language "Southern Ndebele" +territory "South Africa" +revision "0.3" +date "2005-10-13" +% +category "nr_ZA:2004";LC_IDENTIFICATION +category "nr_ZA:2004";LC_CTYPE +category "nr_ZA:2004";LC_COLLATE +category "nr_ZA:2004";LC_TIME +category "nr_ZA:2004";LC_NUMERIC +category "nr_ZA:2004";LC_MONETARY +category "nr_ZA:2004";LC_MESSAGES +category "nr_ZA:2004";LC_PAPER +category "nr_ZA:2004";LC_NAME +category "nr_ZA:2004";LC_ADDRESS +category "nr_ZA:2004";LC_TELEPHONE +category "nr_ZA:2004";LC_MEASUREMENT + +END LC_IDENTIFICATION + +LC_CTYPE +% Use the characters described in the charmap file "i18n.tgz" +copy "i18n" +END LC_CTYPE + +LC_COLLATE +% Copy the template from ISO/IEC 14651 i.e. +% use the rules there when making ordered lists of words. +copy "iso14651_t1" +END LC_COLLATE + +LC_MONETARY +copy "en_ZA" +END LC_MONETARY + +LC_NUMERIC +copy "en_ZA" +END LC_NUMERIC + +LC_TIME + +% abday - The abbreviations for the week days: +% - Son, Mvu, Bil, Tha, Ne, Hla, Gqi +abday "";"";/ + "";"";/ + "";"";/ + "" + +% day - The full names of the week days: +% - uSonto, uMvulo, uLesibili, lesithathu, uLesine, ngoLesihlanu, umGqibelo +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" + +% abmon - The abbreviations for the months +% - Jan, Feb, Mat, Apr, Mey, Jun, Jul, Arh, Sep, Okt, Usi, Dis +abmon "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"" + +% mon - The full names of the months - +% - Janabari, uFeberbari, uMatjhi, u-Apreli, Meyi, Juni +% Julayi, Arhostosi, Septemba, Oktoba, Usinyikhaba, Disemba +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" + +% Abreviated date and time representation to be referenced by the "%c" field descriptor - +d_t_fmt "" +% +% "%a" (short weekday name), +% "%-e" (day of month as a decimal number), +% "%b" (short month name), +% "%Y" (year with century as a decimal number), +% "%T" (24-hour clock time in format HH:MM:SS), +% "%Z" (Time zone name) + +% Date representation to be referenced by the "%x" field descriptor - +d_fmt "" +% "%d/%m/%Y", day/month/year as decimal numbers (01/01/2000). + +% Time representation to be referenced by the "%X" field descriptor - +t_fmt "" +% "%T" (24-hour clock time in format HH:MM:SS) + +% Define representation of ante meridiem and post meridiem strings - +am_pm "";"" +% The "" mean 'default to "AM" and "PM". + +% Define time representation in 12-hour format with "am_pm", to be referenced by the "%r" +t_fmt_ampm "" +% The "" means that this format is not supported. + +% Date representation not described in ISO/IEC 14652. Comes out as - +% "%a %b %-e %H:%M:%S %Z %Y" which is default "date" command output +date_fmt "/ +/ +" +% +% %a - abbreviated weekday name, +% %b - abreviated month name, +% %-e - day of month as a decimal number with leading space (1 to 31), +% %H - hour (24-hour clock) as a decimal number (00 to 23), +% %M - minute as a decimal number (00 to 59), +% %S - seconds as a decimal number (00 to 59), +% %Z - time-zone name, +% %Y - year with century as a decimal number,e.g. 2001. + +END LC_TIME + +LC_MESSAGES +% FIXME: Check both of these +% The affirmative response - TODO +% "^[yY]" +yesexpr "" + +% The negative response - TODO +% "^[nN]" +noexpr "" +END LC_MESSAGES + +LC_PAPER +copy "en_ZA" +END LC_PAPER + +LC_TELEPHONE +copy "en_ZA" +END LC_TELEPHONE + +LC_MEASUREMENT +copy "en_ZA" +END LC_MEASUREMENT + +LC_NAME +% Format for addressing a person. +name_fmt "/ +" +% "%d%t%g%t%m%t%f" +% "Salutation", +% "Empty string, or ", +% "First given name", +% "Empty string, or ", +% "Middle names", +% "Empty string, or ", +% "Clan names" + +% FIXME - define all the following name_* +% General salutation for any sex +% name_gen "" + +% Salutation for unmarried females - "" +% name_miss "" + +% Salutation for males - "" +% name_mr "" + +% Salutation for married females - "" +% name_mrs "" + +% Salutation valid for all females - "" (no term) +% name_ms "" + +END LC_NAME + +LC_ADDRESS +% Country name in Southern Ndebele - "iSewula Afrika" +country_name "" + +% Abbreviated country postal name - "ZA" +country_post "" + +% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic +% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf +% "ZA" +country_car "" + +% FIXME define the following correctly +% country_isbn "" +% country_num + +% Language name in Southern Ndebele - "IsiNdebele" +lang_name "" + +% ISO 639 two and three letter language names +% see http://www.loc.gov/standards/iso639-2/englangn.html +% "nr", "nbl" +lang_ab "" +lang_term "" + +% Representation of postal addresses (minus the addressee's name) in South +% Africa. (Ignored for now) +postal_fmt "/ +/ +/ +/ +" +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "firm name", +% "end of line", +% "C/O address", +% "end of line", +% "department name", +% "Building name", +% "end of line", +% "street or block name", +% "space", +% "house number or designation", +% "space", +% "floor number", +% "space", +% "room number, door designation", +% "end of line", +% "postal code", +% "space", +% "town, city", +% "end of line", +% "country designation for the keyword", +% "end of line +% + +% ISO 3166 country number and 2 and 3 letter abreviations +% http://www.unicode.org/onlinedat/countries.html +% "ZA", "ZAF" +country_num 710 +country_ab2 "" +country_ab3 "" + +END LC_ADDRESS + diff --git a/nis/nss_nisplus/nisplus-netgrp.c b/nis/nss_nisplus/nisplus-netgrp.c index 31a8cdf..24303b1 100644 --- a/nis/nss_nisplus/nisplus-netgrp.c +++ b/nis/nss_nisplus/nisplus-netgrp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -27,11 +27,11 @@ #include "nss-nisplus.h" -#define NISENTRYVAL(idx,col,res) \ - ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val) +#define NISENTRYVAL(idx, col, res) \ + (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val) -#define NISENTRYLEN(idx,col,res) \ - ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len) +#define NISENTRYLEN(idx, col, res) \ + (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len) enum nss_status _nss_nisplus_getnetgrent_r (struct __netgrent *result, char *buffer, -- 2.7.4