X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/849dfb463d5788f483668d2abe886e4a2b628172..261ddcef45ede2f9440342a5b3dd474e26df1679:/VtoyTool/vtoydump.c diff --git a/VtoyTool/vtoydump.c b/VtoyTool/vtoydump.c index 72b7815..c090b7e 100644 --- a/VtoyTool/vtoydump.c +++ b/VtoyTool/vtoydump.c @@ -31,103 +31,7 @@ #include #include #include - -#define IS_DIGIT(x) ((x) >= '0' && (x) <= '9') - -#ifndef USE_DIET_C -#ifndef __mips__ -typedef unsigned long long uint64_t; -#endif -typedef unsigned int uint32_t; -typedef unsigned short uint16_t; -typedef unsigned char uint8_t; -#endif - -#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_fat, /* 5: FAT */ - - ventoy_fs_max -}ventoy_fs_type; - -#pragma pack(1) - -typedef struct ventoy_guid -{ - uint32_t data1; - uint16_t data2; - uint16_t data3; - uint8_t data4[8]; -}ventoy_guid; - - -typedef struct ventoy_image_disk_region -{ - uint32_t image_sector_count; /* image sectors contained in this region */ - uint32_t image_start_sector; /* image sector start */ - uint64_t disk_start_sector; /* disk sector start */ -}ventoy_image_disk_region; - -typedef struct ventoy_image_location -{ - ventoy_guid guid; - - /* image sector size, currently this value is always 2048 */ - uint32_t image_sector_size; - - /* disk sector size, normally the value is 512 */ - uint32_t disk_sector_size; - - uint32_t region_count; - - /* - * disk region data - * If the image file has more than one fragments in disk, - * there will be more than one region data here. - * You can calculate the region count by - */ - ventoy_image_disk_region regions[1]; - - /* ventoy_image_disk_region regions[2~region_count-1] */ -}ventoy_image_location; - -typedef struct ventoy_os_param -{ - ventoy_guid guid; // VENTOY_GUID - uint8_t chksum; // checksum - - uint8_t vtoy_disk_guid[16]; - uint64_t vtoy_disk_size; // disk size in bytes - uint16_t vtoy_disk_part_id; // begin with 1 - uint16_t vtoy_disk_part_type; // 0:exfat 1:ntfs other: reserved - char vtoy_img_path[384]; // It seems to be enough, utf-8 format - uint64_t vtoy_img_size; // image file size in bytes - - /* - * Ventoy will write a copy of ventoy_image_location data into runtime memory - * this is the physically address and length of that memory. - * Address 0 means no such data exist. - * Address will be aligned by 4KB. - * - */ - uint64_t vtoy_img_location_addr; - uint32_t vtoy_img_location_len; - - uint64_t vtoy_reserved[4]; // Internal use by ventoy - - uint8_t vtoy_disk_signature[4]; - - uint8_t reserved[27]; -}ventoy_os_param; - -#pragma pack() +#include "vtoytool.h" #ifndef O_BINARY #define O_BINARY 0 @@ -234,8 +138,16 @@ static void vtoy_dump_os_param(ventoy_os_param *param) printf("param->vtoy_img_size = <%llu>\n", (unsigned long long)param->vtoy_img_size); printf("param->vtoy_img_location_addr = <0x%llx>\n", (unsigned long long)param->vtoy_img_location_addr); printf("param->vtoy_img_location_len = <%u>\n", param->vtoy_img_location_len); - printf("param->vtoy_reserved[0] = 0x%llx\n", (unsigned long long)param->vtoy_reserved[0]); - printf("param->vtoy_reserved[1] = 0x%llx\n", (unsigned long long)param->vtoy_reserved[1]); + printf("param->vtoy_reserved = %02x %02x %02x %02x %02x %02x %02x %02x\n", + param->vtoy_reserved[0], + param->vtoy_reserved[1], + param->vtoy_reserved[2], + param->vtoy_reserved[3], + param->vtoy_reserved[4], + param->vtoy_reserved[5], + param->vtoy_reserved[6], + param->vtoy_reserved[7] + ); printf("\n"); } @@ -392,7 +304,7 @@ static int vtoy_find_disk_by_size(unsigned long long size, char *diskname) return rc; } -static int vtoy_find_disk_by_guid(ventoy_os_param *param, char *diskname) +int vtoy_find_disk_by_guid(ventoy_os_param *param, char *diskname) { int rc = 0; int count = 0; @@ -416,6 +328,7 @@ static int vtoy_find_disk_by_guid(ventoy_os_param *param, char *diskname) } memset(vtguid, 0, sizeof(vtguid)); + memset(vtsig, 0, sizeof(vtsig)); rc = vtoy_get_disk_guid(p->d_name, vtguid, vtsig); if (rc == 0 && memcmp(vtguid, param->vtoy_disk_guid, 16) == 0 && memcmp(vtsig, param->vtoy_disk_signature, 4) == 0) @@ -429,12 +342,108 @@ static int vtoy_find_disk_by_guid(ventoy_os_param *param, char *diskname) return count; } +static int vtoy_find_disk_by_sig(uint8_t *sig, char *diskname) +{ + int rc = 0; + int count = 0; + DIR* dir = NULL; + struct dirent* p = NULL; + uint8_t vtguid[16]; + uint8_t vtsig[16]; + + dir = opendir("/sys/block"); + if (!dir) + { + return 0; + } + + while ((p = readdir(dir)) != NULL) + { + if (!vtoy_is_possible_blkdev(p->d_name)) + { + debug("disk %s is filted by name\n", p->d_name); + continue; + } + + memset(vtguid, 0, sizeof(vtguid)); + memset(vtsig, 0, sizeof(vtsig)); + rc = vtoy_get_disk_guid(p->d_name, vtguid, vtsig); + if (rc == 0 && memcmp(vtsig, sig, 4) == 0) + { + sprintf(diskname, "%s", p->d_name); + count++; + } + } + closedir(dir); + + return count; +} + static int vtoy_printf_iso_path(ventoy_os_param *param) { printf("%s\n", param->vtoy_img_path); return 0; } +static int vtoy_printf_fs(ventoy_os_param *param) +{ + const char *fs[] = + { + "exfat", "ntfs", "ext", "xfs", "udf", "fat" + }; + + if (param->vtoy_disk_part_type < 6) + { + printf("%s\n", fs[param->vtoy_disk_part_type]); + } + else + { + printf("unknown\n"); + } + return 0; +} + +static int vtoy_vlnk_printf(ventoy_os_param *param, char *diskname) +{ + int cnt = 0; + uint8_t disk_sig[4]; + uint8_t mbr[512]; + int fd = -1; + char diskpath[128]; + uint8_t check[8] = { 0x56, 0x54, 0x00, 0x47, 0x65, 0x00, 0x48, 0x44 }; + + memcpy(disk_sig, param->vtoy_reserved + 7, 4); + + debug("vlnk disk sig: %02x %02x %02x %02x \n", disk_sig[0], disk_sig[1], disk_sig[2], disk_sig[3]); + + cnt = vtoy_find_disk_by_sig(disk_sig, diskname); + if (cnt == 1) + { + snprintf(diskpath, sizeof(diskpath), "/dev/%s", diskname); + fd = open(diskpath, O_RDONLY | O_BINARY); + if (fd >= 0) + { + memset(mbr, 0, sizeof(mbr)); + read(fd, mbr, sizeof(mbr)); + close(fd); + + if (memcmp(mbr + 0x190, check, 8) == 0) + { + printf("/dev/%s", diskname); + return 0; + } + else + { + debug("check data failed /dev/%s\n", diskname); + } + } + } + + debug("find count=%d\n", cnt); + printf("unknown"); + return 1; +} + static int vtoy_check_device(ventoy_os_param *param, const char *device) { unsigned long long size; @@ -506,7 +515,7 @@ static int vtoy_print_os_param(ventoy_os_param *param, char *diskname) snprintf(diskpath, sizeof(diskpath) - 1, "/sys/class/block/%s2/size", diskname); } - if (access(diskpath, F_OK) >= 0) + if (param->vtoy_reserved[6] == 0 && access(diskpath, F_OK) >= 0) { debug("get part size from sysfs for %s\n", diskpath); @@ -551,12 +560,14 @@ int vtoydump_main(int argc, char **argv) int rc; int ch; int print_path = 0; + int print_fs = 0; + int vlnk_print = 0; char filename[256] = {0}; char diskname[256] = {0}; char device[64] = {0}; ventoy_os_param *param = NULL; - while ((ch = getopt(argc, argv, "c:f:p:v::")) != -1) + while ((ch = getopt(argc, argv, "c:f:p:t:s:v::")) != -1) { if (ch == 'f') { @@ -575,6 +586,16 @@ int vtoydump_main(int argc, char **argv) print_path = 1; strncpy(filename, optarg, sizeof(filename) - 1); } + else if (ch == 't') + { + vlnk_print = 1; + strncpy(filename, optarg, sizeof(filename) - 1); + } + else if (ch == 's') + { + print_fs = 1; + strncpy(filename, optarg, sizeof(filename) - 1); + } else { fprintf(stderr, "Usage: %s -f datafile [ -v ] \n", argv[0]); @@ -627,6 +648,14 @@ int vtoydump_main(int argc, char **argv) { rc = vtoy_printf_iso_path(param); } + else if (print_fs) + { + rc = vtoy_printf_fs(param); + } + else if (vlnk_print) + { + rc = vtoy_vlnk_printf(param, diskname); + } else if (device[0]) { rc = vtoy_check_device(param, device);