fix

Author: AKuHAK

src/mkext2.c

@@ -115,42 +115,88 @@ struct ext2_dir_entry
 static int write_part(int fd, uint64_t sector, void *buf, size_t size)
 {
     int64_t offset = sector * 512;
-    if (iomanX_lseek(fd, offset, SEEK_SET) != offset) {
-        printf("Seek error at sector %ld\n", (long)sector);
-        return -1;
+    if (iomanX_lseek(fd, offset, SEEK_SET) != offset) return -1;
+    if (iomanX_write(fd, buf, size) != (int)size) return -1;
+    return 0;
+}
+
+
+// Helper: Calculate usable size from APA partition using IOCTLs
+// Возвращает количество секторов (512 байт) полезного объема
+static uint32_t get_apa_partition_size(int fd) {
+    int32_t num_subs;
+    uint32_t i;
+    uint32_t total_usable_sectors = 0;
+
+    // 1. Узнаем количество суб-разделов
+    num_subs = iomanX_ioctl2(fd, HIOCNSUB, NULL, 0, NULL, 0);
+    if (num_subs < 0) {
+        printf("MKEXT2: IOCTL HIOCNSUB failed (err: %d)\n", num_subs);
+        return 0;
     }
-    if (iomanX_write(fd, buf, size) != (int)size) {
-        printf("Write error at sector %ld\n", (long)sector);
-        return -1;
+
+    printf("MKEXT2: Found %d sub-partitions.\n", num_subs);
+
+    // 2. Проходим по главному разделу (0) и всем суб-разделам (1..num_subs)
+    for (i = 0; i < (uint32_t)num_subs + 1; i++) {
+        uint32_t raw_size = 0;
+        uint32_t reserved = 0;
+
+        // Получаем размер текущего куска (в секторах)
+        int res = iomanX_ioctl2(fd, HIOCGETSIZE, &i, sizeof(i), NULL, 0);
+        if (res < 0) {
+            printf("MKEXT2: IOCTL HIOCGETSIZE failed for part %d\n", i);
+            return 0;
+        }
+        raw_size = (uint32_t)res;
+
+        // Определяем оверхед (зарезервированное место)
+        if (i == 0) {
+            // Main partition: 4 MB reserved (0x2000 sectors)
+            reserved = 0x2000;
+        } else {
+            // Sub partition: 2 KB reserved (4 sectors)
+            reserved = 4;
+        }
+
+        if (raw_size > reserved) {
+            total_usable_sectors += (raw_size - reserved);
+        } else {
+            printf("MKEXT2: Warning - Part %d size (%u) is smaller than reserved (%u)\n", i, raw_size, reserved);
+        }
     }
-    return 0;
+
+    return total_usable_sectors;
 }
 
+// MAIN FORMAT FUNCTION
+// Теперь аргумент size_mb не нужен, мы определяем его сами!
 int format_ext2_partition(const char *mount_point)
 {
     char path[256];
     sprintf(path, "hdd0:%s", mount_point);
 
-    printf("Opening partition %s for EXT2 formatting...\n", path);
+    printf("MKEXT2: Opening %s for auto-sizing and formatting...\n", path);
 
     int fd = iomanX_open(path, FIO_O_RDWR, 0666);
     if (fd < 0) {
-        printf("Error: Could not open partition %s (err: %d)\n", path, fd);
+        printf("MKEXT2: Error opening partition %s (err: %d)\n", path, fd);
         return -1;
     }
 
-    int64_t size_bytes = iomanX_lseek(fd, 0, SEEK_END);
-    if (size_bytes <= 0) {
-        printf("Error: Could not determine partition size\n");
+    // --- AUTO DETECT SIZE ---
+    uint32_t partition_size_sectors = get_apa_partition_size(fd);
+
+    if (partition_size_sectors == 0) {
+        printf("MKEXT2: Failed to detect usable partition size.\n");
         iomanX_close(fd);
         return -1;
     }
-    iomanX_lseek(fd, 0, SEEK_SET);
 
-    uint32_t partition_size_sectors = (uint32_t)(size_bytes / 512);
-
-    printf("Partition size: %u sectors. Formatting...\n", partition_size_sectors);
+    printf("MKEXT2: Total usable size: %u sectors (%.2f MB)\n",
+           partition_size_sectors, (float)partition_size_sectors * 512.0 / 1024.0 / 1024.0);
 
+    // --- EXT2 PARAMETERS ---
     uint32_t block_size = 4096;
     uint32_t sector_per_block = block_size / 512;
     uint32_t blocks_count = partition_size_sectors / sector_per_block;
@@ -159,6 +205,8 @@ int format_ext2_partition(const char *mount_point)
 
     uint32_t groups_count = (blocks_count + blocks_per_group - 1) / blocks_per_group;
 
+    printf("MKEXT2: Blocks: %u, Groups: %u\n", blocks_count, groups_count);
+
     struct ext2_super_block sb;
     memset(&sb, 0, sizeof(sb));
 

test/pfsshell_test.tcl

@@ -74,21 +74,21 @@ pfs: Format sub: sub = 0, sector start = 8208, sector end = 8239\r
 # "
 
 run_cmd "ls partitions" "ls" "-exact" "
-__mbr\r
-__net/\r
-__system/\r
-__sysconf/\r
-__common/\r
+   0.12 GiB  __mbr\r
+   0.12 GiB  __net/\r
+   0.25 GiB  __system/\r
+   0.50 GiB  __sysconf/\r
+   1.00 GiB  __common/\r
 # "
 
 run_cmd "mkpart" "mkpart PP.TEST 128M PFS" "-exact" "# "
 run_cmd "mkpart" "ls" "-exact" "
-__mbr\r
-__net/\r
-__system/\r
-__sysconf/\r
-__common/\r
-PP.TEST/\r
+   0.12 GiB  __mbr\r
+   0.12 GiB  __net/\r
+   0.25 GiB  __system/\r
+   0.50 GiB  __sysconf/\r
+   1.00 GiB  __common/\r
+   0.12 GiB  PP.TEST/\r
 # "
 
 run_cmd "mount" "mount __net" "-exact" "__net:/# "
@@ -111,15 +111,23 @@ run_cmd "get" "get pfsshell.md" "-exact" "__net:/# "
 run_cmd "rm" "rm pfsshell.md" "-exact" "__net:/# "
 run_cmd "rmdir" "rmdir directory" "-exact" "__net:/# "
 run_cmd "umount" "umount" "-exact" "# "
-run_cmd "mkpart" "mkpart __linux.1 128M EXT2" "-exact" "# "
+run_cmd "mkpart" "mkpart __linux.1 128M EXT2" "-exact" "
+# Main partition of 128M created.\r
+MKEXT2: Opening hdd0:__linux.1 for auto-sizing and formatting...\r
+MKEXT2: Found 0 sub-partitions.\r
+MKEXT2: Total usable size: 253952 sectors (124.00 MB)\r
+MKEXT2: Blocks: 31744, Groups: 1\r
+EXT2 format done.\r
+# "
 run_cmd "rmpart" "rmpart __net" "-exact" "# "
 run_cmd "rmpart" "ls" "-exact" "
-__mbr\r
-__empty%\r
-__system/\r
-__sysconf/\r
-__common/\r
-PP.TEST/\r
+   0.12 GiB  __mbr\r
+   0.12 GiB  __net/\r
+   0.25 GiB  __system/\r
+   0.50 GiB  __sysconf/\r
+   1.00 GiB  __common/\r
+   0.12 GiB  PP.TEST/\r
+   0.12 GiB  __linux.1\r
 # "
 
 run_cmd "exit" "exit" eof ""