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

Commit 34df98ee authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic 'sinkfn' 

* changes:
  applypatch: Let Apply{BSDiff,Image}Patch accept std::function.
  applypatch: Change the ssize_t length parameters to size_t.
parents f037b7b5 c0e1c46a

applypatch/applypatch.cpp

+20 −25
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <sys/types.h>

#include <unistd.h>



#include <functional>

#include <memory>

#include <string>

#include <utility>
@@ -42,7 +43,7 @@ 
#include "print_sha1.h"



static int LoadPartitionContents(const std::string& filename, FileContents* file);

static ssize_t FileSink(const unsigned char* data, ssize_t len, void* token);

static size_t FileSink(const unsigned char* data, size_t len, int fd);

static int GenerateTarget(const FileContents& source_file, const std::unique_ptr<Value>& patch,

                          const std::string& target_filename,

                          const uint8_t target_sha1[SHA_DIGEST_LENGTH], const Value* bonus_data);
@@ -194,8 +195,8 @@ int SaveFileContents(const char* filename, const FileContents* file) { 
    return -1;

  }



  ssize_t bytes_written = FileSink(file->data.data(), file->data.size(), &fd);

  if (bytes_written != static_cast<ssize_t>(file->data.size())) {

  size_t bytes_written = FileSink(file->data.data(), file->data.size(), fd);

  if (bytes_written != file->data.size()) {

    printf("short write of \"%s\" (%zd bytes of %zu): %s\n", filename, bytes_written,

           file->data.size(), strerror(errno));

    return -1;
@@ -433,12 +434,10 @@ int ShowLicenses() { 
    return 0;

}



ssize_t FileSink(const unsigned char* data, ssize_t len, void* token) {

    int fd = *static_cast<int*>(token);

    ssize_t done = 0;

    ssize_t wrote;

static size_t FileSink(const unsigned char* data, size_t len, int fd) {

  size_t done = 0;

  while (done < len) {

        wrote = TEMP_FAILURE_RETRY(ota_write(fd, data+done, len-done));

    ssize_t wrote = TEMP_FAILURE_RETRY(ota_write(fd, data + done, len - done));

    if (wrote == -1) {

      printf("error writing %zd bytes: %s\n", (len - done), strerror(errno));

      return done;
@@ -448,12 +447,6 @@ ssize_t FileSink(const unsigned char* data, ssize_t len, void* token) { 
  return done;

}



ssize_t MemorySink(const unsigned char* data, ssize_t len, void* token) {

    std::string* s = static_cast<std::string*>(token);

    s->append(reinterpret_cast<const char*>(data), len);

    return len;

}



// Return the amount of free space (in bytes) on the filesystem

// containing filename.  filename must exist.  Return -1 on error.

size_t FreeSpaceForFile(const char* filename) {
@@ -647,9 +640,11 @@ static int GenerateTarget(const FileContents& source_file, const std::unique_ptr 
  }



  // We store the decoded output in memory.

  SinkFn sink = MemorySink;

  std::string memory_sink_str;  // Don't need to reserve space.

  void* token = &memory_sink_str;

  SinkFn sink = [&memory_sink_str](const unsigned char* data, size_t len) {

    memory_sink_str.append(reinterpret_cast<const char*>(data), len);

    return len;

  };



  SHA_CTX ctx;

  SHA1_Init(&ctx);
@@ -657,10 +652,10 @@ static int GenerateTarget(const FileContents& source_file, const std::unique_ptr 
  int result;

  if (use_bsdiff) {

    result = ApplyBSDiffPatch(source_file.data.data(), source_file.data.size(), patch.get(), 0,

                              sink, token, &ctx);

                              sink, &ctx);

  } else {

    result = ApplyImagePatch(source_file.data.data(), source_file.data.size(), patch.get(), sink,

                             token, &ctx, bonus_data);

                             &ctx, bonus_data);

  }



  if (result != 0) {

applypatch/bspatch.cpp

+7 −7
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
#include <sys/types.h>



#include <bspatch.h>

#include <openssl/sha.h>



#include "applypatch/applypatch.h"

#include "openssl/sha.h"



void ShowBSDiffLicense() {

    puts("The bsdiff library used herein is:\n"
@@ -60,10 +60,10 @@ void ShowBSDiffLicense() { 
        );

}



int ApplyBSDiffPatch(const unsigned char* old_data, ssize_t old_size, const Value* patch,

                     ssize_t patch_offset, SinkFn sink, void* token, SHA_CTX* ctx) {

  auto sha_sink = [&](const uint8_t* data, size_t len) {

    len = sink(data, len, token);

int ApplyBSDiffPatch(const unsigned char* old_data, size_t old_size, const Value* patch,

                     size_t patch_offset, SinkFn sink, SHA_CTX* ctx) {

  auto sha_sink = [&sink, &ctx](const uint8_t* data, size_t len) {

    len = sink(data, len);

    if (ctx) SHA1_Update(ctx, data, len);

    return len;

  };
@@ -72,8 +72,8 @@ int ApplyBSDiffPatch(const unsigned char* old_data, ssize_t old_size, const Valu 
                         patch->data.size(), sha_sink);

}



int ApplyBSDiffPatchMem(const unsigned char* old_data, ssize_t old_size, const Value* patch,

                        ssize_t patch_offset, std::vector<unsigned char>* new_data) {

int ApplyBSDiffPatchMem(const unsigned char* old_data, size_t old_size, const Value* patch,

                        size_t patch_offset, std::vector<unsigned char>* new_data) {

  auto vector_sink = [new_data](const uint8_t* data, size_t len) {

    new_data->insert(new_data->end(), data, data + len);

    return len;

applypatch/imgpatch.cpp

+12 −14
Original line number Diff line number Diff line
@@ -43,12 +43,11 @@ static inline int32_t Read4(const void *address) { 
  return android::base::get_unaligned<int32_t>(address);

}



int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size,

                    const unsigned char* patch_data, ssize_t patch_size,

                    SinkFn sink, void* token) {

int ApplyImagePatch(const unsigned char* old_data, size_t old_size, const unsigned char* patch_data,

                    size_t patch_size, SinkFn sink) {

  Value patch(VAL_BLOB, std::string(reinterpret_cast<const char*>(patch_data), patch_size));



  return ApplyImagePatch(old_data, old_size, &patch, sink, token, nullptr, nullptr);

  return ApplyImagePatch(old_data, old_size, &patch, sink, nullptr, nullptr);

}



/*
@@ -57,8 +56,8 @@ int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size, 
 * file, and update the SHA context with the output data as well.

 * Return 0 on success.

 */

int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size, const Value* patch,

                    SinkFn sink, void* token, SHA_CTX* ctx, const Value* bonus_data) {

int ApplyImagePatch(const unsigned char* old_data, size_t old_size, const Value* patch, SinkFn sink,

                    SHA_CTX* ctx, const Value* bonus_data) {

  if (patch->data.size() < 12) {

    printf("patch too short to contain header\n");

    return -1;
@@ -97,11 +96,11 @@ int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size, const Value 
      size_t src_len = static_cast<size_t>(Read8(normal_header + 8));

      size_t patch_offset = static_cast<size_t>(Read8(normal_header + 16));



      if (src_start + src_len > static_cast<size_t>(old_size)) {

      if (src_start + src_len > old_size) {

        printf("source data too short\n");

        return -1;

      }

      ApplyBSDiffPatch(old_data + src_start, src_len, patch, patch_offset, sink, token, ctx);

      ApplyBSDiffPatch(old_data + src_start, src_len, patch, patch_offset, sink, ctx);

    } else if (type == CHUNK_RAW) {

      const char* raw_header = &patch->data[pos];

      pos += 4;
@@ -110,15 +109,14 @@ int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size, const Value 
        return -1;

      }



      ssize_t data_len = Read4(raw_header);

      size_t data_len = static_cast<size_t>(Read4(raw_header));



      if (pos + data_len > patch->data.size()) {

        printf("failed to read chunk %d raw data\n", i);

        return -1;

      }

      if (ctx) SHA1_Update(ctx, &patch->data[pos], data_len);

      if (sink(reinterpret_cast<const unsigned char*>(&patch->data[pos]), data_len, token) !=

          data_len) {

      if (sink(reinterpret_cast<const unsigned char*>(&patch->data[pos]), data_len) != data_len) {

        printf("failed to write chunk %d raw data\n", i);

        return -1;

      }
@@ -143,7 +141,7 @@ int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size, const Value 
      int memLevel = Read4(deflate_header + 52);

      int strategy = Read4(deflate_header + 56);



      if (src_start + src_len > static_cast<size_t>(old_size)) {

      if (src_start + src_len > old_size) {

        printf("source data too short\n");

        return -1;

      }
@@ -240,9 +238,9 @@ int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size, const Value 
          strm.avail_out = temp_data.size();

          strm.next_out = temp_data.data();

          ret = deflate(&strm, Z_FINISH);

          ssize_t have = temp_data.size() - strm.avail_out;

          size_t have = temp_data.size() - strm.avail_out;



          if (sink(temp_data.data(), have, token) != have) {

          if (sink(temp_data.data(), have) != have) {

            printf("failed to write %zd compressed bytes to output\n", have);

            return -1;

          }

applypatch/include/applypatch/applypatch.h

+8 −11
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <stdint.h>

#include <sys/stat.h>



#include <functional>

#include <memory>

#include <string>

#include <vector>
@@ -41,7 +42,7 @@ struct FileContents { 
// and use it as the source instead.

#define CACHE_TEMP_SOURCE "/cache/saved.file"



typedef ssize_t (*SinkFn)(const unsigned char*, ssize_t, void*);

using SinkFn = std::function<size_t(const unsigned char*, size_t)>;



// applypatch.cpp

int ShowLicenses();
@@ -66,18 +67,14 @@ int SaveFileContents(const char* filename, const FileContents* file); 


// bspatch.cpp

void ShowBSDiffLicense();

int ApplyBSDiffPatch(const unsigned char* old_data, ssize_t old_size,

                     const Value* patch, ssize_t patch_offset,

                     SinkFn sink, void* token, SHA_CTX* ctx);

int ApplyBSDiffPatchMem(const unsigned char* old_data, ssize_t old_size,

                        const Value* patch, ssize_t patch_offset,

                        std::vector<unsigned char>* new_data);

int ApplyBSDiffPatch(const unsigned char* old_data, size_t old_size, const Value* patch,

                     size_t patch_offset, SinkFn sink, SHA_CTX* ctx);

int ApplyBSDiffPatchMem(const unsigned char* old_data, size_t old_size, const Value* patch,

                        size_t patch_offset, std::vector<unsigned char>* new_data);



// imgpatch.cpp

int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size,

                    const Value* patch,

                    SinkFn sink, void* token, SHA_CTX* ctx,

                    const Value* bonus_data);

int ApplyImagePatch(const unsigned char* old_data, size_t old_size, const Value* patch, SinkFn sink,

                    SHA_CTX* ctx, const Value* bonus_data);



// freecache.cpp

int MakeFreeSpaceOnCache(size_t bytes_needed);

applypatch/include/applypatch/imgpatch.h

+5 −4
Original line number Diff line number Diff line
@@ -19,10 +19,11 @@ 


#include <sys/types.h>



using SinkFn = ssize_t (*)(const unsigned char*, ssize_t, void*);

#include <functional>



int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size,

                    const unsigned char* patch_data, ssize_t patch_size,

                    SinkFn sink, void* token);

using SinkFn = std::function<size_t(const unsigned char*, size_t)>;



int ApplyImagePatch(const unsigned char* old_data, size_t old_size, const unsigned char* patch_data,

                    size_t patch_size, SinkFn sink);



#endif  // _APPLYPATCH_IMGPATCH_H