android/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

delete script before running it, otherwise you have potential recovery loops

Browse Source
This commit is contained in:
Koushik K. Dutta 2010-03-11 22:17:43 -08:00
parent 6bd595cc32
commit 3836f72fbf
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
extendedcommands.c
View File

@ -413,20 +413,8 @@ int extendedcommand_file_exists()
return 0 == stat(EXTENDEDCOMMAND_SCRIPT, &file_info);
}
int run_script(char* filename)
int run_script_from_buffer(char* script_data, int script_len, char* filename)
{
struct stat file_info;
if (0 != stat(filename, &file_info)) {
printf("Error executing stat on file: %s\n", filename);
return 1;
}
int script_len = file_info.st_size;
char* script_data = (char*)malloc(script_len);
FILE *file = fopen(filename, "rb");
fread(script_data, script_len, 1, file);
fclose(file);
/* Parse the script. Note that the script and parse tree are never freed.
*/
const AmCommandList *commands = parseAmendScript(script_data, script_len);
@ -455,6 +443,25 @@ int run_script(char* filename)
return 0;
}
int run_script(char* filename, int delete_file)
{
struct stat file_info;
if (0 != stat(filename, &file_info)) {
printf("Error executing stat on file: %s\n", filename);
return 1;
}
int script_len = file_info.st_size;
char* script_data = (char*)malloc(script_len);
FILE *file = fopen(filename, "rb");
fread(script_data, script_len, 1, file);
fclose(file);
if (delete_file)
remove(filename);
return run_script_from_buffer(script_data, script_len, filename);
}
int run_and_remove_extendedcommand()
{
int i = 0;
@ -470,10 +477,7 @@ int run_and_remove_extendedcommand()
ui_print("Timed out waiting for SD card... continuing anyways.");
}
int ret = run_script(EXTENDEDCOMMAND_SCRIPT);
remove(EXTENDEDCOMMAND_SCRIPT);
return ret;
return run_script(EXTENDEDCOMMAND_SCRIPT, 1);
}
int amend_main(int argc, char** argv)
@ -488,5 +492,5 @@ int amend_main(int argc, char** argv)
if (register_update_commands(&ctx)) {
LOGE("Can't install update commands\n");
}
return run_script(argv[1]);
return run_script(argv[1], 0);
}

2
mtdutils/mtdutils.h
View File

@ -52,6 +52,4 @@ off_t mtd_erase_blocks(MtdWriteContext *, int blocks); /* 0 ok, -1 for all */
off_t mtd_find_write_start(MtdWriteContext *ctx, off_t pos);
int mtd_write_close(MtdWriteContext *);
ssize_t mtd_read_raw(MtdReadContext *ctx, char *data, size_t len);
#endif // MTDUTILS_H_