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

Commit 36c35119 authored by Tao Bao's avatar Tao Bao
Browse files

applypatch: Add testcases for applypatch executable. 

Refactor applypatch/main.cpp into libapplypatch_modes so that we can add
testcases.

Some changes to applypatch/main.cpp:
 - Replace char** argv with const char**;
 - Use android::base::Split() to split ":";
 - Use android::base::ParseUInt().

Bug: 32383590
Test: Unit tests pass, install-recovery.sh works.

Change-Id: I44e7bfa5ab717d439ea1d0ee9ddb7b2c40bb95a4
parent 3f4030e0

applypatch/Android.mk

+25 −5
Original line number Diff line number Diff line
@@ -68,21 +68,41 @@ LOCAL_STATIC_LIBRARIES += libcrypto libbz libz 
LOCAL_CFLAGS := -Werror

include $(BUILD_HOST_STATIC_LIBRARY)



# applypatch (executable)

# libapplypatch_modes (static library)

# ===============================

include $(CLEAR_VARS)

LOCAL_CLANG := true

LOCAL_SRC_FILES := main.cpp

LOCAL_SRC_FILES := \

    applypatch_modes.cpp

LOCAL_MODULE := libapplypatch_modes

LOCAL_C_INCLUDES := bootable/recovery

LOCAL_STATIC_LIBRARIES := \

    libapplypatch \

    libbase \

    libedify \

    libcrypto

LOCAL_CFLAGS := -Werror

include $(BUILD_STATIC_LIBRARY)



# applypatch (target executable)

# ===============================

include $(CLEAR_VARS)

LOCAL_CLANG := true

LOCAL_SRC_FILES := applypatch_main.cpp

LOCAL_MODULE := applypatch

LOCAL_C_INCLUDES += bootable/recovery

LOCAL_STATIC_LIBRARIES += \

LOCAL_C_INCLUDES := bootable/recovery

LOCAL_STATIC_LIBRARIES := \

    libapplypatch_modes \

    libapplypatch \

    libbase \

    libedify \

    libotafault \

    libcrypto \

    libbz

LOCAL_SHARED_LIBRARIES += libbase libz libcutils libc

LOCAL_SHARED_LIBRARIES := \

    libbase \

    libz \

    libcutils

LOCAL_CFLAGS := -Werror

include $(BUILD_EXECUTABLE)

applypatch/applypatch_main.cpp

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "applypatch_modes.h"



// This program (applypatch) applies binary patches to files in a way that

// is safe (the original file is not touched until we have the desired

// replacement for it) and idempotent (it's okay to run this program

// multiple times).

//

// See the comments to applypatch_modes() function.



int main(int argc, char** argv) {

    return applypatch_modes(argc, const_cast<const char**>(argv));

}

applypatch/main.cpp→applypatch/applypatch_modes.cpp

+27 −25
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 */



#include "applypatch_modes.h"



#include <stdio.h>

#include <stdlib.h>

#include <string.h>
@@ -23,12 +25,14 @@ 
#include <string>

#include <vector>



#include <android-base/parseint.h>

#include <android-base/strings.h>

#include <openssl/sha.h>



#include "applypatch/applypatch.h"

#include "edify/expr.h"



