commit 730ed9dfec37441ae0cbb96f681381da6e113daa
author Dmitriy Ivanov <dimitry@google.com> Thu Jul 16 04:52:06 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Thu Jul 16 04:52:06 2015 -0700
tree d658def4a42a6dcf4d3003f45437cfb59781dc30
parent b31409040f1766d92e76e72bbdc1b346f4bb9d8e

Add constant for zip separator

Change-Id: I1dcbb15ac612fc28e922eb3de8148fcaebbc0820

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 97e390b..73eeba1 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -102,6 +102,7 @@
 
 static const ElfW(Versym) kVersymNotNeeded = 0;
 static const ElfW(Versym) kVersymGlobal = 1;
+static const char* const kZipFileSeparator = "!/";
 
 static const char* const* g_default_ld_paths;
 static std::vector<std::string> g_ld_library_paths;
@@ -1142,7 +1143,7 @@
   // of the zip file on disk and the subdirectory to search within it.
   // For example, if path is "foo.zip!/bar/bas/x.so", then we search for
   // "bar/bas/x.so" within "foo.zip".
-  const char* separator = strstr(path, "!/");
+  const char* separator = strstr(path, kZipFileSeparator);
   if (separator == nullptr) {
     return -1;
   }
@@ -1228,7 +1229,7 @@
     }
 
     int fd = -1;
-    if (strchr(buf, '!') != nullptr) {
+    if (strstr(buf, kZipFileSeparator) != nullptr) {
       fd = open_library_in_zipfile(buf, file_offset);
     }
 
@@ -1252,7 +1253,7 @@
 
   // If the name contains a slash, we should attempt to open it directly and not search the paths.
   if (strchr(name, '/') != nullptr) {
-    if (strchr(name, '!') != nullptr) {
+    if (strstr(name, kZipFileSeparator) != nullptr) {
       int fd = open_library_in_zipfile(name, file_offset);
       if (fd != -1) {
         return fd;