php-win-ext/icu4c
1
0
Fork 0
mirror of https://github.com/php-win-ext/icu4c.git synced 2026-03-26 10:02:09 +01:00
Code Issues Packages Projects Releases 1 Wiki Activity

upgraded to icu4c-56_1

Browse Source
This commit is contained in:
Anatol Belski
2015-10-10 20:14:02 +02:00
parent ed058f1bc1
commit 7be7603fab
2451 changed files with 208427 additions and 120437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
source/tools/pkgdata/pkgdata.cpp
View File

@@ -56,6 +56,13 @@ U_CDECL_BEGIN
#include "pkgtypes.h"
U_CDECL_END
#if U_HAVE_POPEN
using icu::LocalPointerBase;
U_DEFINE_LOCAL_OPEN_POINTER(LocalPipeFilePointer, FILE, pclose);
#endif
static void loadLists(UPKGOptions *o, UErrorCode *status);
@@ -825,6 +832,10 @@ static int32_t initializePkgDataFlags(UPKGOptions *o) {
pkgDataFlags[i][0] = 0;
} else {
fprintf(stderr,"Error allocating memory for pkgDataFlags.\n");
/* If an error occurs, ensure that the rest of the array is NULL */
for (int32_t n = i + 1; n < PKGDATA_FLAGS_SIZE; n++) {
pkgDataFlags[n] = NULL;
}
return -1;
}
}
@@ -846,7 +857,10 @@ static int32_t initializePkgDataFlags(UPKGOptions *o) {
tmpResult = parseFlagsFile(o->options, pkgDataFlags, currentBufferSize, FLAG_NAMES, (int32_t)PKGDATA_FLAGS_SIZE, &status);
if (status == U_BUFFER_OVERFLOW_ERROR) {
for (int32_t i = 0; i < PKGDATA_FLAGS_SIZE; i++) {
uprv_free(pkgDataFlags[i]);
if (pkgDataFlags[i]) {
uprv_free(pkgDataFlags[i]);
pkgDataFlags[i] = NULL;
}
}
currentBufferSize = tmpResult;
} else if (U_FAILURE(status)) {
@@ -2088,7 +2102,7 @@ static void loadLists(UPKGOptions *o, UErrorCode *status)
/* Try calling icu-config directly to get the option file. */
static int32_t pkg_getOptionsFromICUConfig(UBool verbose, UOption *option) {
#if U_HAVE_POPEN
FILE *p = NULL;
LocalPipeFilePointer p;
size_t n;
static char buf[512] = "";
icu::CharString cmdBuf;
@@ -2107,24 +2121,21 @@ static void loadLists(UPKGOptions *o, UErrorCode *status)
if(verbose) {
fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf.data());
}
p = popen(cmdBuf.data(), "r");
p.adoptInstead(popen(cmdBuf.data(), "r"));
}
if(p == NULL || (n = fread(buf, 1, UPRV_LENGTHOF(buf)-1, p)) <= 0) {
if(verbose) {
fprintf(stdout, "# Calling icu-config: %s\n", cmd);
}
pclose(p);
if(p.isNull() || (n = fread(buf, 1, UPRV_LENGTHOF(buf)-1, p.getAlias())) <= 0) {
if(verbose) {
fprintf(stdout, "# Calling icu-config: %s\n", cmd);
}
p = popen(cmd, "r");
if(p == NULL || (n = fread(buf, 1, UPRV_LENGTHOF(buf)-1, p)) <= 0) {
fprintf(stderr, "%s: icu-config: No icu-config found. (fix PATH or use -O option)\n", progname);
return -1;
}
p.adoptInstead(popen(cmd, "r"));
if(p.isNull() || (n = fread(buf, 1, UPRV_LENGTHOF(buf)-1, p.getAlias())) <= 0) {
fprintf(stderr, "%s: icu-config: No icu-config found. (fix PATH or use -O option)\n", progname);
return -1;
}
}
pclose(p);
for (int32_t length = strlen(buf) - 1; length >= 0; length--) {
if (buf[length] == '\n' || buf[length] == ' ') {
buf[length] = 0;
@@ -2171,7 +2182,7 @@ static void pkg_createOptMatchArch(char *optMatchArch) {
T_FileStream_writeLine(stream, code);
T_FileStream_close(stream);
char cmd[SMALL_BUFFER_MAX_SIZE];
char cmd[LARGE_BUFFER_MAX_SIZE];
sprintf(cmd, "%s %s -o %s",
pkgDataFlags[COMPILER],
source,