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

Commit 201cd466 authored by Doug Zongker's avatar Doug Zongker
Browse files

remove shadowed variable declaration 

An accidental variable declaration ("int enough_space = ..." instead
of "enough_space = " inside a block) shadowing the real one meant we
were always using the copy-to-cache path for patching, even when not
necessary.  Remove it.  Enforce an absolute minimum of free space as
well, to avoid running into problems patching small files, now that
the copy-to-cache path is (inadvertently) well-tested.

Change-Id: Idb7d57241a9adcda2e11001fa44f0cd67ce40d19
parent 8cd9e4f3

applypatch/applypatch.c

+2 −1
Original line number Diff line number Diff line
@@ -645,7 +645,8 @@ int applypatch(const char* source_filename, 
            int enough_space = 0;

            if (retry > 0) {

                size_t free_space = FreeSpaceForFile(target_fs);

                int enough_space =

                enough_space =

                    (free_space > (256 << 10)) &&          // 256k (two-block) minimum

                    (free_space > (target_size * 3 / 2));  // 50% margin of error

                printf("target %ld bytes; free space %ld bytes; retry %d; enough %d\n",

                       (long)target_size, (long)free_space, retry, enough_space);