Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 69407 | Differences between
and this patch

Collapse All | Expand All

(-)bash-3.0/locale.c.~1~ (-3 / +20 lines)
Lines 71-79 set_default_locale () Link Here
71
  textdomain (PACKAGE);
71
  textdomain (PACKAGE);
72
}
72
}
73
73
74
/* Set default values for LC_CTYPE, LC_COLLATE, LC_MESSAGES and LC_NUMERIC
74
/* Set default values for LC_CTYPE, LC_COLLATE, LC_MESSAGES, LC_NUMERIC
75
   if they are not specified in the environment, but LC_ALL is.  This
75
   and LC_TIME if they are not specified in the environment, but LC_ALL
76
   should be called from main() after parsing the environment. */
76
   is.  This should be called from main() after parsing the
77
   environment. */
77
void
78
void
78
set_default_locale_vars ()
79
set_default_locale_vars ()
79
{
80
{
Lines 109-114 set_default_locale_vars () Link Here
109
    setlocale (LC_NUMERIC, lc_all);
110
    setlocale (LC_NUMERIC, lc_all);
110
#  endif /* LC_NUMERIC */
111
#  endif /* LC_NUMERIC */
111
112
113
#  if defined (LC_TIME)
114
  val = get_string_value ("LC_TIME");
115
  if (val == 0 && lc_all && *lc_all)
116
    setlocale (LC_TIME, lc_all);
117
#  endif /* LC_TIME */
118
112
#endif /* HAVE_SETLOCALE */
119
#endif /* HAVE_SETLOCALE */
113
120
114
  val = get_string_value ("TEXTDOMAIN");
121
  val = get_string_value ("TEXTDOMAIN");
Lines 213-218 set_locale_var (var, value) Link Here
213
	return (setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC")) != 0);
220
	return (setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC")) != 0);
214
#  endif /* LC_NUMERIC */
221
#  endif /* LC_NUMERIC */
215
    }
222
    }
223
  else if (var[3] == 'T' && var[4] == 'I')	/* LC_TIME */
224
    {
225
#  if defined (LC_TIME)
226
      if (lc_all == 0 || *lc_all == '\0')
227
	return (setlocale (LC_TIME, get_locale_var ("LC_TIME")) != 0);
228
#  endif /* LC_TIME */
229
    }
216
#endif /* HAVE_SETLOCALE */
230
#endif /* HAVE_SETLOCALE */
217
231
218
  return (0);
232
  return (0);
Lines 285-290 reset_locale_vars () Link Here
285
#  if defined (LC_NUMERIC)
299
#  if defined (LC_NUMERIC)
286
  setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC"));
300
  setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC"));
287
#  endif
301
#  endif
302
#  if defined (LC_TIME)
303
  setlocale (LC_TIME, get_locale_var ("LC_TIME"));
304
#  endif
288
305
289
  locale_setblanks ();  
306
  locale_setblanks ();  
290
307
(-)bash-3.0/variables.c.~1~ (+1 lines)
Lines 3646-3651 static struct name_and_function special_ Link Here
3646
  { "LC_CTYPE", sv_locale },
3646
  { "LC_CTYPE", sv_locale },
3647
  { "LC_MESSAGES", sv_locale },
3647
  { "LC_MESSAGES", sv_locale },
3648
  { "LC_NUMERIC", sv_locale },
3648
  { "LC_NUMERIC", sv_locale },
3649
  { "LC_TIME", sv_locale },
3649
3650
3650
  { "MAIL", sv_mail },
3651
  { "MAIL", sv_mail },
3651
  { "MAILCHECK", sv_mail },
3652
  { "MAILCHECK", sv_mail },
(-)./builtins/history.def.orig (-1 / +2 lines)
Lines 287-295 Link Here
287
	  QUIT;
287
	  QUIT;
288
288
289
	  timestr = (histtimefmt && *histtimefmt) ? histtime (hlist[i], histtimefmt) : (char *)NULL;
289
	  timestr = (histtimefmt && *histtimefmt) ? histtime (hlist[i], histtimefmt) : (char *)NULL;
290
	  printf ("%5d%c %s%s\n", i + history_base,
290
	  printf ("%5d%c %s%s%s\n", i + history_base,
291
		  histdata(i) ? '*' : ' ',
291
		  histdata(i) ? '*' : ' ',
292
		  ((timestr && *timestr) ? timestr : ""),
292
		  ((timestr && *timestr) ? timestr : ""),
293
		  ((timestr && *timestr) ? " " : ""),
293
		  histline(i));
294
		  histline(i));
294
	  i++;
295
	  i++;
295
	}
296
	}

Return to bug 69407