c798c9cd24
In order to maintain compatibility with older trees, we now have minadbd.old and minui.old. I had to use a TARGET_GLOBAL_CFLAG to handle ifdef issues in minui/minui.d because healthd includes minui/minui.h and there was no other alternative to make minui.h compatible with older trees without having to modify healthd rules which is outside of TWRP. Note that the new minui does not currently have support for qcom overlay graphics. Support for this graphics mode will likely be added in a later patch set. If you are building in a 6.0 tree and have a device that needs qcom overlay graphics, be warned, as off mode charging may not work properly. A dead battery in this case could potentially brick your device if it is unable to charge as healthd handles charging duties. Update rules for building toolbox and add rules for making toybox Use permissive.sh in init.rc which will follow symlinks so we do not have to worry about what binary is supplying the setenforce functionality (toolbox, toybox, or busybox). Fix a few warnings in the main recovery binary source code. Fix a few includes that were missing that prevented compiling in 6.0 Change-Id: Ia67aa2107d260883da5e365475a19bea538e8b97
97 lines
2.3 KiB
C
97 lines
2.3 KiB
C
/*
|
|
Copyright 2012 bigbiff/Dees_Troy TeamWin
|
|
This file is part of TWRP/TeamWin Recovery Project.
|
|
|
|
TWRP is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
TWRP is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with TWRP. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include "libtar/libtar.h"
|
|
#include "twcommon.h"
|
|
|
|
int flush = 0, eot_count = -1;
|
|
unsigned char *write_buffer;
|
|
unsigned buffer_size = 4096;
|
|
unsigned buffer_loc = 0;
|
|
int buffer_status = 0;
|
|
|
|
void reinit_libtar_buffer(void) {
|
|
flush = 0;
|
|
eot_count = -1;
|
|
buffer_loc = 0;
|
|
buffer_status = 1;
|
|
}
|
|
|
|
void init_libtar_buffer(unsigned new_buff_size) {
|
|
if (new_buff_size != 0)
|
|
buffer_size = new_buff_size;
|
|
|
|
reinit_libtar_buffer();
|
|
write_buffer = (unsigned char*) malloc(sizeof(char *) * buffer_size);
|
|
}
|
|
|
|
void free_libtar_buffer(void) {
|
|
if (buffer_status > 0)
|
|
free(write_buffer);
|
|
buffer_status = 0;
|
|
}
|
|
|
|
ssize_t write_libtar_buffer(int fd, const void *buffer, size_t size) {
|
|
void* ptr;
|
|
|
|
if (flush == 0) {
|
|
ptr = write_buffer + buffer_loc;
|
|
memcpy(ptr, buffer, size);
|
|
buffer_loc += size;
|
|
if (eot_count >= 0 && eot_count < 2)
|
|
eot_count++;
|
|
/* At the end of the tar file, libtar will add 2 blank blocks.
|
|
Once we have received both EOT blocks, we will immediately
|
|
write anything in the buffer to the file.
|
|
*/
|
|
|
|
if (buffer_loc >= buffer_size || eot_count >= 2) {
|
|
flush = 1;
|
|
}
|
|
}
|
|
if (flush == 1) {
|
|
flush = 0;
|
|
if (buffer_loc == 0) {
|
|
// nothing to write
|
|
return 0;
|
|
}
|
|
if (write(fd, write_buffer, buffer_loc) != (int)buffer_loc) {
|
|
LOGERR("Error writing tar file!\n");
|
|
buffer_loc = 0;
|
|
return -1;
|
|
} else {
|
|
buffer_loc = 0;
|
|
return size;
|
|
}
|
|
} else {
|
|
return size;
|
|
}
|
|
// Shouldn't ever get here
|
|
return -1;
|
|
}
|
|
|
|
void flush_libtar_buffer(int fd) {
|
|
eot_count = 0;
|
|
if (buffer_status)
|
|
buffer_status = 2;
|
|
}
|