diff options
-rw-r--r-- | ChangeLog | 37 | ||||
-rw-r--r-- | localedata/ChangeLog | 17 | ||||
-rw-r--r-- | localedata/locales/as_IN | 558 | ||||
-rw-r--r-- | localedata/locales/iso14651_t1_common | 225 | ||||
-rw-r--r-- | localedata/locales/kok_IN | 209 | ||||
-rw-r--r-- | localedata/locales/ta_IN | 93 | ||||
-rw-r--r-- | misc/getusershell.c | 4 | ||||
-rw-r--r-- | stdlib/setenv.c | 94 | ||||
-rw-r--r-- | sysdeps/ia64/memchr.S | 26 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c | 20 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c | 18 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h | 14 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/Versions | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sys/mount.h | 41 |
14 files changed, 637 insertions, 723 deletions
@@ -1,3 +1,40 @@ +2010-02-05 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #11230] + * sysdeps/ia64/memchr.S: Don't read beyond the last byte + during recovery. + +2010-01-26 Andreas Schwab <schwab@redhat.com> + + * sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c: Use internal + interface. + * sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h: Declare internal + utmpx interface. + + * sysdeps/unix/sysv/linux/sparc/Versions: Add new errlist compat + entry for 2.12. + +2010-02-03 Ulrich Drepper <drepper@redhat.com> + + [BZ #11235] + * sysdeps/unix/sysv/linux/sys/mount.h: Remove S_WRITE, S_APPEND, + S_IMMUTABLE. Add MS_DIRSYNC, MS_MOVE, MS_SILENT, MS_REC, + MS_POSIXACL, MS_UNBINDABLE, MS_PRIVATE, MS_SLAVE, MS_SHARED, + MS_RELATIME, MS_KERNMOUNT, MS_I_VERSION, MS_STRICTATIME, + MS_ACTIVE, and MS_NOUSER. + (MS_RMT_MASK): Update according to current kernels. + + [BZ #11242] + * misc/getusershell.c (initshells): Allocate one more byte in input + buffer so that fgets doesn't loop undefinitely. + +2010-02-02 Ulrich Drepper <drepper@redhat.com> + + * stdlib/setenv.c (__add_to_environ): Don't use alloca if + __libc_use_alloca tells us not to. Fix memory leak in an error + situation. Based partially on patch by Jim Meyering. + 2010-01-26 Samuel Thibault <samuel.thibault@ens-lyon.org> * sysdeps/mach/getsysstats.c (get_nprocs_conf, get_nprocs, diff --git a/localedata/ChangeLog b/localedata/ChangeLog index e2f26deecd..cc47bbaf70 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,20 @@ +2010-02-03 Ulrich Drepper <drepper@redhat.com> + + [BZ #10414] + * locales/iso14651_t1_common: Fix sorting of malayalam letter 'na'. + Patch by Pravin Satpute <psatpute@redhat.com>. + + * locales/kok_IN: New file. + Contributed by Pravin Satpute <psatpute@redhat.com> and + Shailendra Bandodkar <sbandodk@redhat.com>. + + * locales/ta_IN: Move collation data... + * locales/iso14651_t1_common: ...here. + Patch by Pravin Satpute <psatpute@redhat.com>. + + * locales/as_IN: Use iso14651_t1 instead of local collation data. + Patch by Pravin Satpute <psatpute@redhat.com>. + 2010-01-25 Andreas Schwab <schwab@redhat.com> * locales/i18n: Don't map U00DF to U1E9E in toupper table. diff --git a/localedata/locales/as_IN b/localedata/locales/as_IN index 6fbd66ee2f..5c2b5bdfb9 100644 --- a/localedata/locales/as_IN +++ b/localedata/locales/as_IN @@ -38,563 +38,9 @@ END LC_CTYPE %%%%%%%%%%%%% LC_COLLATE -% Define collation weights as symbols -collating-symbol <X0001> -collating-symbol <X0005> -collating-symbol <X000D> -collating-symbol <X001D> -collating-symbol <X0031> -collating-symbol <X0041> -collating-symbol <X0086> -collating-symbol <X0087> -collating-symbol <X008F> -collating-symbol <X00C0> -collating-symbol <X00D7> -collating-symbol <X00D8> -collating-symbol <X00E1> -collating-symbol <X00E9> -collating-symbol <X00F9> -collating-symbol <X0507> -collating-symbol <X0509> -collating-symbol <X050B> -collating-symbol <X050D> -collating-symbol <X050F> -collating-symbol <X0600> -collating-symbol <X0764> -collating-symbol <X076A> -collating-symbol <X0782> -collating-symbol <X078E> -collating-symbol <X07AA> -collating-symbol <X07C0> -collating-symbol <X07C6> -collating-symbol <X07EE> -collating-symbol <X07F6> -collating-symbol <X080B> -collating-symbol <X083F> -collating-symbol <X084D> -collating-symbol <X0861> -collating-symbol <X0863> -collating-symbol <X0865> -collating-symbol <X0867> -collating-symbol <X0869> -collating-symbol <X086B> -collating-symbol <X08DF> -collating-symbol <X08E1> -collating-symbol <X08E9> -collating-symbol <X08ED> -collating-symbol <X08EF> -collating-symbol <X08F5> -collating-symbol <X08F7> -collating-symbol <X09F7> -collating-symbol <X0BB3> -collating-symbol <X0BBB> -collating-symbol <X0BBD> -collating-symbol <X0BBF> -collating-symbol <X0BC3> -collating-symbol <X0BC9> -collating-symbol <X1FB5> -collating-symbol <X1FB7> -collating-symbol <X233C> -collating-symbol <X2342> -collating-symbol <X2344> -collating-symbol <X2370> -collating-symbol <X2372> -collating-symbol <X2374> -collating-symbol <X2376> -collating-symbol <X2378> -collating-symbol <X237A> -collating-symbol <X237C> -collating-symbol <X237E> -collating-symbol <X2380> -collating-symbol <X2382> -collating-symbol <X2600> -collating-symbol <X2800> -collating-symbol <X2A00> -collating-symbol <X2C00> -collating-symbol <X2E00> -collating-symbol <X3000> -collating-symbol <X3200> -collating-symbol <X3400> -collating-symbol <X3600> -collating-symbol <X3800> -collating-symbol <X3A00> -collating-symbol <X3C00> -collating-symbol <X3E00> -collating-symbol <X4000> -collating-symbol <X4200> -collating-symbol <X4400> -collating-symbol <X4600> -collating-symbol <X4800> -collating-symbol <X4A00> -collating-symbol <X4C00> -collating-symbol <X4E00> -collating-symbol <X5000> -collating-symbol <X5200> -collating-symbol <X5400> -collating-symbol <X5600> -collating-symbol <X5800> -collating-symbol <X6820> -collating-symbol <X6822> -collating-symbol <X6824> -collating-symbol <X6826> -collating-symbol <X6828> -collating-symbol <X682A> -collating-symbol <X682C> -collating-symbol <X682E> -collating-symbol <X6830> -collating-symbol <X6832> -collating-symbol <X6834> -collating-symbol <X6836> -collating-symbol <X6838> -collating-symbol <X683A> -collating-symbol <X683C> -collating-symbol <X683E> -collating-symbol <X6840> -collating-symbol <X6842> -collating-symbol <X6844> -collating-symbol <X6846> -collating-symbol <X6848> -collating-symbol <X684A> -collating-symbol <X684C> -collating-symbol <X684E> -collating-symbol <X6850> -collating-symbol <X6852> -collating-symbol <X6854> -collating-symbol <X6856> -collating-symbol <X6858> -collating-symbol <X685A> -collating-symbol <X685C> -collating-symbol <X685E> -collating-symbol <X6860> -collating-symbol <X6862> -collating-symbol <X6864> -collating-symbol <X6866> -collating-symbol <X6868> -collating-symbol <X686A> -collating-symbol <X686C> -collating-symbol <X686E> -collating-symbol <X6870> -collating-symbol <X6872> -collating-symbol <X6874> -collating-symbol <X6876> -collating-symbol <X6878> -collating-symbol <X687A> -collating-symbol <X687C> -collating-symbol <X687E> -collating-symbol <X6880> -collating-symbol <X6882> -collating-symbol <X6884> -collating-symbol <X6886> -collating-symbol <X6888> -collating-symbol <X688A> -collating-symbol <X688C> -collating-symbol <X688E> -collating-symbol <X6890> -collating-symbol <X6892> -collating-symbol <X6894> -collating-symbol <X6896> -collating-symbol <X6898> -collating-symbol <X689A> -collating-symbol <X689C> -collating-symbol <X689E> -collating-symbol <X6B20> -collating-symbol <XE2E9> +% Copy the template from ISO/IEC 14651 +copy "iso14651_t1" -order_start forward;forward;forward;forward - - -% collation weights in order - -<X0001> -<X0005> -<X000D> -<X001D> -<X0031> -<X0041> -<X0086> -<X0087> -<X008F> -<X00C0> -<X00D7> -<X00D8> -<X00E1> -<X00E9> -<X00F9> -<X0507> -<X0509> -<X050B> -<X050D> -<X050F> -<X0600> -<X0764> -<X076A> -<X0782> -<X078E> -<X07AA> -<X07C0> -<X07C6> -<X07EE> -<X07F6> -<X080B> -<X083F> -<X084D> -<X0861> -<X0863> -<X0865> -<X0867> -<X0869> -<X086B> -<X08DF> -<X08E1> -<X08E9> -<X08ED> -<X08EF> -<X08F5> -<X08F7> -<X09F7> -<X0BB3> -<X0BBB> -<X0BBD> -<X0BBF> -<X0BC3> -<X0BC9> -<X1FB5> -<X1FB7> -<X233C> -<X2342> -<X2344> -<X2370> -<X2372> -<X2374> -<X2376> -<X2378> -<X237A> -<X237C> -<X237E> -<X2380> -<X2382> -<X2600> -<X2800> -<X2A00> -<X2C00> -<X2E00> -<X3000> -<X3200> -<X3400> -<X3600> -<X3800> -<X3A00> -<X3C00> -<X3E00> -<X4000> -<X4200> -<X4400> -<X4600> -<X4800> -<X4A00> -<X4C00> -<X4E00> -<X5000> -<X5200> -<X5400> -<X5600> -<X5800> -<X6820> -<X6822> -<X6824> -<X6826> -<X6828> -<X682A> -<X682C> -<X682E> -<X6830> -<X6832> -<X6834> -<X6836> -<X6838> -<X683A> -<X683C> -<X683E> -<X6840> -<X6842> -<X6844> -<X6846> -<X6848> -<X684A> -<X684C> -<X684E> -<X6850> -<X6852> -<X6854> -<X6856> -<X6858> -<X685A> -<X685C> -<X685E> -<X6860> -<X6862> -<X6864> -<X6866> -<X6868> -<X686A> -<X686C> -<X686E> -<X6870> -<X6872> -<X6874> -<X6876> -<X6878> -<X687A> -<X687C> -<X687E> -<X6880> -<X6882> -<X6884> -<X6886> -<X6888> -<X688A> -<X688C> -<X688E> -<X6890> -<X6892> -<X6894> -<X6896> -<X6898> -<X689A> -<X689C> -<X689E> -<X6B20> -<XE2E9> - -% assignment of characters to weights - -<U000F> IGNORE;IGNORE;IGNORE;<U000F> -<U001E> IGNORE;IGNORE;IGNORE;<U001E> -<U0008> IGNORE;IGNORE;IGNORE;<U0008> -<U0017> IGNORE;IGNORE;IGNORE;<U0017> -<U001F> IGNORE;IGNORE;IGNORE;<U001F> -<U0010> IGNORE;IGNORE;IGNORE;<U0010> -<U0007> IGNORE;IGNORE;IGNORE;<U0007> -<U0016> IGNORE;IGNORE;IGNORE;<U0016> -<U200D> IGNORE;IGNORE;IGNORE;<U200D> -<U0015> IGNORE;IGNORE;IGNORE;<U0015> -<U0006> IGNORE;IGNORE;IGNORE;<U0006> -<U0001> IGNORE;IGNORE;IGNORE;<U0001> -<U001D> IGNORE;IGNORE;IGNORE;<U001D> -<U000E> IGNORE;IGNORE;IGNORE;<U000E> -<U0018> IGNORE;IGNORE;IGNORE;<U0018> -<U200C> IGNORE;IGNORE;IGNORE;<U200C> -<U0004> IGNORE;IGNORE;IGNORE;<U0004> -<U0013> IGNORE;IGNORE;IGNORE;<U0013> -<U001A> IGNORE;IGNORE;IGNORE;<U001A> -<U007F> IGNORE;IGNORE;IGNORE;<U007F> -<U0012> IGNORE;IGNORE;IGNORE;<U0012> -<U0003> IGNORE;IGNORE;IGNORE;<U0003> -<U001B> IGNORE;IGNORE;IGNORE;<U001B> -<U0011> IGNORE;IGNORE;IGNORE;<U0011> -<U0002> IGNORE;IGNORE;IGNORE;<U0002> -<U001C> IGNORE;IGNORE;IGNORE;<U001C> -<U0014> IGNORE;IGNORE;IGNORE;<U0014> -<U0019> IGNORE;IGNORE;IGNORE;<U0019> -<U0005> IGNORE;IGNORE;IGNORE;<U0005> -<U0000> IGNORE;IGNORE;IGNORE;<U0000> -<U09BC> IGNORE;"<X00D7><X00E9>";"<X0005><X00C0>";IGNORE -<U0981> IGNORE;"<X00D7><X00F9>";"<X0005><X00C0>";IGNORE -<U0982> IGNORE;"<X00D8><X000D>";"<X0005><X00C0>";IGNORE -<U0983> IGNORE;"<X00D8><X001D>";"<X0005><X00C0>";IGNORE -<U0009> <X0507>;<X0005>;<X0005>;IGNORE -<U000A> <X0509>;<X0005>;<X0005>;IGNORE -<U000B> <X050B>;<X0005>;<X0005>;IGNORE -<U000C> <X050D>;<X0005>;<X0005>;IGNORE -<U000D> <X050F>;<X0005>;<X0005>;IGNORE -<U0020> <X0600>;<X0005>;<X0005>;IGNORE -<U0060> <X0764>;<X0005>;<X0005>;IGNORE -<U005E> <X076A>;<X0005>;<X0005>;IGNORE -<U005F> <X0782>;<X0005>;<X0005>;IGNORE -<U002D> <X078E>;<X0005>;<X0005>;IGNORE -<U002C> <X07AA>;<X0005>;<X0005>;IGNORE -<U003B> <X07C0>;<X0005>;<X0005>;IGNORE -<U003A> <X07C6>;<X0005>;<X0005>;IGNORE -<U0021> <X07EE>;<X0005>;<X0005>;IGNORE -<U003F> <X07F6>;<X0005>;<X0005>;IGNORE -<U002E> <X080B>;<X0005>;<X0005>;IGNORE -<U0027> <X083F>;<X0005>;<X0005>;IGNORE -<U0022> <X084D>;<X0005>;<X0005>;IGNORE -<U0028> <X0861>;<X0005>;<X0005>;IGNORE -<U0029> <X0863>;<X0005>;<X0005>;IGNORE -<U005B> <X0865>;<X0005>;<X0005>;IGNORE -<U005D> <X0867>;<X0005>;<X0005>;IGNORE -<U007B> <X0869>;<X0005>;<X0005>;IGNORE -<U007D> <X086B>;<X0005>;<X0005>;IGNORE -<U0040> <X08DF>;<X0005>;<X0005>;IGNORE -<U002A> <X08E1>;<X0005>;<X0005>;IGNORE -<U002F> <X08E9>;<X0005>;<X0005>;IGNORE -<U005C> <X08ED>;<X0005>;<X0005>;IGNORE -<U0026> <X08EF>;<X0005>;<X0005>;IGNORE -<U0023> <X08F5>;<X0005>;<X0005>;IGNORE -<U0025> <X08F7>;<X0005>;<X0005>;IGNORE -<U09FA> <X09F7>;<X0005>;<X0005>;IGNORE -<U002B> <X0BB3>;<X0005>;<X0005>;IGNORE -<U003C> <X0BBB>;<X0005>;<X0005>;IGNORE -<U003D> <X0BBD>;<X0005>;<X0005>;IGNORE -<U003E> <X0BBF>;<X0005>;<X0005>;IGNORE -<U007C> <X0BC3>;<X0005>;<X0005>;IGNORE -<U007E> <X0BC9>;<X0005>;<X0005>;IGNORE -<U09F8> <X1FB5>;<X0005>;<X0005>;IGNORE -<U09F9> <X1FB7>;<X0005>;<X0005>;IGNORE -<U0024> <X233C>;<X0005>;<X0005>;IGNORE -<U09F2> <X2342>;<X0005>;<X0005>;IGNORE -<U09F3> <X2344>;<X0005>;<X0005>;IGNORE -<U0030> <X2370>;<X0005>;<X0005>;IGNORE -<U09E6> <X2370>;"<X0005><X00E1><X0031>";"<X0005><X0005><X00C0>";IGNORE -<U0031> <X2372>;<X0005>;<X0005>;IGNORE -<U09E7> <X2372>;"<X0005><X00E1><X0031>";"<X0005><X0005><X00C0>";IGNORE -<U09F4> <X2372>;"<X0005><X00E1><X0041>";"<X0005><X0005><X00C0>";IGNORE -<U0032> <X2374>;<X0005>;<X0005>;IGNORE -<U09E8> <X2374>;"<X0005><X00E1><X0031>";"<X0005><X0005><X00C0>";IGNORE -<U09F5> <X2374>;"<X0005><X00E1><X0041>";"<X0005><X0005><X00C0>";IGNORE -<U0033> <X2376>;<X0005>;<X0005>;IGNORE -<U09E9> <X2376>;"<X0005><X00E1><X0031>";"<X0005><X0005><X00C0>";IGNORE -<U09F6> <X2376>;"<X0005><X00E1><X0041>";"<X0005><X0005><X00C0>";IGNORE -<U0034> <X2378>;<X0005>;<X0005>;IGNORE -<U09EA> <X2378>;"<X0005><X00E1><X0031>";"<X0005><X0005><X00C0>";IGNORE -<U09F7> <X2378>;"<X0005><X00E1><X0041>";"<X0005><X0005><X00C0>";IGNORE -<U0035> <X237A>;<X0005>;<X0005>;IGNORE -<U09EB> <X237A>;"<X0005><X00E1><X0031>";"<X0005><X0005><X00C0>";IGNORE -<U0036> <X237C>;<X0005>;<X0005>;IGNORE -<U09EC> <X237C>;"<X0005><X00E1><X0031>";"<X0005><X0005><X00C0>";IGNORE -<U0037> <X237E>;<X0005>;<X0005>;IGNORE -<U09ED> <X237E>;"<X0005><X00E1><X0031>";"<X0005><X0005><X00C0>";IGNORE -<U0038> <X2380>;<X0005>;<X0005>;IGNORE -<U09EE> <X2380>;"<X0005><X00E1><X0031>";"<X0005><X0005><X00C0>";IGNORE -<U0039> <X2382>;<X0005>;<X0005>;IGNORE -<U09EF> <X2382>;"<X0005><X00E1><X0031>";"<X0005><X0005><X00C0>";IGNORE -<U0061> <X2600>;<X0005>;<X0005>;IGNORE -<U0041> <X2600>;<X0005>;<X008F>;IGNORE -<U00E6> "<X2600><X2E00>";"<X0087><X0005>";"<X0005><X0005>";IGNORE -<U00C6> "<X2600><X2E00>";"<X0087><X0005>";"<X0086><X0005>";IGNORE -<U0062> <X2800>;<X0005>;<X0005>;IGNORE -<U0042> <X2800>;<X0005>;<X008F>;IGNORE -<U0063> <X2A00>;<X0005>;<X0005>;IGNORE -<U0043> <X2A00>;<X0005>;<X008F>;IGNORE -<U0064> <X2C00>;<X0005>;<X0005>;IGNORE -<U0044> <X2C00>;<X0005>;<X008F>;IGNORE -<U0065> <X2E00>;<X0005>;<X0005>;IGNORE -<U0045> <X2E00>;<X0005>;<X008F>;IGNORE -<U0066> <X3000>;<X0005>;<X0005>;IGNORE -<U0046> <X3000>;<X0005>;<X008F>;IGNORE -<U0067> <X3200>;<X0005>;<X0005>;IGNORE -<U0047> <X3200>;<X0005>;<X008F>;IGNORE -<U0068> <X3400>;<X0005>;<X0005>;IGNORE -<U0048> <X3400>;<X0005>;<X008F>;IGNORE -<U0069> <X3600>;<X0005>;<X0005>;IGNORE -<U0049> <X3600>;<X0005>;<X008F>;IGNORE -<U006A> <X3800>;<X0005>;<X0005>;IGNORE -<U004A> <X3800>;<X0005>;<X008F>;IGNORE -<U006B> <X3A00>;<X0005>;<X0005>;IGNORE -<U004B> <X3A00>;<X0005>;<X008F>;IGNORE -<U006C> <X3C00>;<X0005>;<X0005>;IGNORE -<U004C> <X3C00>;<X0005>;<X008F>;IGNORE -<U006D> <X3E00>;<X0005>;<X0005>;IGNORE -<U004D> <X3E00>;<X0005>;<X008F>;IGNORE -<U006E> <X4000>;<X0005>;<X0005>;IGNORE -<U004E> <X4000>;<X0005>;<X008F>;IGNORE -<U006F> <X4200>;<X0005>;<X0005>;IGNORE -<U004F> <X4200>;<X0005>;<X008F>;IGNORE -<U0070> <X4400>;<X0005>;<X0005>;IGNORE -<U0050> <X4400>;<X0005>;<X008F>;IGNORE -<U0071> <X4600>;<X0005>;<X0005>;IGNORE -<U0051> <X4600>;<X0005>;<X008F>;IGNORE -<U0072> <X4800>;<X0005>;<X0005>;IGNORE -<U0052> <X4800>;<X0005>;<X008F>;IGNORE -<U0073> <X4A00>;<X0005>;<X0005>;IGNORE -<U0053> <X4A00>;<X0005>;<X008F>;IGNORE -<U0074> <X4C00>;<X0005>;<X0005>;IGNORE -<U0054> <X4C00>;<X0005>;<X008F>;IGNORE -<U0075> <X4E00>;<X0005>;<X0005>;IGNORE -<U0055> <X4E00>;<X0005>;<X008F>;IGNORE -<U0076> <X5000>;<X0005>;<X0005>;IGNORE -<U0056> <X5000>;<X0005>;<X008F>;IGNORE -<U0077> <X5200>;<X0005>;<X0005>;IGNORE -<U0057> <X5200>;<X0005>;<X008F>;IGNORE -<U0078> <X5400>;<X0005>;<X0005>;IGNORE -<U0058> <X5400>;<X0005>;<X008F>;IGNORE -<U0079> <X5600>;<X0005>;<X0005>;IGNORE -<U0059> <X5600>;<X0005>;<X008F>;IGNORE -<U007A> <X5800>;<X0005>;<X0005>;IGNORE -<U005A> <X5800>;<X0005>;<X008F>;IGNORE -<U0985> <X6820>;<X0005>;<X0005>;IGNORE -<U0986> <X6822>;<X0005>;<X0005>;IGNORE -<U0987> <X6824>;<X0005>;<X0005>;IGNORE -<U0988> <X6826>;<X0005>;<X0005>;IGNORE -<U0989> <X6828>;<X0005>;<X0005>;IGNORE -<U098A> <X682A>;<X0005>;<X0005>;IGNORE -<U098B> <X682C>;<X0005>;<X0005>;IGNORE -<U09E0> <X682E>;<X0005>;<X0005>;IGNORE -<U098C> <X6830>;<X0005>;<X0005>;IGNORE -<U09E1> <X6832>;<X0005>;<X0005>;IGNORE -<U098F> <X6834>;<X0005>;<X0005>;IGNORE -<U0990> <X6836>;<X0005>;<X0005>;IGNORE -<U0993> <X6838>;<X0005>;<X0005>;IGNORE -<U0994> <X683A>;<X0005>;<X0005>;IGNORE -<U0995> <X683C>;<X0005>;<X0005>;IGNORE -<U0996> <X683E>;<X0005>;<X0005>;IGNORE -<U0997> <X6840>;<X0005>;<X0005>;IGNORE -<U0998> <X6842>;<X0005>;<X0005>;IGNORE -<U0999> <X6844>;<X0005>;<X0005>;IGNORE -<U099A> <X6846>;<X0005>;<X0005>;IGNORE -<U099B> <X6848>;<X0005>;<X0005>;IGNORE -<U099C> <X684A>;<X0005>;<X0005>;IGNORE -<U099D> <X684C>;<X0005>;<X0005>;IGNORE -<U099E> <X684E>;<X0005>;<X0005>;IGNORE -<U099F> <X6850>;<X0005>;<X0005>;IGNORE -<U09A0> <X6852>;<X0005>;<X0005>;IGNORE -<U09A1> <X6854>;<X0005>;<X0005>;IGNORE -<U09DC> <X6854>;"<X0005><X00D7><X00E9>";"<X0005><X0005><X00C0>";IGNORE -<U09A2> <X6856>;<X0005>;<X0005>;IGNORE -<U09DD> <X6856>;"<X0005><X00D7><X00E9>";"<X0005><X0005><X00C0>";IGNORE -<U09A3> <X6858>;<X0005>;<X0005>;IGNORE -<U09A4> <X685A>;<X0005>;<X0005>;IGNORE -<U09A5> <X685C>;<X0005>;<X0005>;IGNORE -<U09A6> <X685E>;<X0005>;<X0005>;IGNORE -<U09A7> <X6860>;<X0005>;<X0005>;IGNORE -<U09A8> <X6862>;<X0005>;<X0005>;IGNORE -<U09AA> <X6864>;<X0005>;<X0005>;IGNORE -<U09AB> <X6866>;<X0005>;<X0005>;IGNORE -<U09AC> <X6868>;<X0005>;<X0005>;IGNORE -<U09AD> <X686A>;<X0005>;<X0005>;IGNORE -<U09AE> <X686C>;<X0005>;<X0005>;IGNORE -<U09AF> <X686E>;<X0005>;<X0005>;IGNORE -<U09DF> <X686E>;"<X0005><X00D7><X00E9>";"<X0005><X0005><X00C0>";IGNORE -<U09B0> <X6870>;<X0005>;<X0005>;IGNORE -<U09F0> <X6872>;<X0005>;<X0005>;IGNORE -<U09B2> <X6874>;<X0005>;<X0005>;IGNORE -<U09F1> <X6876>;<X0005>;<X0005>;IGNORE -<U09B6> <X6878>;<X0005>;<X0005>;IGNORE -<U09B7> <X687A>;<X0005>;<X0005>;IGNORE -<U09B8> <X687C>;<X0005>;<X0005>;IGNORE -<U09B9> <X687E>;<X0005>;<X0005>;IGNORE -% FIXME <U09BD> <X6880>;<X0005>;<X0005>;IGNORE -% <U09BD> (Bengali sign avagraha) is defined from Unicode4.0 -<U09BE> <X6882>;<X0005>;<X0005>;IGNORE -<U09BF> <X6884>;<X0005>;<X0005>;IGNORE -<U09C0> <X6886>;<X0005>;<X0005>;IGNORE -<U09C1> <X6888>;<X0005>;<X0005>;IGNORE -<U09C2> <X688A>;<X0005>;<X0005>;IGNORE -<U09C3> <X688C>;<X0005>;<X0005>;IGNORE -<U09C4> <X688E>;<X0005>;<X0005>;IGNORE -<U09E2> <X6890>;<X0005>;<X0005>;IGNORE -<U09E3> <X6892>;<X0005>;<X0005>;IGNORE -<U09C7> <X6894>;<X0005>;<X0005>;IGNORE -<U09C8> <X6896>;<X0005>;<X0005>;IGNORE -<U09CB> <X6898>;<X0005>;<X0005>;IGNORE -<U09CC> <X689A>;<X0005>;<X0005>;IGNORE -<U09CD> <X689C>;<X0005>;<X0005>;IGNORE -<U09D7> <X689E>;<X0005>;<X0005>;IGNORE -<U09CE> "<XE2E9><X6B20>";<X0005>;"<X0005><X00C0>";IGNORE -UNDEFINED IGNORE;IGNORE;IGNORE;%... - -order_end END LC_COLLATE %%%%%%%%%%%%% diff --git a/localedata/locales/iso14651_t1_common b/localedata/locales/iso14651_t1_common index edbe9e0f32..66a486b53c 100644 --- a/localedata/locales/iso14651_t1_common +++ b/localedata/locales/iso14651_t1_common @@ -65,6 +65,7 @@ script <GUJARATI> script <TELUGU> script <GURUMUKHI> script <KANNADA> +script <TAMIL> script <SINHALA> script <MALAYALAM> script <BENGALI> @@ -914,6 +915,87 @@ collating-symbol <k-halant> collating-symbol <k-lenght_mark> collating-symbol <k-ai_lenght_mark> # +# <TAMIL> +# +collating-element <ta_split_o> from "<U0BC6><U0BBE>" +collating-element <ta_split_oo> from "<U0BC7><U0BBE>" +collating-element <ta_split_au> from "<U0BC6><U0BD7>" +collating-element <tagl_KSHA> from "<U0B95><U0BCD><U0BB7>" +collating-element <tagl_SHRI> from "<U0BB8><U0BCD><U0BB0><U0BC0>" +# defining collating element for sorting <consonent + virama> before <consonent> +collating-element <pure-ta-k> from "<U0B95><U0BCD>" +collating-element <pure-ta-ng> from "<U0B99><U0BCD>" +collating-element <pure-ta-c> from "<U0B9A><U0BCD>" +collating-element <pure-ta-j> from "<U0B9C><U0BCD>" +collating-element <pure-ta-ny> from "<U0B9E><U0BCD>" +collating-element <pure-ta-tt> from "<U0B9F><U0BCD>" +collating-element <pure-ta-nn> from "<U0BA3><U0BCD>" +collating-element <pure-ta-t> from "<U0BA4><U0BCD>" +collating-element <pure-ta-n> from "<U0BA8><U0BCD>" +collating-element <pure-ta-nnn> from "<U0BA9><U0BCD>" +collating-element <pure-ta-p> from "<U0BAA><U0BCD>" +collating-element <pure-ta-m> from "<U0BAE><U0BCD>" +collating-element <pure-ta-y> from "<U0BAF><U0BCD>" +collating-element <pure-ta-r> from "<U0BB0><U0BCD>" +collating-element <pure-ta-rr> from "<U0BB1><U0BCD>" +collating-element <pure-ta-l> from "<U0BB2><U0BCD>" +collating-element <pure-ta-ll> from "<U0BB3><U0BCD>" +collating-element <pure-ta-lll> from "<U0BB4><U0BCD>" +collating-element <pure-ta-v> from "<U0BB5><U0BCD>" +collating-element <pure-ta-sh> from "<U0BB6><U0BCD>" +collating-element <pure-ta-ss> from "<U0BB7><U0BCD>" +collating-element <pure-ta-s> from "<U0BB8><U0BCD>" +collating-element <pure-ta-h> from "<U0BB9><U0BCD>" +# defning symbols +collating-symbol <ta-pulli> #virama +collating-symbol <tavw-a> +collating-symbol <tavw-aa> +collating-symbol <tavw-i> +collating-symbol <tavw-ii> +collating-symbol <tavw-u> +collating-symbol <tavw-uu> +collating-symbol <tavw-e> +collating-symbol <tavw-ee> +collating-symbol <tavw-ai> +collating-symbol <tavw-o> +collating-symbol <tavw-oo> +collating-symbol <tavw-au> +collating-symbol <ta-aytham> #visarga +collating-symbol <ta-k> +collating-symbol <ta-ng> +collating-symbol <ta-c> +collating-symbol <ta-ny> +collating-symbol <ta-tt> +collating-symbol <ta-nn> +collating-symbol <ta-t> +collating-symbol <ta-n> +collating-symbol <ta-p> +collating-symbol <ta-m> +collating-symbol <ta-y> +collating-symbol <ta-r> +collating-symbol <ta-l> +collating-symbol <ta-v> +collating-symbol <ta-zh> +collating-symbol <ta-ll> +collating-symbol <ta-rr> +collating-symbol <ta-nnn> +collating-symbol <ta-j> +collating-symbol <ta-sh> +collating-symbol <ta-ss> +collating-symbol <ta-s> +collating-symbol <ta-h> +collating-symbol <tavs-aa> +collating-symbol <tavs-i> +collating-symbol <tavs-ii> +collating-symbol <tavs-u> +collating-symbol <tavs-uu> +collating-symbol <tavs-e> +collating-symbol <tavs-ee> +collating-symbol <tavs-ai> +collating-symbol <tavs-o> +collating-symbol <tavs-oo> +collating-symbol <tavs-au> +# # <MALAYALAM> # mlvs- denotes Malayalam vowel sign # mlvw- denotes Malayalam vowel @@ -3546,6 +3628,58 @@ collating-symbol <MMSTACK> <k-lenght_mark> <k-ai_lenght_mark> # +#<TAMIL> +# +# collation weights in order +<tavw-a> +<tavw-aa> +<tavw-i> +<tavw-ii> +<tavw-u> +<tavw-uu> +<tavw-e> +<tavw-ee> +<tavw-ai> +<tavw-o> +<tavw-oo> +<tavw-au> +<ta-aytham> #visarga +<ta-k> +<ta-ng> +<ta-c> +<ta-ny> +<ta-tt> +<ta-nn> +<ta-t> +<ta-n> +<ta-p> +<ta-m> +<ta-y> +<ta-r> +<ta-l> +<ta-v> +<ta-zh> +<ta-ll> +<ta-rr> +<ta-nnn> +<ta-j> +<ta-sh> +<ta-ss> +<ta-s> +<ta-h> +<ta-pulli> #virama +<tavs-aa> +<tavs-i> +<tavs-ii> +<tavs-u> +<tavs-uu> +<tavs-e> +<tavs-ee> +<tavs-ai> +<tavs-o> +<tavs-oo> +<tavs-au> +# # <MALAYALAM> # # collation weights in order @@ -6123,6 +6257,93 @@ order_start <KANNADA>;forward;forward;forward;forward,position <U0CD5> <k-lenght_mark>;<BAS>;<MIN>;IGNORE <U0CD6> <k-ai_lenght_mark>;<BAS>;<MIN>;IGNORE <U0CBC> IGNORE;<KNKT>;<MIN>;IGNORE +order_start <TAMIL>;forward;forward;forward;forward,position +<U0BE6> <0>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0BE7> <1>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0BE8> <2>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0BE9> <3>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0BEA> <4>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0BEB> <5>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0BEC> <6>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0BED> <7>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0BEE> <8>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0BEF> <9>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0B85> <tavw-a>;<BAS>;<MIN>;IGNORE +<U0B86> <tavw-aa>;<BAS>;<MIN>;IGNORE +<U0B87> <tavw-i>;<BAS>;<MIN>;IGNORE +<U0B88> <tavw-ii>;<BAS>;<MIN>;IGNORE +<U0B89> <tavw-u>;<BAS>;<MIN>;IGNORE +<U0B8A> <tavw-uu>;<BAS>;<MIN>;IGNORE +<U0B8E> <tavw-e>;<BAS>;<MIN>;IGNORE +<U0B8F> <tavw-ee>;<BAS>;<MIN>;IGNORE +<U0B90> <tavw-ai>;<BAS>;<MIN>;IGNORE +<U0B92> <tavw-o>;<BAS>;<MIN>;IGNORE +<U0B93> <tavw-oo>;<BAS>;<MIN>;IGNORE +<U0B94> <tavw-au>;<BAS>;<MIN>;IGNORE +<U0B83> <ta-aytham>;<BAS>;<MIN>;IGNORE +<pure-ta-k> <ta-k>;<BAS>;<MIN>;IGNORE +<U0B95> "<ta-k><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-ng> "<ta-ng>";<BAS>;<MIN>;IGNORE +<U0B99> "<ta-ng><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-c> <ta-c>;<BAS>;<MIN>;IGNORE +<U0B9A> "<ta-c><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-ny> <ta-ny>;<BAS>;<MIN>;IGNORE +<U0B9E> "<ta-ny><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-tt> <ta-tt>;<BAS>;<MIN>;IGNORE +<U0B9F> "<ta-tt><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-nn> <ta-nn>;<BAS>;<MIN>;IGNORE +<U0BA3> "<ta-nn><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-t> <ta-t>;<BAS>;<MIN>;IGNORE +<U0BA4> "<ta-t><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-n> <ta-n>;<BAS>;<MIN>;IGNORE +<U0BA8> "<ta-n><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-p> <ta-p>;<BAS>;<MIN>;IGNORE +<U0BAA> "<ta-p><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-m> <ta-m>;<BAS>;<MIN>;IGNORE +<U0BAE> "<ta-m><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-y> <ta-y>;<BAS>;<MIN>;IGNORE +<U0BAF> "<ta-y><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-r> <ta-r>;<BAS>;<MIN>;IGNORE +<U0BB0> "<ta-r><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-l> <ta-l>;<BAS>;<MIN>;IGNORE +<U0BB2> "<ta-l><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-v> <ta-v>;<BAS>;<MIN>;IGNORE +<U0BB5> "<ta-v><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-zh> <ta-zh>;<BAS>;<MIN>;IGNORE +<U0BB4> "<ta-zh><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-ll> <ta-ll>;<BAS>;<MIN>;IGNORE +<U0BB3> "<ta-ll><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-rr> <ta-rr>;<BAS>;<MIN>;IGNORE +<U0BB1> "<ta-rr><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-nnn> <ta-nnn>;<BAS>;<MIN>;IGNORE +<U0BA9> "<ta-nnn><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-j> <ta-j>;<BAS>;<MIN>;IGNORE +<U0B9C> "<ta-j><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-sh> <ta-sh>;<BAS>;<MIN>;IGNORE +<U0BB6> "<ta-sh><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-ss> <ta-ss>;<BAS>;<MIN>;IGNORE +<U0BB7> "<ta-ss><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-s> <ta-s>;<BAS>;<MIN>;IGNORE +<U0BB8> "<ta-s><tavw-a>";<BAS>;<MIN>;IGNORE +<pure-ta-h> <ta-h>;<BAS>;<MIN>;IGNORE +<U0BB9> "<ta-h><tavw-a>";<BAS>;<MIN>;IGNORE +<tagl_KSHA> "<U0B95><U0BCD><U0BB7>";<BAS>;<MIN>;IGNORE +<U0BCD> <ta-pulli>;<BAS>;<MIN>;IGNORE +<U0BBE> <tavs-aa>;<BAS>;<MIN>;IGNORE +<U0BBF> <tavs-i>;<BAS>;<MIN>;IGNORE +<U0BC0> <tavs-ii>;<BAS>;<MIN>;IGNORE +<U0BC1> <tavs-u>;<BAS>;<MIN>;IGNORE +<U0BC2> <tavs-uu>;<BAS>;<MIN>;IGNORE +<U0BC6> <tavs-e>;<BAS>;<MIN>;IGNORE +<U0BC7> <tavs-ee>;<BAS>;<MIN>;IGNORE +<U0BC8> <tavs-ai>;<BAS>;<MIN>;IGNORE +<U0BCA><tavs-o>;<BAS>;<MIN>;IGNORE +<U0BCB> <tavs-oo>;<BAS>;<MIN>;IGNORE +<U0BCC> <tavs-au>;<BAS>;<MIN>;IGNORE +<tagl_SHRI> "<U0BB6><U0BCD><U0BB0><U0BC0>";<BAS>;<MIN>;IGNORE +<ta_split_o> <tavs-o>;<BAS>;<MIN>;IGNORE +<ta_split_oo> <tavs-oo>;<BAS>;<MIN>;IGNORE +<ta_split_au> <tavs-au>;<BAS>;<MIN>;IGNORE order_start <SINHALA>;forward;forward;forward;forward,position # SCCII Part 1 : Collation Sequence (SLS1134) @@ -6272,8 +6493,8 @@ order_start <MALAYALAM>;forward;forward;forward;forward,position <U0D26> "<ml-dda><ml-virama><mlvw-shorta>";<BAS>;<MIN>;IGNORE <ml-ddh> "<ml-ddha><ml-virama>";<BAS>;<MIN>;IGNORE <U0D27> "<ml-ddha><ml-virama><mlvw-shorta>";<BAS>;<MIN>;IGNORE -<ml-chillu-n> "<ml-chillu-n>";<BAS>;<MIN>;IGNORE # ന്= ന + ് + zwj -<U0D28> "<ml-chillu-n><ml-virama><mlvw-shorta>";<BAS>;<MIN>;IGNORE #ന = ന + ് + അ +<ml-chillu-n> "<ml-na><ml-virama>";<BAS>;<MIN>;IGNORE # ന്= ന + ് + zwj +<U0D28> "<ml-na><ml-virama><mlvw-shorta>";<BAS>;<MIN>;IGNORE #ന = ന + ് + അ <ml-p> "<ml-pa><ml-virama>";<BAS>;<MIN>;IGNORE <U0D2A> "<ml-pa><ml-virama><mlvw-shorta>";<BAS>;<MIN>;IGNORE <ml-ph> "<ml-pha><ml-virama>";<BAS>;<MIN>;IGNORE diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN new file mode 100644 index 0000000000..7c0f0278f4 --- /dev/null +++ b/localedata/locales/kok_IN @@ -0,0 +1,209 @@ +comment_char % +escape_char / +% Konkani language locale for India. +% Contributed by Pravin Satpute <psatpute@redhat.com> and +% Shailendra Bandodkar <sbandodk@redhat.com>. + +LC_IDENTIFICATION +title "Konkani language locale for India" +source "Red Hat, Pune" +address "Level-1, Tower 10, Cyber City, Magarpatta City, Hadapsar, Pune, Maharashtra, India-411013" +contact "" +email "bug-glibc-locales@gnu.org" +tel "" +fax "" +language "Konkani" +territory "India" +revision "1.0" +date "2009,December,08" +% +category "kok_IN:2009";LC_IDENTIFICATION +category "kok_IN:2009";LC_CTYPE +category "kok_IN:2009";LC_COLLATE +category "kok_IN:2009";LC_TIME +category "kok_IN:2009";LC_NUMERIC +category "kok_IN:2009";LC_MONETARY +category "kok_IN:2009";LC_MESSAGES +category "kok_IN:2009";LC_PAPER +category "kok_IN:2009";LC_NAME +category "kok_IN:2009";LC_ADDRESS +category "kok_IN:2009";LC_TELEPHONE + +END LC_IDENTIFICATION + +LC_CTYPE +copy "hi_IN" +END LC_CTYPE + +LC_COLLATE + +% Copy the template from ISO/IEC 14651 +copy "iso14651_t1" + +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 +% for IBM Class for Unicode. +% +int_curr_symbol "<U0049><U004E><U0052><U0020>" +currency_symbol "<U0930><U0941>" +mon_decimal_point "<U002E>" +mon_thousands_sep "<U002C>" +mon_grouping 3 +positive_sign "" +negative_sign "<U002D>" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% +END LC_MONETARY + + +LC_NUMERIC +copy "hi_IN" +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 +% for IBM Class for Unicode. +% +% Abbreviated weekday names (%a) +abday "<U0906><U092F><U0924><U093E><U0930>";"<U0938><U094B><U092E><U093E><U0930>";/ + "<U092E><U0902><U0917><U0933><U0935><U093E><U0930>";"<U092C><U0941><U0927><U0935><U093E><U0930>";/ + "<U092C><U0947><U0930><U0947><U0938><U0924><U093E><U0930>";/ + "<U0936><U0941><U0915><U0930><U093e><U0930>";"<U0936><U0947><U0928><U0935><U093e><U0930>" +% +% Full weekday names (%A) +day "<U0906><U092F><U0924><U093E><U0930>";"<U0938><U094B><U092E><U093E><U0930>";/ + "<U092E><U0902><U0917><U0933><U0935><U093E><U0930>";"<U092C><U0941><U0927><U0935><U093E><U0930>";/ + "<U092C><U0947><U0930><U0947><U0938><U0924><U093E><U0930>";/ + "<U0936><U0941><U0915><U0930><U093e><U0930>";"<U0936><U0947><U0928><U0935><U093e><U0930>" +% +% Abbreviated month names (%b) +abmon "<U091C><U0947><U0928><U0935><U0930><U0940>";/ + "<U092B><U0947><U092C><U094D><U0930><U0930><U0940>";/ + "<U092E><U093E><U0930><U091A>";/ + "<U090F><U092A><U094D><U0930><U0940><U0932>";/ + "<U092E><U0947><U0902>";/ + "<U091C><U0941><U0928>";/ + "<U091C><U0941><U0932><U0948>";/ + "<U0913><U0917><U0938><U094D><U091F>";/ + "<U0938><U0947><U092A><U091F><U0947><U0902><U092C><U0930>";/ + "<U0913><U0915><U091F><U094B><U092C><U0930>";/ + "<U0928><U094B><U0935><U0947><U0902><U092C><U0930>";/ + "<U0926><U093F><U0938><U0947><U0902><U092c><U0930>" +% +% Full month names (%B) +mon "<U091C><U0947><U0928><U0935><U0930><U0940>";/ + "<U092B><U0947><U092C><U094D><U0930><U0930><U0940>";/ + "<U092E><U093E><U0930><U091A>";/ + "<U090F><U092A><U094D><U0930><U0940><U0932>";/ + "<U092E><U0947><U0902>";/ + "<U091C><U0941><U0928>";/ + "<U091C><U0941><U0932><U0948>";/ + "<U0913><U0917><U0938><U094D><U091F>";/ + "<U0938><U0947><U092A><U091F><U0947><U0902><U092C><U0930>";/ + "<U0913><U0915><U091F><U094B><U092C><U0930>";/ + "<U0928><U094B><U0935><U0947><U0902><U092C><U0930>";/ + "<U0926><U093F><U0938><U0947><U0902><U092c><U0930>" +% +% Equivalent of AM PM +am_pm "<U092E><U002E><U092A><U0942><U002E>";/ + "<U092E><U002E><U0928><U0902><U002E>" +% +% 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 +% %A %d %b %Y +d_fmt "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062>/ +<U0020><U0025><U0059>" +% +% 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) +t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053>/ +<U0020><U0025><U0070><U0020><U0025><U005A>" +% +% Appropriate date representation (date(1)) "%a %b %e %H:%M:%S %Z %Y" +date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ +<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ +<U0025><U005A><U0020><U0025><U0059>" +END LC_TIME + + +LC_MESSAGES +% This is the POSIX Locale definition for the LC_MESSAGES category +% generated by IBM Basic CountryPack Transformer. +% These are generated based on XML base Locale difintion file +% for IBM Class for Unicode. +% +% ^(Yes|[yY]) +yesexpr "<U005E><U0028><U0939><U092F><U007C><U005B><U0079>/ +<U0059><U005D><U0029>" +% +% ^(No|[nN]) +noexpr "<U005E><U0028><U0928><U094D><U0939><U0940><U007C><U005B><U006E><U004E>/ +<U005D><U0029>" +% +END LC_MESSAGES + + +LC_PAPER +copy "hi_IN" +END LC_PAPER + + +LC_NAME +% This is the ISO_IEC TR14652 Locale definition for the LC_NAME category +% generated by IBM Basic CountryPack Transformer. +% +% +name_fmt "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074>/ +<U0025><U0067>" +name_gen "" +name_mr "<U0936><U094D><U0930><U0940>" +name_mrs "<U0936><U094D><U0930><U0940><U092E><U0924><U0940>" +name_miss "<U0915><U0941><U092E><U093E><U0930><U0940>" +name_ms "<U0915><U0941><U092E><U093E><U0930>" + +END LC_NAME + + +LC_ADDRESS +% This is the ISO_IEC TR14652 Locale definition for the LC_ADDRESS category +% generated by IBM Basic CountryPack Transformer. +postal_fmt "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/ +<U0025><U0062><U0025><U0065><U0025><U0072>" + +country_ab2 "<U0049><U004E>" +country_ab3 "<U0049><U004E><U0044>" +country_num 356 +END LC_ADDRESS + + +LC_TELEPHONE +copy "hi_IN" +END LC_TELEPHONE + + +LC_MEASUREMENT +copy "hi_IN" +END LC_MEASUREMENT diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN index 51a4fff35f..68bcf4ab85 100644 --- a/localedata/locales/ta_IN +++ b/localedata/locales/ta_IN @@ -63,100 +63,7 @@ LC_COLLATE % Copy the template from ISO/IEC 14651 copy "iso14651_t1" -% Tamil Collation Order as defined in The Madras Tamil Lexicon -% Ref: http://www.uni-koeln.de/phil-fak/indologie/tamil/otl.html -% Contact: T. Vaseehran <t_vasee@yahoo.com> -% Last Updated: Feb. 12, 2004 -% ChangeLog: -% - Added split forms of o, oo, au -% - Moved Tamil Symbols above numbers -% - Added TAMIL LETTER SHA (U0BB6) -% Ref: http://wwwold.dkuug.dk/JTC1/SC2/WG2/docs/n2617 -% : http://wwwold.dkuug.dk/JTC1/SC2/WG2/docs/n2618 -% Initial version: Feb. 10, 2004. -collating-element <split_o> from "<U0BC6><U0BBE>" -collating-element <split_oo> from "<U0BC7><U0BBE>" -collating-element <split_au> from "<U0BC6><U0BD7>" -collating-element <tagl_KSHA> from "<U0B95><U0BCD><U0BB7>" -collating-element <tagl_SHRI> from "<U0BB8><U0BCD><U0BB0><U0BC0>" - -reorder-after <U00DE> -<U0BF3> % TAMIL SIGN DAY -<U0BF4> % TAMIL SIGN MONTH -<U0BF5> % TAMIL SIGN YEAR -<U0BF6> % TAMIL SIGN DEBIT -<U0BF7> % TAMIL SIGN CREDIT -<U0BF8> % TAMIL SIGN AS ABOVE -<U0BF9> % TAMIL SIGN RUPEE -<U0BE6> % TAMIL DIGIT ZERO -<U0BE7> % TAMIL DIGIT ONE -<U0BE8> % TAMIL DIGIT TWO -<U0BE9> % TAMIL DIGIT THREE -<U0BEA> % TAMIL DIGIT FOUR -<U0BEB> % TAMIL DIGIT FIVE -<U0BEC> % TAMIL DIGIT SIX -<U0BED> % TAMIL DIGIT SEVEN -<U0BEE> % TAMIL DIGIT EIGHT -<U0BEF> % TAMIL DIGIT NINE -<U0BF0> % TAMIL NUMBER TEN -<U0BF1> % TAMIL NUMBER ONE HUNDRED -<U0BF2> % TAMIL NUMBER ONE THOUSAND -<U0B85> % TAMIL LETTER A -<U0B86> % TAMIL LETTER AA -<U0B87> % TAMIL LETTER I -<U0B88> % TAMIL LETTER II -<U0B89> % TAMIL LETTER U -<U0B8A> % TAMIL LETTER UU -<U0B8E> % TAMIL LETTER E -<U0B8F> % TAMIL LETTER EE -<U0B90> % TAMIL LETTER AI -<U0B92> % TAMIL LETTER O -<U0B93> % TAMIL LETTER OO -<U0B94> % TAMIL LETTER AU -<U0B83> % TAMIL SIGN VISARGA (AYTHAM) -<U0B95> % TAMIL LETTER K -<U0B99> % TAMIL LETTER NG -<U0B9A> % TAMIL LETTER C -<U0B9E> % TAMIL LETTER NY -<U0B9F> % TAMIL LETTER TT -<U0BA3> % TAMIL LETTER NNN -<U0BA4> % TAMIL LETTER T -<U0BA8> % TAMIL LETTER N -<U0BAA> % TAMIL LETTER P -<U0BAE> % TAMIL LETTER M -<U0BAF> % TAMIL LETTER Y -<U0BB0> % TAMIL LETTER R -<U0BB2> % TAMIL LETTER L -<U0BB5> % TAMIL LETTER V -<U0BB4> % TAMIL LETTER LLL -<U0BB3> % TAMIL LETTER LL -<U0BB1> % TAMIL LETTER RR -<U0BA9> % TAMIL LETTER NN -<U0B9C> % TAMIL LETTER JA -<U0BB6> % TAMIL LETTER SHA -<U0BB7> % TAMIL LETTER SSA -<U0BB8> % TAMIL LETTER SA -<U0BB9> % TAMIL LETTER HA -<tagl_KSHA> -<U0BCD> % TAMIL SIGN VIRAMA (PULLI) -<U0BBE> % TAMIL VOWEL SIGN AA -<U0BBF> % TAMIL VOWEL SIGN I -<U0BC0> % TAMIL VOWEL SIGN II -<U0BC1> % TAMIL VOWEL SIGN U -<U0BC2> % TAMIL VOWEL SIGN UU -<U0BC6> % TAMIL VOWEL SIGN E -<U0BC7> % TAMIL VOWEL SIGN EE -<U0BC8> % TAMIL VOWEL SIGN AI -<U0BCA> % TAMIL VOWEL SIGN O -<U0BCB> % TAMIL VOWEL SIGN OO -<U0BCC> % TAMIL VOWEL SIGN AU -<U0BD7> % TAMIL AU LENGTH MARK -<tagl_SHRI> "<U0BB6><U0BCD><U0BB0><U0BC0>" -<split_o> <U0BCA> -<split_oo> <U0BCB> -<split_au> <U0BCC> -reorder-end END LC_COLLATE diff --git a/misc/getusershell.c b/misc/getusershell.c index 636da322f9..0e4f79619f 100644 --- a/misc/getusershell.c +++ b/misc/getusershell.c @@ -116,7 +116,8 @@ initshells() } if (statb.st_size > ~(size_t)0 / sizeof (char *) * 3) goto init_okshells; - if ((strings = malloc(statb.st_size + 2)) == NULL) + flen = statb.st_size + 3; + if ((strings = malloc(flen)) == NULL) goto init_okshells; shells = malloc(statb.st_size / 3 * sizeof (char *)); if (shells == NULL) { @@ -126,7 +127,6 @@ initshells() } sp = shells; cp = strings; - flen = statb.st_size + 2; while (fgets_unlocked(cp, flen - (cp - strings), fp) != NULL) { while (*cp != '#' && *cp != '/' && *cp != '\0') cp++; diff --git a/stdlib/setenv.c b/stdlib/setenv.c index fe591b7db8..89644b4884 100644 --- a/stdlib/setenv.c +++ b/stdlib/setenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992,1995-2001,2004, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1992,1995-2001,2004, 2008, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -136,6 +136,7 @@ __add_to_environ (name, value, combined, replace) if (ep == NULL || __builtin_expect (*ep == NULL, 1)) { + const size_t varlen = namelen + 1 + vallen; char **new_environ; /* We allocated this space; we can extend it. */ @@ -156,11 +157,21 @@ __add_to_environ (name, value, combined, replace) { /* See whether the value is already known. */ #ifdef USE_TSEARCH -# ifdef __GNUC__ - char new_value[namelen + 1 + vallen]; -# else - char *new_value = (char *) alloca (namelen + 1 + vallen); -# endif + char *new_value; + int use_alloca = __libc_use_alloca (varlen); + if (__builtin_expect (use_alloca, 1)) + new_value = (char *) alloca (varlen); + else + { + new_value = malloc (varlen); + if (new_value == NULL) + { + UNLOCK; + if (last_environ == NULL) + free (new_environ); + return -1; + } + } # ifdef _LIBC __mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1), value, vallen); @@ -174,21 +185,28 @@ __add_to_environ (name, value, combined, replace) if (__builtin_expect (new_environ[size] == NULL, 1)) #endif { - new_environ[size] = (char *) malloc (namelen + 1 + vallen); - if (__builtin_expect (new_environ[size] == NULL, 0)) +#ifdef USE_TSEARCH + if (__builtin_expect (! use_alloca, 0)) + new_environ[size] = new_value; + else +#endif { - __set_errno (ENOMEM); - UNLOCK; - return -1; - } + new_environ[size] = (char *) malloc (varlen); + if (__builtin_expect (new_environ[size] == NULL, 0)) + { + UNLOCK; + return -1; + } #ifdef USE_TSEARCH - memcpy (new_environ[size], new_value, namelen + 1 + vallen); + memcpy (new_environ[size], new_value, varlen); #else - memcpy (new_environ[size], name, namelen); - new_environ[size][namelen] = '='; - memcpy (&new_environ[size][namelen + 1], value, vallen); + memcpy (new_environ[size], name, namelen); + new_environ[size][namelen] = '='; + memcpy (&new_environ[size][namelen + 1], value, vallen); #endif + } + /* And save the value now. We cannot do this when we remove the string since then we cannot decide whether it is a user string or not. */ @@ -213,12 +231,21 @@ __add_to_environ (name, value, combined, replace) np = (char *) combined; else { + const size_t varlen = namelen + 1 + vallen; #ifdef USE_TSEARCH -# ifdef __GNUC__ - char new_value[namelen + 1 + vallen]; -# else - char *new_value = (char *) alloca (namelen + 1 + vallen); -# endif + char *new_value; + int use_alloca = __libc_use_alloca (varlen); + if (__builtin_expect (use_alloca, 1)) + new_value = (char *) alloca (varlen); + else + { + new_value = malloc (varlen); + if (new_value == NULL) + { + UNLOCK; + return -1; + } + } # ifdef _LIBC __mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1), value, vallen); @@ -232,20 +259,27 @@ __add_to_environ (name, value, combined, replace) if (__builtin_expect (np == NULL, 1)) #endif { - np = malloc (namelen + 1 + vallen); - if (__builtin_expect (np == NULL, 0)) +#ifdef USE_TSEARCH + if (__builtin_expect (! use_alloca, 0)) + np = new_value; + else +#endif { - UNLOCK; - return -1; - } + np = malloc (varlen); + if (__builtin_expect (np == NULL, 0)) + { + UNLOCK; + return -1; + } #ifdef USE_TSEARCH - memcpy (np, new_value, namelen + 1 + vallen); + memcpy (np, new_value, varlen); #else - memcpy (np, name, namelen); - np[namelen] = '='; - memcpy (&np[namelen + 1], value, vallen); + memcpy (np, name, namelen); + np[namelen] = '='; + memcpy (&np[namelen + 1], value, vallen); #endif + } /* And remember the value. */ STORE_VALUE (np); } diff --git a/sysdeps/ia64/memchr.S b/sysdeps/ia64/memchr.S index cdd71ca5a5..355effe94b 100644 --- a/sysdeps/ia64/memchr.S +++ b/sysdeps/ia64/memchr.S @@ -1,6 +1,6 @@ /* Optimized version of the standard memchr() function. This file is part of the GNU C Library. - Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2003, 2010 Free Software Foundation, Inc. Contributed by Dan Pop <Dan.Pop@cern.ch>. The GNU C Library is free software; you can redistribute it and/or @@ -21,9 +21,9 @@ /* Return: the address of the first occurence of chr in str or NULL Inputs: - in0: str - in1: chr - in2: byte count + in0: str + in1: chr + in2: byte count This implementation assumes little endian mode. For big endian mode, the instruction czx1.r should be replaced by czx1.l. @@ -47,7 +47,7 @@ #define saved_lc r16 #define chr r17 #define len r18 -#define pos0 r20 +#define last r20 #define val r21 #define tmp r24 #define chrx8 r25 @@ -62,12 +62,13 @@ ENTRY(__memchr) .rotr value[MEMLAT+1], addr[MEMLAT+3], aux[2], poschr[2] .rotp p[MEMLAT+3] .save ar.lc, saved_lc - mov saved_lc = ar.lc // save the loop counter + mov saved_lc = ar.lc // save the loop counter .save pr, saved_pr mov saved_pr = pr // save the predicates .body - mov ret0 = str - and tmp = 7, str // tmp = str % 8 + mov ret0 = str + add last = str, in2 // last byte + and tmp = 7, str // tmp = str % 8 cmp.ne p7, p0 = r0, r0 // clear p7 extr.u chr = in1, 0, 8 // chr = (unsigned char) in1 mov len = in2 @@ -88,7 +89,7 @@ ENTRY(__memchr) .str_aligned: cmp.ne p6, p0 = r0, r0 // clear p6 shr.u loopcnt = len, 3 // loopcnt = len / 8 - and len = 7, len ;; // remaining len = len & 7 + and len = 7, len ;; // remaining len = len & 7 adds loopcnt = -1, loopcnt mov ar.ec = MEMLAT + 3 mux1 chrx8 = chr, @brcst ;; // get a word full of chr @@ -119,7 +120,7 @@ ENTRY(__memchr) mov ret0 = r0 ;; // return NULL .foundit: .pred.rel "mutex" p6, p7 -(p6) adds ret0 = -1, ret0 // if we got here from l1 or l3 +(p6) adds ret0 = -1, ret0 // if we got here from l1 or l3 (p7) add ret0 = addr[MEMLAT+2], poschr[1] // if we got here from l2 mov pr = saved_pr, -1 mov ar.lc = saved_lc @@ -143,7 +144,10 @@ ENTRY(__memchr) ld8 tmp = [ret0];; // load the first unchecked 8byte xor aux[1] = tmp, chrx8;; czx1.r poschr[1] = aux[1];; - cmp.ne p7, p0 = 8, poschr[1] + cmp.ne p7, p0 = 8, poschr[1];; +(p7) add ret0 = addr[MEMLAT+2], poschr[1];; +(p7) cmp.geu p6, p7 = ret0, last // don't go over the last byte +(p6) br.cond.spnt .notfound;; (p7) br.cond.spnt .foundit;; adds ret0 = 8, ret0 // load the next unchecked 8byte br.sptk .l4;; diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c b/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c index 32a5d71376..d5793b3905 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2010 Free Software Foundation, Inc. Contributed by Andreas Krebbel <Andreas.Krebbel@de.ibm.com>. This file is part of the GNU C Library. @@ -31,7 +31,7 @@ calls. */ #define ALLOCATE_UTMP32_OUT(OUT) \ static struct utmp32 *OUT = NULL; \ - \ + \ if (OUT == NULL) \ { \ OUT = malloc (sizeof (struct utmp32)); \ @@ -62,7 +62,7 @@ struct utmp32 * getutid32 (const struct utmp32 *id) { - ACCESS_UTMP_ENTRY (getutid, id) + ACCESS_UTMP_ENTRY (__getutid, id) } symbol_version (getutid32, getutid, GLIBC_2.0); @@ -71,7 +71,7 @@ symbol_version (getutid32, getutid, GLIBC_2.0); struct utmp32 * getutline32 (const struct utmp32 *line) { - ACCESS_UTMP_ENTRY (getutline, line) + ACCESS_UTMP_ENTRY (__getutline, line) } symbol_version (getutline32, getutline, GLIBC_2.0); @@ -79,7 +79,7 @@ symbol_version (getutline32, getutline, GLIBC_2.0); struct utmp32 * pututline32 (const struct utmp32 *utmp_ptr) { - ACCESS_UTMP_ENTRY (pututline, utmp_ptr) + ACCESS_UTMP_ENTRY (__pututline, utmp_ptr) } symbol_version (pututline32, pututline, GLIBC_2.0); @@ -90,7 +90,7 @@ getutent32 (void) struct utmp *out64; ALLOCATE_UTMP32_OUT (out32); - out64 = getutent (); + out64 = __getutent (); if (!out64) return NULL; @@ -108,7 +108,7 @@ getutent32_r (struct utmp32 *buffer, struct utmp32 **result) struct utmp *out64p; int ret; - ret = getutent_r (&out64, &out64p); + ret = __getutent_r (&out64, &out64p); if (ret == -1) { *result = NULL; @@ -133,7 +133,7 @@ getutid32_r (const struct utmp32 *id, struct utmp32 *buffer, utmp_convert32to64 (id, &in64); - ret = getutid_r (&in64, &out64, &out64p); + ret = __getutid_r (&in64, &out64, &out64p); if (ret == -1) { *result = NULL; @@ -158,7 +158,7 @@ getutline32_r (const struct utmp32 *line, utmp_convert32to64 (line, &in64); - ret = getutline_r (&in64, &out64, &out64p); + ret = __getutline_r (&in64, &out64, &out64p); if (ret == -1) { *result = NULL; @@ -180,6 +180,6 @@ updwtmp32 (const char *wtmp_file, const struct utmp32 *utmp) struct utmp in32; utmp_convert32to64 (utmp, &in32); - updwtmp (wtmp_file, &in32); + __updwtmp (wtmp_file, &in32); } symbol_version (updwtmp32, updwtmp, GLIBC_2.0); diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c index 69a1384db6..790b46466e 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2010 Free Software Foundation, Inc. Contributed by Andreas Krebbel <Andreas.Krebbel@de.ibm.com>. This file is part of the GNU C Library. @@ -34,7 +34,7 @@ calls. */ #define ALLOCATE_UTMPX32_OUT(OUT) \ static struct utmpx32 *OUT = NULL; \ - \ + \ if (OUT == NULL) \ { \ OUT = malloc (sizeof (struct utmpx32)); \ @@ -68,7 +68,7 @@ getutxent32 (void) struct utmpx *out64; ALLOCATE_UTMPX32_OUT (out32); - out64 = getutxent (); + out64 = __getutxent (); if (!out64) return NULL; @@ -82,7 +82,7 @@ symbol_version (getutxent32, getutxent, GLIBC_2.1); struct utmpx32 * getutxid32 (const struct utmpx32 *id) { - ACCESS_UTMPX_ENTRY (getutxid, id); + ACCESS_UTMPX_ENTRY (__getutxid, id); } symbol_version (getutxid32, getutxid, GLIBC_2.1); @@ -90,7 +90,7 @@ symbol_version (getutxid32, getutxid, GLIBC_2.1); struct utmpx32 * getutxline32 (const struct utmpx32 *line) { - ACCESS_UTMPX_ENTRY (getutxline, line); + ACCESS_UTMPX_ENTRY (__getutxline, line); } symbol_version (getutxline32, getutxline, GLIBC_2.1); @@ -98,7 +98,7 @@ symbol_version (getutxline32, getutxline, GLIBC_2.1); struct utmpx32 * pututxline32 (const struct utmpx32 *utmpx) { - ACCESS_UTMPX_ENTRY (pututxline, utmpx); + ACCESS_UTMPX_ENTRY (__pututxline, utmpx); } symbol_version (pututxline32, pututxline, GLIBC_2.1); @@ -109,7 +109,7 @@ updwtmpx32 (const char *wtmpx_file, const struct utmpx32 *utmpx) struct utmpx in64; utmpx_convert32to64 (utmpx, &in64); - updwtmpx (wtmpx_file, &in64); + __updwtmpx (wtmpx_file, &in64); } symbol_version (updwtmpx32, updwtmpx, GLIBC_2.1); @@ -121,7 +121,7 @@ getutmp32 (const struct utmpx32 *utmpx, struct utmp32 *utmp) struct utmp out64; utmpx_convert32to64 (utmpx, &in64); - getutmp (&in64, &out64); + __getutmp (&in64, &out64); utmp_convert64to32 (&out64, utmp); } symbol_version (getutmp32, getutmp, GLIBC_2.1.1); @@ -134,7 +134,7 @@ getutmpx32 (const struct utmp32 *utmp, struct utmpx32 *utmpx) struct utmpx out64; utmp_convert32to64 (utmp, &in64); - getutmpx (&in64, &out64); + __getutmpx (&in64, &out64); utmpx_convert64to32 (&out64, utmpx); } symbol_version (getutmpx32, getutmpx, GLIBC_2.1.1); diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h index 5f468ed68d..dedc6c6be8 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h @@ -1,5 +1,5 @@ /* The `struct utmp' type, describing entries in the utmp file. GNU version. - Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002, 2008 + Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002, 2008, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -49,4 +49,16 @@ struct utmpx32 char __unused[20]; /* Reserved for future use. */ }; +/* The internal interface needed by the compat wrapper functions. */ +extern struct utmpx *__getutxent (void); +extern struct utmpx *__getutxid (__const struct utmpx *__id); +extern struct utmpx *__getutxline (__const struct utmpx *__line); +extern struct utmpx *__pututxline (__const struct utmpx *__utmpx); +extern void __updwtmpx (__const char *__wtmpx_file, + __const struct utmpx *__utmpx); +extern void __getutmp (__const struct utmpx *__utmpx, + struct utmp *__utmp); +extern void __getutmpx (__const struct utmp *__utmp, + struct utmpx *__utmpx); + #endif /* utmpx32.h */ diff --git a/sysdeps/unix/sysv/linux/sparc/Versions b/sysdeps/unix/sysv/linux/sparc/Versions index be3d2b96c2..8fb638bb30 100644 --- a/sysdeps/unix/sysv/linux/sparc/Versions +++ b/sysdeps/unix/sysv/linux/sparc/Versions @@ -19,6 +19,10 @@ libc { #errlist-compat 134 _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; } + GLIBC_2.12 { + #errlist-compat 135 + _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; + } } librt { GLIBC_2.3 { diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h index 57d440f273..a41220d14e 100644 --- a/sysdeps/unix/sysv/linux/sys/mount.h +++ b/sysdeps/unix/sysv/linux/sys/mount.h @@ -1,5 +1,5 @@ /* Header file for mounting/unmount Linux filesystems. - Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc. + Copyright (C) 1996-2000, 2004, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -47,23 +47,46 @@ enum #define MS_REMOUNT MS_REMOUNT MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */ #define MS_MANDLOCK MS_MANDLOCK - S_WRITE = 128, /* Write on file/directory/symlink. */ -#define S_WRITE S_WRITE - S_APPEND = 256, /* Append-only file. */ -#define S_APPEND S_APPEND - S_IMMUTABLE = 512, /* Immutable file. */ -#define S_IMMUTABLE S_IMMUTABLE + MS_DIRSYNC = 128, /* Directory modifications are synchronous. */ +#define MS_DIRSYNC MS_DIRSYNC MS_NOATIME = 1024, /* Do not update access times. */ #define MS_NOATIME MS_NOATIME MS_NODIRATIME = 2048, /* Do not update directory access times. */ #define MS_NODIRATIME MS_NODIRATIME MS_BIND = 4096, /* Bind directory at different place. */ #define MS_BIND MS_BIND + MS_MOVE = 8192, +#define MS_MOVE MS_MOVE + MS_REC = 16384, +#define MS_REC MS_REC + MS_SILENT = 32768, +#define MS_SILENT MS_SILENT + MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */ +#define MS_POSIXACL MS_POSIXACL + MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */ +#define MS_UNBINDABLE MS_UNBINDABLE + MS_PRIVATE = 1 << 18, /* Change to private. */ +#define MS_PRIVATE MS_PRIVATE + MS_SLAVE = 1 << 19, /* Change to slave. */ +#define MS_SLAVE MS_SLAVE + MS_SHARED = 1 << 20, /* Change to shared. */ +#define MS_SHARED MS_SHARED + MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */ +#define MS_RELATIME MS_RELATIME + MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */ +#define MS_KERNMOUNT MS_KERNMOUNT + MS_I_VERSION = 1 << 23, /* Update inode I_version field. */ +#define MS_I_VERSION MS_I_VERSION + MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */ +#define MS_STRICTATIME MS_STRICTATIME + MS_ACTIVE = 1 << 30, +#define MS_ACTIVE MS_ACTIVE + MS_NOUSER = 1 << 31 +#define MS_NOUSER MS_NOUSER }; /* Flags that can be altered by MS_REMOUNT */ -#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \ - |MS_NODIRATIME) +#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION) /* Magic mount flag number. Has to be or-ed to the flag values. */ |