drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread

Browse Source
This commit is contained in:
Kenny Root
2010-10-22 12:18:46 -07:00
committed by Android Git Automerger
parent 02482e205a 40763914e3
commit faf53c0bf2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmds/installd/commands.c
View File

@ -946,14 +946,12 @@ int linklib(const char* dataDir, const char* asecLibDir)
const size_t libdirLen = strlen(dataDir) + strlen(PKG_LIB_POSTFIX); const size_t libdirLen = strlen(dataDir) + strlen(PKG_LIB_POSTFIX);
if (libdirLen >= PKG_PATH_MAX) { if (libdirLen >= PKG_PATH_MAX) {
LOGE("library dir len too large"); LOGE("library dir len too large");
rc = -1; return -1;
goto out;
} }
if (snprintf(libdir, sizeof(libdir), "%s%s", dataDir, PKG_LIB_POSTFIX) != (ssize_t)libdirLen) { if (snprintf(libdir, sizeof(libdir), "%s%s", dataDir, PKG_LIB_POSTFIX) != (ssize_t)libdirLen) {
LOGE("library dir not written successfully: %s\n", strerror(errno)); LOGE("library dir not written successfully: %s\n", strerror(errno));
rc = -1; return -1;
goto out;
} }
if (stat(dataDir, &s) < 0) return -1; if (stat(dataDir, &s) < 0) return -1;