AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11863 pkgdata.cpp define & use LocalPipeFilePointer (auto pointer) for popen/pclose

Browse Source 
X-SVN-Rev: 37921
This commit is contained in:
Markus Scherer 2015-09-09 18:47:00 +00:00
parent d8a1859b6e
commit 2769a64643
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
icu4c/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);
@ -2095,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;
@ -2114,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;