Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -1,8 +1,10 @@
$NetBSD: patch-js_src_jsdate.cpp,v 1.2 2015/02/28 04:30:55 ryoon Exp $
$NetBSD: patch-js_src_jsdate.cpp,v 1.4 2016/06/16 12:08:21 ryoon Exp $
--- js/src/jsdate.cpp.orig 2015-02-17 21:40:42.000000000 +0000
* For NetBSD
--- js/src/jsdate.cpp.orig 2016-02-25 23:02:04.000000000 +0000
+++ js/src/jsdate.cpp
@@ -2651,11 +2651,11 @@ ToLocaleFormatHelper(JSContext *cx, Hand
@@ -2672,8 +2672,8 @@ ToLocaleFormatHelper(JSContext* cx, Hand
if (strcmp(format, "%x") == 0 && result_len >= 6 &&
/* Format %x means use OS settings, which may have 2-digit yr, so
hack end of 3/11/22 or 11.03.22 or 11Mar22 to use 4-digit yr...*/
@@ -11,10 +13,5 @@ $NetBSD: patch-js_src_jsdate.cpp,v 1.2 2015/02/28 04:30:55 ryoon Exp $
+ !isdigit(((unsigned char)buf[result_len - 3])) &&
+ isdigit(((unsigned char)buf[result_len - 2])) && isdigit(((unsigned char)buf[result_len - 1])) &&
/* ...but not if starts with 4-digit year, like 2022/3/11. */
- !(isdigit(buf[0]) && isdigit(buf[1]) &&
- isdigit(buf[2]) && isdigit(buf[3]))) {
+ !(isdigit(((unsigned char)buf[0])) && isdigit(((unsigned char)buf[1])) &&
+ isdigit(((unsigned char)buf[2])) && isdigit(((unsigned char)buf[3])))) {
double localtime = obj->as<DateObject>().cachedLocalTime(&cx->runtime()->dateTimeInfo);
int year = IsNaN(localtime) ? 0 : (int) YearFromTime(localtime);
JS_snprintf(buf + (result_len - 2), (sizeof buf) - (result_len - 2),
!(isdigit(buf[0]) && isdigit(buf[1]) &&
isdigit(buf[2]) && isdigit(buf[3]))) {