| リビジョン | 76225b191e6b27be2f6d87a6c04d6e997e0e63ee (tree) |
|---|---|
| 日時 | 2018-08-11 05:31:36 |
| 作者 | Jeff Sharkey <jsharkey@andr...> |
| コミッター | android-build-team Robot |
Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407
* commit '635193ab36302e5f65e99c7df2f256cfd37068c7':
Bug: 80436257
Test: manual
Change-Id: I4cbae2d594edefa10e5e2c5236d17fe3d37818cd
(cherry picked from commit 9a35ab6a4f0cbc47ff389f0c632218a39bf49a45)
| @@ -213,17 +213,17 @@ static status_t readMetadata(const std::string& path, std::string& fsType, | ||
| 213 | 213 | for (const auto& line : output) { |
| 214 | 214 | // Extract values from blkid output, if defined |
| 215 | 215 | const char* cline = line.c_str(); |
| 216 | - const char* start = strstr(cline, "TYPE="); | |
| 216 | + const char* start = strstr(cline, "TYPE=\""); | |
| 217 | 217 | if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) { |
| 218 | 218 | fsType = value; |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | - start = strstr(cline, "UUID="); | |
| 221 | + start = strstr(cline, "UUID=\""); | |
| 222 | 222 | if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) { |
| 223 | 223 | fsUuid = value; |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | - start = strstr(cline, "LABEL="); | |
| 226 | + start = strstr(cline, "LABEL=\""); | |
| 227 | 227 | if (start != nullptr && sscanf(start + 6, "\"%127[^\"]\"", value) == 1) { |
| 228 | 228 | fsLabel = value; |
| 229 | 229 | } |
Android-x86
Fork
Utils.cpp