Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ab28082 authored by Tao Bao's avatar Tao Bao
Browse files

applypatch: Remove the obsolete support for "applypatch -s". 

The SpaceMode (applypatch -s) was used in amend script (cupcake) only,
which has been removed since commit
9ce2ebf5d300eba5f6086583b0941ef68a3e4b42 (platform/build). The later
(and current) edify script uses apply_patch_space().

Note that other modes (PatchMode, CheckMode) of applypatch executable
are mostly used by install-recovery.sh script.

Test: No active user of "applypatch -s".
Test: recovery_component_test
Change-Id: I1d689b7fedd3884077e88ed1d6c22f7a2198859d
parent dff22760

applypatch/applypatch_modes.cpp

+1 −17
Original line number Diff line number Diff line
@@ -44,19 +44,6 @@ static int CheckMode(int argc, const char** argv) { 
    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

// new parallel arrays *sha1s and *files. Returns true on success.

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> "

            "[<src-sha1>:<patch> ...]\n"

            "   or  %s -c <file> [<sha1> ...]\n"

            "   or  %s -s <bytes>\n"

            "   or  %s -l\n"

            "\n"

            "Filenames may be of the form\n"

            "  EMMC:<partition>:<len_1>:<sha1_1>:<len_2>:<sha1_2>:...\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;

    }
@@ -191,8 +177,6 @@ int applypatch_modes(int argc, const char** argv) { 
        result = ShowLicenses();

    } else if (strncmp(argv[1], "-c", 3) == 0) {

        result = CheckMode(argc, argv);

    } else if (strncmp(argv[1], "-s", 3) == 0) {

        result = SpaceMode(argc, argv);

    } else {

        result = PatchMode(argc, argv);

    }

tests/component/applypatch_test.cpp

+0 −14
Original line number Diff line number Diff line
@@ -377,20 +377,6 @@ TEST(ApplyPatchModesTest, CheckModeInvalidArgs) { 
  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) {

  ASSERT_EQ(0, applypatch_modes(2, (const char* []){ "applypatch", "-l" }));

}