diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | localedata/ChangeLog | 3 | ||||
| -rw-r--r-- | localedata/locales/ms_MY | 60 | ||||
| -rw-r--r-- | po/ca.po | 38 | ||||
| -rwxr-xr-x | posix/globtest.sh | 4 | ||||
| -rw-r--r-- | sysdeps/generic/glob.c | 59 |
6 files changed, 69 insertions, 103 deletions
diff --git a/ChangeLog b/ChangeLog index 6a8ec41417..3eeeff68bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-12-10 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/generic/glob.c (glob): Return only pattern if nothing + matches and GLOB_NOCHECK is set. + * posix/globtest.sh: Correct expected result for NOCHECK test. + + * po/ca.po: Update from translation team. + 2001-12-09 Ulrich Drepper <drepper@redhat.com> Implement transliteration of characters in strings of the locale diff --git a/localedata/ChangeLog b/localedata/ChangeLog index e32b1cd3fa..2f650d4f38 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,8 @@ 2001-12-10 Ulrich Drepper <drepper@redhat.com> + * locales/ms_MY: Various bug fixes and additions. + Patch by Hasbullah Bin Pit (sebol) <sebol@ikhlas.com>. + * locales/ca_ES: Fix typos (desembre -> decembre). Patch by Xavi Drudis Ferran <xdrudis@tinet.org>. diff --git a/localedata/locales/ms_MY b/localedata/locales/ms_MY index 1685f8e798..54ae1d1052 100644 --- a/localedata/locales/ms_MY +++ b/localedata/locales/ms_MY @@ -4,19 +4,20 @@ escape_char / % Malay language locale for Malaysia. % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and % Tetsuji Orita <orita@jp.ibm.com>. +% Modified by Hasbullah Bin Pit (sebol)<sebol@ikhlas.com> 2001, December, 10 LC_IDENTIFICATION title "Malay language locale for Malaysia" source "IBM Globalization Center of Competency, Yamato Software Laboratory" address "1623-14, Shimotsuruma, Yamato-shi, Kanagawa-ken, 242-8502, Japan" contact "" -email "bug-glibc@gnu.org" +email "bug-glibc@gnu.org, sebol@ikhlas.com" tel "" fax "" language "Malay" territory "Malaysia" revision "0.92b" -date "2000,September,4 (XML source:2000,July,20)" +date "2001, December, 10" % category "ms_MY:2000";LC_IDENTIFICATION category "ms_MY:2000";LC_CTYPE @@ -47,11 +48,11 @@ END LC_COLLATE LC_MONETARY % This is the POSIX Locale definition the LC_MONETARY category % generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file +% These are generated based on XML base Locale defintion file % for IBM Class for Unicode. % int_curr_symbol "<U004D><U0059><U0052><U0020>" -currency_symbol "<U0052>" +currency_symbol "<U0052><U004D>" mon_decimal_point "<U002E>" mon_thousands_sep "<U002C>" mon_grouping 3 @@ -72,7 +73,7 @@ END LC_MONETARY LC_NUMERIC % This is the POSIX Locale definition for the LC_NUMERIC category % generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file +% These are generated based on XML base Locale defintion file % for IBM Class for Unicode. % decimal_point "<U002E>" @@ -85,18 +86,18 @@ END LC_NUMERIC LC_TIME % This is the POSIX Locale definition for the LC_TIME category % generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale difintion file +% These are generated based on XML base Locale difintion file % for IBM Class for Unicode. % % Abbreviated weekday names (%a) -abday "<U0041><U0068><U0061>";"<U0049><U0073><U006E>";/ +abday "<U0041><U0068><U0064>";"<U0049><U0073><U006E>";/ "<U0053><U0065><U006C>";"<U0052><U0061><U0062>";/ "<U004B><U0068><U0061>";"<U004A><U0075><U006D>";/ "<U0053><U0061><U0062>" % % Full weekday names (%A) day "<U0041><U0068><U0061><U0064>";"<U0049><U0073><U006E><U0069><U006E>";/ - "<U0053><U0065><U006C><U0061><U0073><U0061>";"<U0052><U0061><U0068><U0062>";/ + "<U0053><U0065><U006C><U0061><U0073><U0061>";"<U0052><U0061><U0062><U0075";/ "<U004B><U0068><U0061><U006D><U0069><U0073>";"<U004A><U0075><U006D><U0061><U0061><U0074>";/ "<U0053><U0061><U0062><U0074><U0075>" % @@ -116,22 +117,22 @@ mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0069>";"<U0046><U0065>< "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";"<U004F><U006B><U0074><U006F><U0062><U0065><U0072>";/ "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";"<U0044><U0069><U0073><U0065><U006D><U0062><U0065><U0072>" % -% Equivalent of AM PM +% Equivalent of AM PM am_pm "";"" % -% Appropriate date and time representation +% Appropriate date and time representation % %A %d %b %Y %I:%M:%S %Z d_t_fmt "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>" % -% Appropriate date representation +% Appropriate date representation % %A %d %b %Y d_fmt "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059>" % -% Appropriate time representation +% Appropriate time representation % %I:%M:%S %Z t_fmt "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0020><U0025><U005A>" % -% Appropriate 12 h time representation (%r) +% Appropriate 12 h time representation (%r) t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>" % END LC_TIME @@ -146,22 +147,22 @@ LC_MESSAGES % ^[yY] yesexpr "<U005E><U005B><U0079><U0059><U005D>" -% Syntax on Unicode Regular Expression Guidelines TR#18 +% Syntax on Unicode Regular Expression Guidelines TR#18 % yesexpr "<U005E><U005B><U0079><U0059><U005D>" % -% ^[nN] -noexpr "<U005E><U005B><U006E><U004E><U005D>" +% ^[nN] --> ^[tT] +noexpr "<U005E><U005B><U0074><U0054><U005D>" -% Syntax on Unicode Regular Expression Guidelines TR#18 +% Syntax on Unicode Regular Expression Guidelines TR#18 % noexpr "<U005E><U005B><U006E><U004E><U005D>" % -% Yes -yesstr "<U0059><U0065><U0073>" +% Yes Ya +yesstr "<U0059><U0061>" % -% No -nostr "<U004E><U006F>" +% No Tidak +nostr "<U0054><U0069><U0064><U0061><U006B>" % END LC_MESSAGES @@ -176,16 +177,14 @@ END LC_PAPER LC_NAME -% This is the ISO_IEC TR14652 Locale definition for the LC_NAME category -% generated by IBM Basic CountryPack Transformer. -% -% +% Edited By Hand by Hasbullah Pit <sebol@ikhlas.com> +% name_mr = Encik, name_mrs = Puan , name_miss = Cik name_ms= Cik/Puan name_fmt "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>" name_gen "" -name_mr "<U004D><U0072><U002E>" -name_mrs "<U004D><U0072><U0073><U002E>" -name_miss "<U004D><U0069><U0073><U0073><U002E>" -name_ms "<U004D><U0073><U002E>" +name_mr "<U0045><U0065><U0063><U0069><U006B>" +name_mrs "<U0050><U0075><U0061><U006E>" +name_miss "<U0063><U0069><U006B>" +name_ms "<U0063><U0069><U006B><U002F><U0050><U0075><U0061><U006E>" END LC_NAME @@ -202,6 +201,7 @@ LC_TELEPHONE % This is the ISO_IEC TR14652 Locale definition for the LC_TELEPHONE % generated by IBM Basic CountryPack Transformer. tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020><U003B><U0025><U006C>" +int_prefix "<U0036><U0030>" END LC_TELEPHONE @@ -212,5 +212,3 @@ LC_MEASUREMENT measurement 1 END LC_MEASUREMENT - - diff --git a/po/ca.po b/po/ca.po index 8a26292686..d5a0f6e786 100644 --- a/po/ca.po +++ b/po/ca.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: libc 2.2.4\n" "POT-Creation-Date: 2001-08-13 15:08-0700\n" -"PO-Revision-Date: 2001-11-11 01:31+01:00\n" +"PO-Revision-Date: 2001-12-02 20:32+01:00\n" "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n" "Language-Team: Catalan <ca@dodds.net>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" #: locale/programs/ld-monetary.c:278 @@ -430,7 +430,7 @@ msgstr "%s: S'ha especificat l'opció -y més d'una volta\n" #: argp/argp-parse.c:646 #, c-format msgid "%s: Too many arguments\n" -msgstr "%s: Massa arguments\n" +msgstr "%s: Sobren arguments\n" #: locale/programs/ld-collate.c:457 locale/programs/ld-collate.c:483 #: locale/programs/ld-collate.c:499 @@ -633,7 +633,7 @@ msgstr "%s: fem al final de la data d'acabament de la cadena %Zd del camp «era»" #: posix/getopt.c:788 #, c-format msgid "%s: illegal option -- %c\n" -msgstr "%s: l'opció no és permesa -- %c\n" +msgstr "%s: no es permet l'opció «%c»\n" #: locale/programs/ld-address.c:578 locale/programs/ld-collate.c:3738 #: locale/programs/ld-ctype.c:2846 locale/programs/ld-identification.c:445 @@ -669,7 +669,7 @@ msgstr "%s: el nombre de regles d'ordenació no és vàlid" #: posix/getopt.c:791 #, c-format msgid "%s: invalid option -- %c\n" -msgstr "%s: l'opció no és vàlida -- %c\n" +msgstr "%s: l'opció «%c» no és vàlida\n" #: locale/programs/ld-time.c:330 #, c-format @@ -785,7 +785,7 @@ msgstr "%s: l'opció «-W %s» és ambígua\n" #: posix/getopt.c:821 posix/getopt.c:951 #, c-format msgid "%s: option requires an argument -- %c\n" -msgstr "%s: l'opció necessita un argument -- %c\n" +msgstr "%s: l'opció «%c» necessita un argument\n" #: locale/programs/ld-collate.c:1327 locale/programs/ld-collate.c:3675 #, c-format @@ -911,22 +911,22 @@ msgstr "%s: el tercer operand del valor del camp «%s» no ha de ser major que %d" #: locale/programs/ld-time.c:983 #, c-format msgid "%s: too few values for field `%s'" -msgstr "%s: el camp «%s» té massa pocs valors" +msgstr "%s: manquen valors en el camp «%s»" #: locale/programs/ld-collate.c:555 #, c-format msgid "%s: too many rules; first entry only had %d" -msgstr "%s: hi ha massa regles; la primera entrada només en tenia %d" +msgstr "%s: sobren regles; la primera entrada només en tenia %d" #: locale/programs/ld-collate.c:906 #, c-format msgid "%s: too many values" -msgstr "%s: hi ha massa valors" +msgstr "%s: sobren valors" #: locale/programs/ld-time.c:1030 #, c-format msgid "%s: too many values for field `%s'" -msgstr "%s: el camp «%s» té massa valors" +msgstr "%s: sobren valors en el camp «%s»" #: locale/programs/ld-ctype.c:3641 #, c-format @@ -1604,7 +1604,7 @@ msgstr "La màquina remota ha reiniciat la connexió" #: stdio-common/../sysdeps/gnu/errlist.c:446 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:175 msgid "Connection timed out" -msgstr "El temps de connexió ha expirat" +msgstr "La connexió ha expirat" #: stdio-common/../sysdeps/unix/siglist.c:45 sysdeps/generic/siglist.h:45 msgid "Continued" @@ -1836,7 +1836,7 @@ msgstr "Els tipus d'entrada i taula no concorden" #: nss/getent.c:127 nss/getent.c:292 #, c-format msgid "Enumeration not supported on %s\n" -msgstr "L'enumeració sobre «%s» no és suportada\n" +msgstr "No es suporta l'enumeració sobre «%s»\n" #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:30 msgid "Error 0" @@ -3051,11 +3051,11 @@ msgstr "Prefix opcional dels fitxers d'eixida" #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:93 msgid "Out of stream resources" -msgstr "No queden recursos del tipus flux" +msgstr "No resten recursos del tipus flux" #: stdio-common/../sysdeps/gnu/errlist.c:665 msgid "Out of streams resources" -msgstr "No queden recursos del tipus flux" +msgstr "No resten recursos del tipus flux" #: iconv/iconv_prog.c:64 locale/programs/localedef.c:99 msgid "Output control:" @@ -3620,7 +3620,7 @@ msgid "" msgstr "" "Directori del sistema de mapes de caràcters: %s\n" " mapes de repertori: %s\n" -" camí dels locales : %s\n" +" camí als locales : %s\n" "%s" #: nscd/nscd.c:90 @@ -3693,7 +3693,7 @@ msgstr "Cadena amb el títol a usar en el gràfic d'eixida" #: nis/nis_error.c:56 msgid "Too many attributes" -msgstr "Hi ha massa atributs" +msgstr "Sobren atributs" #. TRANS Too many levels of symbolic links were encountered in looking up a file name. #. TRANS This often indicates a cycle of symbolic links. @@ -5405,7 +5405,7 @@ msgstr "desbordament de l'hora" #: locale/programs/ld-ctype.c:1554 locale/programs/ld-ctype.c:2030 #, c-format msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>" -msgstr "el valor final <U%0*X> del rang és menor que el d'inici <U%0*X>" +msgstr "el valor final <U%0*X> del rang és menor que l'inicial <U%0*X>" #: locale/programs/ld-ctype.c:1688 msgid "to-value character sequence is smaller than from-value sequence" @@ -5413,11 +5413,11 @@ msgstr "la seqüència de caràcters final és menor que la seqüència inicial" #: locale/programs/charmap.c:556 msgid "too few bytes in character encoding" -msgstr "hi ha massa pocs octets en la codificació del caràcter" +msgstr "manquen octets en la codificació del caràcter" #: locale/programs/charmap.c:558 msgid "too many bytes in character encoding" -msgstr "hi ha massa octets en la codificació del caràcter" +msgstr "sobren octets en la codificació del caràcter" #: timezone/zic.c:1874 msgid "too many leap seconds" diff --git a/posix/globtest.sh b/posix/globtest.sh index b85a8e529b..a57c49f872 100755 --- a/posix/globtest.sh +++ b/posix/globtest.sh @@ -559,9 +559,7 @@ ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \ ${common_objpfx}posix/globtest -c "$testdir" "*/blahblah" | sort > $testout cat <<"EOF" | cmp - $testout >> $logfile || failed=1 -`dir1/blahblah' -`dir2/blahblah' -`noread/blahblah' +`*/blahblah' EOF if test $failed -ne 0; then echo "No check2 test failed" >> $logfile diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c index a17a4c45df..5232054a9f 100644 --- a/sysdeps/generic/glob.c +++ b/sysdeps/generic/glob.c @@ -953,18 +953,11 @@ glob (pattern, flags, errfunc, pglob) /* No matches. */ if (flags & GLOB_NOCHECK) { - size_t filename_len = strlen (filename) + 1; - char **new_pathv; int newcount = pglob->gl_pathc + pglob->gl_offs; - struct stat st; -#ifdef HAVE_STAT64 - struct stat64 st64; -#endif - /* This is an pessimistic guess about the size. */ pglob->gl_pathv = (char **) realloc (pglob->gl_pathv, - (newcount + dirs.gl_pathc + 1) + (newcount + 2) * sizeof (char *)); if (pglob->gl_pathv == NULL) { @@ -972,53 +965,19 @@ glob (pattern, flags, errfunc, pglob) return GLOB_NOSPACE; } - for (i = 0; i < dirs.gl_pathc; ++i) + pglob->gl_pathv[newcount] = __strdup (pattern); + if (pglob->gl_pathv[newcount] == NULL) { - const char *dir = dirs.gl_pathv[i]; - size_t dir_len = strlen (dir); - - /* First check whether this really is a directory. */ - if (((flags & GLOB_ALTDIRFUNC) - ? ((*pglob->gl_stat) (dir, &st) != 0 - || !S_ISDIR (st.st_mode)) - : (__stat64 (dir, &st64) != 0 - || !S_ISDIR (st64.st_mode)))) - /* No directory, ignore this entry. */ - continue; - - pglob->gl_pathv[newcount] = malloc (dir_len + 1 - + filename_len); - if (pglob->gl_pathv[newcount] == NULL) - { - globfree (&dirs); - globfree (pglob); - return GLOB_NOSPACE; - } - -#ifdef HAVE_MEMPCPY - mempcpy (mempcpy (mempcpy (pglob->gl_pathv[newcount], - dir, dir_len), - "/", 1), - filename, filename_len); -#else - memcpy (pglob->gl_pathv[newcount], dir, dir_len); - pglob->gl_pathv[newcount][dir_len] = '/'; - memcpy (&pglob->gl_pathv[newcount][dir_len + 1], - filename, filename_len); -#endif - ++pglob->gl_pathc; - ++newcount; + globfree (&dirs); + globfree (pglob); + return GLOB_NOSPACE; } + ++pglob->gl_pathc; + ++newcount; + pglob->gl_pathv[newcount] = NULL; pglob->gl_flags = flags; - - /* Now we know how large the gl_pathv vector must be. */ - new_pathv = (char **) realloc (pglob->gl_pathv, - ((newcount + 1) - * sizeof (char *))); - if (new_pathv != NULL) - pglob->gl_pathv = new_pathv; } else { |