On Tue, 2017-07-11 at 15:37 +0200, Reichel Andreas wrote: > * Allow FAT12, FAT16 and FAT32 for environment data. > * Minor code style fixes > > Signed-off-by: Andreas Reichel <[email protected]> > --- > tools/bg_utils.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/tools/bg_utils.c b/tools/bg_utils.c > index 36ee279..257d8be 100644 > --- a/tools/bg_utils.c > +++ b/tools/bg_utils.c > @@ -151,7 +151,7 @@ static FILE *open_config_file(CONFIG_PART > *cfgpart, char *mode) > strncat(configfilepath, "/", 1); > strncat(configfilepath, FAT_ENV_FILENAME, > strlen(FAT_ENV_FILENAME)); > VERBOSE(stdout, "Probing config file at %s.\n", > configfilepath); > - FILE* config = fopen(configfilepath, mode); > + FILE *config = fopen(configfilepath, mode); > free(configfilepath); > return config; > } > @@ -224,7 +224,9 @@ bool probe_config_partitions(CONFIG_PART > *cfgpart) > PedPartition *part = pd->part_list; > while (part) { > if (!part->fs_type || !part->fs_type->name > || > - strcmp(part->fs_type->name, "fat16") != > 0) { > + (strcmp(part->fs_type->name, "fat12") != > 0 && > + strcmp(part->fs_type->name, "fat16") != > 0 && > + strcmp(part->fs_type->name, "fat32") != 0)) {
Are there any fat* left?
You could just use strncmp(part->fs_type->name, "fat", sizeof(char)*3);
> part = ped_disk_next_partition(pd,
> part);
> continue;
> }
> @@ -450,11 +452,14 @@ bool bgenv_write(BGENV *env)
> case BGENVTYPE_FAT:
> part = (CONFIG_PART *)env->desc;
> if (!part) {
> - VERBOSE(stderr, "Invalid config partition to
> store environment.\n");
> + VERBOSE(
> + stderr,
> + "Invalid config partition to store
> environment.\n");
> return false;
> }
> if (!write_env(part, env->data)) {
> - VERBOSE(stderr, "Could not write to %s\n",
> part->devpath);
> + VERBOSE(stderr, "Could not write to %s\n",
> + part->devpath);
> return false;
> }
> return true;
> --
> 2.11.0
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: [email protected]
PGP key: 6FF2 E59F 00C6 BC28 31D8 64C1 1173 CB19 9808 B153
Keyserver: hkp://pool.sks-keyservers.net
--
You received this message because you are subscribed to the Google Groups "EFI
Boot Guard" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/efibootguard-dev/1499798641.3494.5.camel%40denx.de.
For more options, visit https://groups.google.com/d/optout.
signature.asc
Description: This is a digitally signed message part
