From 07fb518573f6595548f992646a2c65e9b9770268 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 17 Feb 2007 08:36:28 +0000 Subject: [PATCH] [BZ #3348] 2007-02-17 Ulrich Drepper [BZ #3348] * malloc/memusage.sh: Cleanups. * debug/xtrace.sh: Quoting and trap changes. * locale/iso-3166.def: Add Jersey, Guernsey, and Isle Of Man entries. --- ChangeLog | 8 ++ debug/xtrace.sh | 18 ++-- localedata/ChangeLog | 4 + localedata/SUPPORTED | 1 + localedata/locales/tt_RU@iqtelif | 188 +++++++++++++++++++++++++++++++++++++++ malloc/memusage.sh | 20 +++-- 6 files changed, 221 insertions(+), 18 deletions(-) create mode 100644 localedata/locales/tt_RU@iqtelif diff --git a/ChangeLog b/ChangeLog index 2fbf82f..62f0dd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ +2007-02-17 Ulrich Drepper + + [BZ #3348] + * malloc/memusage.sh: Cleanups. + * debug/xtrace.sh: Quoting and trap changes. + 2007-02-16 Ulrich Drepper + * locale/iso-3166.def: Add Jersey, Guernsey, and Isle Of Man entries. + * locale/iso-3166.def: Update entry for Serbia. * locale/iso-4217.def: Define RSD, remove CSD. diff --git a/debug/xtrace.sh b/debug/xtrace.sh index e8ffe2f..b392d7c 100755 --- a/debug/xtrace.sh +++ b/debug/xtrace.sh @@ -161,32 +161,32 @@ if test -n "$data"; then while read fct; do read file if test "$fct" != '??' -a "$file" != '??:0'; then - format_line $fct $file + format_line "$fct" "$file" fi done else - fifo=$(mktemp -u ${TMPDIR:-/tmp}/xtrace.XXXXXX) + fifo=$(mktemp -ut xtrace.XXXXXX) || exit + trap 'rm -f "$fifo"; exit 1' HUP INT QUIT TERM PIPE mkfifo -m 0600 $fifo || exit 1 - trap 'rm $fifo; exit 1' SIGINT SIGTERM SIGPIPE # Now start the program and let it write to the FIFO. $TERMINAL_PROG -T "xtrace - $program $*" -e /bin/sh -c "LD_PRELOAD=$pcprofileso PCPROFILE_OUTPUT=$fifo $program $*; read < $fifo" & termpid=$! - $pcprofiledump -u $fifo | + $pcprofiledump -u "$fifo" | while read line; do - echo $line | + echo "$line" | sed 's/this = \([^,]*\).*/\1/' | - addr2line -fC -e $program + addr2line -fC -e "$program" done | while read fct; do read file if test "$fct" != '??' -a "$file" != '??:0'; then - format_line $fct $file + format_line "$fct" "$file" fi done read -p "Press return here to close $TERMINAL_PROG($program)." - echo > $fifo - rm $fifo + echo > "$fifo" + rm "$fifo" fi exit 0 diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 579619d..746ece1 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,9 @@ 2007-02-17 Ulrich Drepper + [BZ #3363] + * SUPPORTED (SUPPORTED-LOCALES): Add tt_RU@iqtelif. + * locales/tt_RU@iqtelif: New file. + [BZ #3334] * locales/sr_ME: Update from maintainer. diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index 70c2882..b4f14fa 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -350,6 +350,7 @@ tr_TR.UTF-8/UTF-8 \ tr_TR/ISO-8859-9 \ ts_ZA/UTF-8 \ tt_RU.UTF-8/UTF-8 \ +tt_RU@iqtelif.UTF-8/UTF-8 \ uk_UA.UTF-8/UTF-8 \ uk_UA/KOI8-U \ ur_PK/UTF-8 \ diff --git a/localedata/locales/tt_RU@iqtelif b/localedata/locales/tt_RU@iqtelif new file mode 100644 index 0000000..043f458 --- /dev/null +++ b/localedata/locales/tt_RU@iqtelif @@ -0,0 +1,188 @@ +comment_char % +escape_char / +% +% Tatar Language Locale using IQTElif alphabet; for Tatarstan, Russian Federation +% Source: Reshat Sabiq +% Contact: Reshat Sabiq +% Email: +% Language: tt@iqtelif +% Territory: RU +% Revision: 0.1 +% Date: 2006-10-12 +% Application: general +% Users: general +% Charset: ISO-8859-9 +% Distribution and use is free, also +% for commercial purposes. + +LC_IDENTIFICATION +title "Tatar language locale using IQTElif alphabet; for Tatarstan, Russian Federation" +source "" +address "" +contact "Reshat Sabiq" +email "tatar.iqtelif.i18n@gmail.com" +tel "" +fax "" +language "Tatar" +territory "Tatarstan, Russian Federation" +revision "0.1" +date "2006-10-12" + +category "tt_RU@iqtelif:2000";LC_IDENTIFICATION +category "tt_RU@iqtelif:2000";LC_CTYPE +category "tt_RU@iqtelif:2000";LC_COLLATE +category "tt_RU@iqtelif:2000";LC_TIME +category "tt_RU@iqtelif:2000";LC_NUMERIC +category "tt_RU@iqtelif:2000";LC_PAPER +category "tt_RU@iqtelif:2000";LC_TELEPHONE +category "tt_RU@iqtelif:2000";LC_MEASUREMENT +category "tt_RU@iqtelif:2000";LC_ADDRESS +category "tt_RU@iqtelif:2000";LC_MONETARY +category "tt_RU@iqtelif:2000";LC_MESSAGES +category "tt_RU@iqtelif:2000";LC_NAME + +END LC_IDENTIFICATION + +% TODO: further test LC_COLLATE + +LC_COLLATE +% IQTElif: +% , , , , , , , , , , +% (dotless i), (i with dot), , , , , , , , , +% ,

, , , , , , , , , , , , + +copy "crh_UA" + +collating-symbol + +reorder-after + + +reorder-after + ;;;IGNORE +reorder-after + ;;;IGNORE + +reorder-end + +END LC_COLLATE + +LC_CTYPE +copy "tr_TR" +END LC_CTYPE + +LC_MESSAGES +% TODO: No is "yuq"; is it OK that it corresponds with English "yes"? +yesstr "" +nostr "" +yesexpr "" +noexpr "" +END LC_MESSAGES + +LC_MONETARY +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3;3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 0 +p_sep_by_space 1 +n_cs_precedes 0 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +END LC_MONETARY + +LC_NUMERIC +decimal_point "" +thousands_sep "" +grouping 3;3 +END LC_NUMERIC + +LC_TIME +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +abday "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% RFERL-based month t12n: +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +abmon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +d_t_fmt "/ +" +d_fmt "" +t_fmt "" +am_pm "";"" +t_fmt_ampm "/ +" +date_fmt "/ +/ +" +END LC_TIME + +LC_PAPER +height 297 +width 210 +END LC_PAPER + +LC_MEASUREMENT +measurement 1 +END LC_MEASUREMENT + +LC_ADDRESS +postal_fmt "/ +/ +/ +/ +" +country_ab2 "" +country_ab3 "" +country_num 643 +END LC_ADDRESS + +LC_TELEPHONE +tel_int_fmt "/ +" +int_prefix "" +int_select "" +END LC_TELEPHONE + +LC_NAME +name_fmt "/ +" +END LC_NAME diff --git a/malloc/memusage.sh b/malloc/memusage.sh index 67af499..eace785 100755 --- a/malloc/memusage.sh +++ b/malloc/memusage.sh @@ -77,6 +77,15 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. exit 0 } +# These variables are local +buffer= +data= +memusagestat_args= +notimer= +png= +progname= +tracemmap= + # Process arguments. But stop as soon as the program name is found. while test $# -gt 0; do case "$1" in @@ -213,15 +222,8 @@ datafile= if test -n "$data"; then datafile="$data" elif test -n "$png"; then - datafile=$(mktemp ${TMPDIR:-/tmp}/memusage.XXXXXX 2> /dev/null) - if test $? -ne 0; then - # Lame, but if there is no `mktemp' program the user cannot expect more. - if test "$RANDOM" != "$RANDOM"; then - datafile=${TMPDIR:-/tmp}/memusage.$RANDOM - else - datafile=${TMPDIR:-/tmp}/memusage.$$ - fi - fi + datafile=$(mktemp -t memusage.XXXXXX) || exit + trap 'rm -f "$datafile"; exit 1' HUP INT QUIT TERM PIPE fi if test -n "$datafile"; then add_env="$add_env MEMUSAGE_OUTPUT=$datafile" -- 2.7.4