pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make 'mkbootfs' print a usage message for insufficent args. 

Right now, it just prints "no directories to process". There is also no
indication anywhere about the availability of the -f and -d flags.

Also took the opportunity to perform small quality-of-life improvements,
like updating error messages, hiding internal functions.

Test: (cd system/core/mkbootfs && mma) && ./out/host/linux-x86/bin/mkbootfs
Change-Id: Ia81eff0308e6e2686dde979d47c0bf938afbaf82
This commit is contained in:
Mateus Azis 2022-07-12 15:38:47 -07:00
parent 0c1fdc1a09
commit 023f67b95e
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mkbootfs/mkbootfs.c
View File

@ -24,8 +24,7 @@
** - device notes, pipes, etc are not supported (error) ** - device notes, pipes, etc are not supported (error)
*/ */
void die(const char *why, ...) static void die(const char* why, ...) {
{
va_list ap; va_list ap;
va_start(ap, why); va_start(ap, why);
@ -42,7 +41,7 @@ struct fs_config_entry {
}; };
static struct fs_config_entry* canned_config = NULL; static struct fs_config_entry* canned_config = NULL;
static char *target_out_path = NULL; static const char* target_out_path = NULL;
/* Each line in the canned file should be a path plus three ints (uid, /* Each line in the canned file should be a path plus three ints (uid,
* gid, mode). */ * gid, mode). */
@ -273,8 +272,7 @@ static void _archive(char *in, char *out, int ilen, int olen)
} }
} }
void archive(const char *start, const char *prefix) static void archive(const char* start, const char* prefix) {
{
char in[8192]; char in[8192];
char out[8192]; char out[8192];
@ -294,7 +292,7 @@ static void read_canned_config(char* filename)
char line[CANNED_LINE_LENGTH]; char line[CANNED_LINE_LENGTH];
FILE* f = fopen(filename, "r"); FILE* f = fopen(filename, "r");
if (f == NULL) die("failed to open canned file"); if (f == NULL) die("failed to open canned file '%s'", filename);
while (fgets(line, CANNED_LINE_LENGTH, f) != NULL) { while (fgets(line, CANNED_LINE_LENGTH, f) != NULL) {
if (!line[0]) break; if (!line[0]) break;
@ -332,6 +330,13 @@ static void read_canned_config(char* filename)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
if (argc == 1) {
fprintf(stderr,
"usage: %s [-d TARGET_OUTPUT_PATH] [-f CANNED_CONFIGURATION_PATH] DIRECTORIES...\n",
argv[0]);
exit(1);
}
argc--; argc--;
argv++; argv++;