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

ICU-7663 Allocate cmd buffer if needed.

Browse Source 
X-SVN-Rev: 28002
This commit is contained in:
Michael Ow 2010-04-29 21:42:50 +00:00
parent d879ca2f76
commit 2e50961632
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
icu4c/source/tools/pkgdata/pkgdata.cpp
View File

@ -472,29 +472,48 @@ main(int argc, char* argv[]) {
}
static int runCommand(const char* command, UBool specialHandling) {
char cmd[SMALL_BUFFER_MAX_SIZE];
char *cmd = NULL;
char cmdBuffer[SMALL_BUFFER_MAX_SIZE];
int32_t len = strlen(command);
if (len == 0) {
return 0;
}
if (!specialHandling) {
#if defined(USING_CYGWIN) || defined(OS400)
#define CMD_PADDING_SIZE 20
if ((len + CMD_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) {
cmd = (char *)uprv_malloc(len + CMD_PADDING_SIZE);
} else {
cmd = cmdBuffer;
}
#ifdef USING_CYGWIN
sprintf(cmd, "bash -c \"%s\"", command);
#elif defined(OS400)
sprintf(cmd, "QSH CMD('%s')", command);
#endif
#else
goto normal_command_mode;
#endif
} else {
normal_command_mode:
sprintf(cmd, "%s", command);
cmd = (char *)command;
}
printf("pkgdata: %s\n", cmd);
int result = system(cmd);
if (result != 0) {
printf("-- return status = %d\n", result);
if (result != 0) {
printf("-- return status = %d\n", result);
}
return result;
}
if (cmd != cmdBuffer && cmd != command) {
uprv_free(cmd);
}
return result;
}
#define LN_CMD "ln -s"
#define RM_CMD "rm -f"