X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/ad9a031092f1d953d10bcf6ec77cb2fa1fc2c103..84c500666addc8378fb03c3844bf6d25faf54a87:/VtoyTool/vtoydump.c diff --git a/VtoyTool/vtoydump.c b/VtoyTool/vtoydump.c index fd557cf..e494598 100644 --- a/VtoyTool/vtoydump.c +++ b/VtoyTool/vtoydump.c @@ -43,6 +43,17 @@ typedef unsigned char uint8_t; #define VENTOY_GUID { 0x77772020, 0x2e77, 0x6576, { 0x6e, 0x74, 0x6f, 0x79, 0x2e, 0x6e, 0x65, 0x74 }} +typedef enum ventoy_fs_type +{ + ventoy_fs_exfat = 0, /* 0: exfat */ + ventoy_fs_ntfs, /* 1: NTFS */ + ventoy_fs_ext, /* 2: ext2/ext3/ext4 */ + ventoy_fs_xfs, /* 3: XFS */ + ventoy_fs_udf, /* 4: UDF */ + + ventoy_fs_max +}ventoy_fs_type; + #pragma pack(1) typedef struct ventoy_guid @@ -130,6 +141,11 @@ static int verbose = 0; static ventoy_guid vtoy_guid = VENTOY_GUID; +static const char *g_ventoy_fs[ventoy_fs_max] = +{ + "exfat", "ntfs", "ext*", "xfs", "udf" +}; + static int vtoy_check_os_param(ventoy_os_param *param) { uint32_t i; @@ -410,14 +426,10 @@ static int vtoy_print_os_param(ventoy_os_param *param, char *diskname) cnt = vtoy_find_disk_by_guid(param->vtoy_disk_guid, diskname); debug("find 0 disk by size, try with guid cnt=%d...\n", cnt); } - - if (param->vtoy_disk_part_type == 0) - { - fs = "exfat"; - } - else if (param->vtoy_disk_part_type == 0) + + if (param->vtoy_disk_part_type < ventoy_fs_max) { - fs = "ntfs"; + fs = g_ventoy_fs[param->vtoy_disk_part_type]; } else {