static int CheckMode(int argc, char** argv) {

static int CheckMode(int argc, const char** argv) {

    if (argc < 3) {

        return 2;

    }
@@ -40,44 +44,42 @@ static int CheckMode(int argc, char** argv) { 
    return applypatch_check(argv[2], sha1);

}



static int SpaceMode(int argc, char** argv) {

static int SpaceMode(int argc, const char** argv) {

    if (argc != 3) {

        return 2;

    }

    char* endptr;

    size_t bytes = strtol(argv[2], &endptr, 10);

    if (bytes == 0 && endptr == argv[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, char** argv, std::vector<std::string>* sha1s,

// 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,

                           std::vector<FileContents>* files) {

    if (sha1s == nullptr) {

        return false;

    }

    for (int i = 0; i < argc; ++i) {

        uint8_t digest[SHA_DIGEST_LENGTH];

        char* colon = strchr(argv[i], ':');

        if (colon == nullptr) {

            printf("no ':' in patch argument \"%s\"\n", argv[i]);

        std::vector<std::string> pieces = android::base::Split(argv[i], ":");

        if (pieces.size() != 2) {

            printf("failed to parse patch argument \"%s\"\n", argv[i]);

            return false;

        }

        *colon = '\0';

        ++colon;

        if (ParseSha1(argv[i], digest) != 0) {



        uint8_t digest[SHA_DIGEST_LENGTH];

        if (ParseSha1(pieces[0].c_str(), digest) != 0) {

            printf("failed to parse sha1 \"%s\"\n", argv[i]);

            return false;

        }



        sha1s->push_back(argv[i]);

        sha1s->push_back(pieces[0]);

        FileContents fc;

        if (LoadFileContents(colon, &fc) != 0) {

        if (LoadFileContents(pieces[1].c_str(), &fc) != 0) {

            return false;

        }

        files->push_back(std::move(fc));
@@ -90,7 +92,7 @@ static int FlashMode(const char* src_filename, const char* tgt_filename, 
    return applypatch_flash(src_filename, tgt_filename, tgt_sha1, tgt_size);

}



static int PatchMode(int argc, char** argv) {

static int PatchMode(int argc, const char** argv) {

    FileContents bonusFc;

    Value bonus(VAL_INVALID, "");
@@ -109,9 +111,8 @@ static int PatchMode(int argc, char** argv) { 
        return 2;

    }



    char* endptr;

    size_t target_size = strtol(argv[4], &endptr, 10);

    if (target_size == 0 && endptr == argv[4]) {

    size_t target_size;

    if (!android::base::ParseUint(argv[4], &target_size) || target_size == 0) {

        printf("can't parse \"%s\" as byte count\n\n", argv[4]);

        return 1;

    }
@@ -124,6 +125,7 @@ static int PatchMode(int argc, char** argv) { 
        }

        return FlashMode(argv[1], argv[2], argv[3], target_size);

    }



    std::vector<std::string> sha1s;

    std::vector<FileContents> files;

    if (!ParsePatchArgs(argc-5, argv+5, &sha1s, &files)) {
@@ -139,8 +141,8 @@ static int PatchMode(int argc, char** argv) { 
    return applypatch(argv[1], argv[2], argv[3], target_size, sha1s, patches, &bonus);

}



// This program applies binary patches to files in a way that is safe

// (the original file is not touched until we have the desired

// This program (applypatch) applies binary patches to files in a way that

// is safe (the original file is not touched until we have the desired

// replacement for it) and idempotent (it's okay to run this program

// multiple times).

//
@@ -166,7 +168,7 @@ static int PatchMode(int argc, char** argv) { 
// to read the source data.  See the comments for the

// LoadPartitionContents() function for the format of such a filename.



int main(int argc, char** argv) {

int applypatch_modes(int argc, const char** argv) {

    if (argc < 2) {

      usage:

        printf(

applypatch/applypatch_modes.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef _APPLYPATCH_MODES_H

#define _APPLYPATCH_MODES_H



int applypatch_modes(int argc, const char** argv);



#endif // _APPLYPATCH_MODES_H

tests/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ include $(BUILD_NATIVE_TEST) 
# Component tests

include $(CLEAR_VARS)

LOCAL_CLANG := true

LOCAL_CFLAGS += -Wno-unused-parameter -Werror

LOCAL_CFLAGS := -Werror

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_MODULE := recovery_component_test

LOCAL_C_INCLUDES := bootable/recovery
@@ -63,6 +63,7 @@ tune2fs_static_libraries := \ 
    libext2fs



LOCAL_STATIC_LIBRARIES := \

    libapplypatch_modes \

    libapplypatch \

    libedify \

    libotafault \