tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 am: 22b1fa7d61

Browse source 
am: 7ee4b7dd84

Change-Id: I9f372c9b371f28b70ec6832e66053d3aee5b7c8e
This commit is contained in:
Tao Bao 2017-04-26 17:07:44 +00:00 committed by android-build-merger
commit 41dc284309
2 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
applypatch/applypatch_modes.cpp
View file

@ -44,19 +44,6 @@ static int CheckMode(int argc, const char** argv) {
return applypatch_check(argv[2], sha1); return applypatch_check(argv[2], sha1);
} }
static int SpaceMode(int argc, const char** argv) {
if (argc != 3) {
return 2;
}
size_t bytes;
if (!android::base::ParseUint(argv[2], &bytes) || bytes == 0) {
printf("can't parse \"%s\" as byte count\n\n", argv[2]);
return 1;
}
return CacheSizeCheck(bytes);
}
// Parse arguments (which should be of the form "<sha1>:<filename>" into the // Parse arguments (which should be of the form "<sha1>:<filename>" into the
// new parallel arrays *sha1s and *files. Returns true on success. // new parallel arrays *sha1s and *files. Returns true on success.
static bool ParsePatchArgs(int argc, const char** argv, std::vector<std::string>* sha1s, static bool ParsePatchArgs(int argc, const char** argv, std::vector<std::string>* sha1s,
@ -175,13 +162,12 @@ int applypatch_modes(int argc, const char** argv) {
"usage: %s [-b <bonus-file>] <src-file> <tgt-file> <tgt-sha1> <tgt-size> " "usage: %s [-b <bonus-file>] <src-file> <tgt-file> <tgt-sha1> <tgt-size> "
"[<src-sha1>:<patch> ...]\n" "[<src-sha1>:<patch> ...]\n"
" or %s -c <file> [<sha1> ...]\n" " or %s -c <file> [<sha1> ...]\n"
" or %s -s <bytes>\n"
" or %s -l\n" " or %s -l\n"
"\n" "\n"
"Filenames may be of the form\n" "Filenames may be of the form\n"
" EMMC:<partition>:<len_1>:<sha1_1>:<len_2>:<sha1_2>:...\n" " EMMC:<partition>:<len_1>:<sha1_1>:<len_2>:<sha1_2>:...\n"
"to specify reading from or writing to an EMMC partition.\n\n", "to specify reading from or writing to an EMMC partition.\n\n",
argv[0], argv[0], argv[0], argv[0]); argv[0], argv[0], argv[0]);
return 2; return 2;
} }
@ -191,8 +177,6 @@ int applypatch_modes(int argc, const char** argv) {
result = ShowLicenses(); result = ShowLicenses();
} else if (strncmp(argv[1], "-c", 3) == 0) { } else if (strncmp(argv[1], "-c", 3) == 0) {
result = CheckMode(argc, argv); result = CheckMode(argc, argv);
} else if (strncmp(argv[1], "-s", 3) == 0) {
result = SpaceMode(argc, argv);
} else { } else {
result = PatchMode(argc, argv); result = PatchMode(argc, argv);
} }

14
tests/component/applypatch_test.cpp
View file

@ -377,20 +377,6 @@ TEST(ApplyPatchModesTest, CheckModeInvalidArgs) {
ASSERT_EQ(2, applypatch_modes(2, (const char* []){ "applypatch", "-c" })); ASSERT_EQ(2, applypatch_modes(2, (const char* []){ "applypatch", "-c" }));
} }
TEST(ApplyPatchModesTest, SpaceModeInvalidArgs) {
// Insufficient args.
ASSERT_EQ(2, applypatch_modes(2, (const char* []){ "applypatch", "-s" }));
// Invalid bytes arg.
ASSERT_EQ(1, applypatch_modes(3, (const char* []){ "applypatch", "-s", "x" }));
// 0 is invalid.
ASSERT_EQ(1, applypatch_modes(3, (const char* []){ "applypatch", "-s", "0" }));
// 0x10 is fine.
ASSERT_EQ(0, applypatch_modes(3, (const char* []){ "applypatch", "-s", "0x10" }));
}
TEST(ApplyPatchModesTest, ShowLicenses) { TEST(ApplyPatchModesTest, ShowLicenses) {
ASSERT_EQ(0, applypatch_modes(2, (const char* []){ "applypatch", "-l" })); ASSERT_EQ(0, applypatch_modes(2, (const char* []){ "applypatch", "-l" }));
} }