From: Sven Hoexter Date: Tue, 4 Mar 2025 14:58:40 +0000 (+0100) Subject: New upstream version 1.2.8 X-Git-Tag: upstream/1.2.8^0 X-Git-Url: http://git.sven.stormbind.net/?a=commitdiff_plain;h=79eca1db0bad3cc9c076431fb842f2caa4a7d3f2;p=sven%2Fexfatprogs.git New upstream version 1.2.8 --- diff --git a/NEWS b/NEWS index 87a44d3..9a24b9d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +exfatprogs 1.2.8 - released 2025-03-04 +====================================== + +BUG FIXES : + * dump.exfat: fix an incorrect output of an entry + position in 32-bit system. + * mkfs.exfat: fill an oem sector with zero instead + of one. + * exfatprogs: fix compilation on musl based systems + due to loff_t type. And update the Github action + to validate builds on the system. + exfatprogs 1.2.7 - released 2025-02-03 ====================================== diff --git a/configure b/configure index ce4392f..0f74903 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for exfatprogs 1.2.7. +# Generated by GNU Autoconf 2.71 for exfatprogs 1.2.8. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='exfatprogs' PACKAGE_TARNAME='exfatprogs' -PACKAGE_VERSION='1.2.7' -PACKAGE_STRING='exfatprogs 1.2.7' +PACKAGE_VERSION='1.2.8' +PACKAGE_STRING='exfatprogs 1.2.8' PACKAGE_BUGREPORT='linkinjeon@kernel.org' PACKAGE_URL='https://github.com/exfatprogs/exfatprogs' @@ -1348,7 +1348,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures exfatprogs 1.2.7 to adapt to many kinds of systems. +\`configure' configures exfatprogs 1.2.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1419,7 +1419,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of exfatprogs 1.2.7:";; + short | recursive ) echo "Configuration of exfatprogs 1.2.8:";; esac cat <<\_ACEOF @@ -1531,7 +1531,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -exfatprogs configure 1.2.7 +exfatprogs configure 1.2.8 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1792,7 +1792,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by exfatprogs $as_me 1.2.7, which was +It was created by exfatprogs $as_me 1.2.8, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3072,7 +3072,7 @@ fi # Define the identity of the package. PACKAGE='exfatprogs' - VERSION='1.2.7' + VERSION='1.2.8' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -13558,7 +13558,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by exfatprogs $as_me 1.2.7, which was +This file was extended by exfatprogs $as_me 1.2.8, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13627,7 +13627,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -exfatprogs config.status 1.2.7 +exfatprogs config.status 1.2.8 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/dump/dump.c b/dump/dump.c index 0ac1fd3..6fa1636 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -167,7 +167,7 @@ static int exfat_show_ondisk_all_info(struct exfat_blk_dev *bd) goto free_exfat; if (ed.type == EXFAT_VOLUME) { - exfat_info("Volume label entry position: \t\t0x%lx\n", off); + exfat_info("Volume label entry position: \t\t0x%llx\n", (unsigned long long)off); exfat_info("Volume label character count: \t\t%u\n", ed.vol_char_cnt); volume_label = exfat_conv_volume_label(&ed); if (!volume_label) @@ -182,7 +182,7 @@ static int exfat_show_ondisk_all_info(struct exfat_blk_dev *bd) goto free_exfat; if (ed.type == EXFAT_UPCASE) { - exfat_info("Upcase table entry position: \t\t0x%lx\n", off); + exfat_info("Upcase table entry position: \t\t0x%llx\n", (unsigned long long)off); exfat_info("Upcase table start cluster: \t\t%x\n", le32_to_cpu(ed.upcase_start_clu)); exfat_info("Upcase table size: \t\t\t%" PRIu64 "\n", @@ -197,7 +197,7 @@ static int exfat_show_ondisk_all_info(struct exfat_blk_dev *bd) bitmap_len = le64_to_cpu(ed.bitmap_size); bitmap_clu = le32_to_cpu(ed.bitmap_start_clu); - exfat_info("Bitmap entry position: \t\t\t0x%lx\n", off); + exfat_info("Bitmap entry position: \t\t\t0x%llx\n", (unsigned long long)off); exfat_info("Bitmap start cluster: \t\t\t%x\n", bitmap_clu); exfat_info("Bitmap size: \t\t\t\t%llu\n", bitmap_len); diff --git a/fsck/fsck.c b/fsck/fsck.c index 4881498..2fd7194 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -1083,7 +1083,7 @@ out: } static int exfat_repair_upcase_table(struct exfat *exfat, - struct exfat_dentry *dentry, loff_t dentry_off) + struct exfat_dentry *dentry, off_t dentry_off) { clus_t clu; int ret; @@ -1175,7 +1175,7 @@ static int read_upcase_table(struct exfat_fsck *fsck) ssize_t size; __le32 checksum; clus_t start_clu; - loff_t dentry_off; + off_t dentry_off; retval = exfat_lookup_dentry_set(exfat, exfat->root, &filter); if (retval == EOF) { diff --git a/include/version.h b/include/version.h index 9fb13fb..846ae59 100644 --- a/include/version.h +++ b/include/version.h @@ -5,6 +5,6 @@ #ifndef _VERSION_H -#define EXFAT_PROGS_VERSION "1.2.7" +#define EXFAT_PROGS_VERSION "1.2.8" #endif /* !_VERSION_H */ diff --git a/mkfs/mkfs.c b/mkfs/mkfs.c index fc0cd20..315b8ac 100644 --- a/mkfs/mkfs.c +++ b/mkfs/mkfs.c @@ -177,14 +177,13 @@ static int exfat_write_oem_sector(struct exfat_blk_dev *bd, int ret = 0; unsigned int sec_idx = OEM_SEC_IDX; - oem = malloc(bd->sector_size); + oem = calloc(1, bd->sector_size); if (!oem) return -1; if (is_backup) sec_idx += BACKUP_BOOT_SEC_IDX; - memset(oem, 0xFF, bd->sector_size); ret = exfat_write_sector(bd, oem, sec_idx); if (ret) { exfat_err("oem sector write failed\n"); @@ -195,8 +194,7 @@ static int exfat_write_oem_sector(struct exfat_blk_dev *bd, boot_calc_checksum((unsigned char *)oem, bd->sector_size, false, checksum); - /* Zero out reserved sector */ - memset(oem, 0, bd->sector_size); + /* Reuse zeroed out oem sector for reserved sector */ ret = exfat_write_sector(bd, oem, sec_idx + 1); if (ret) { exfat_err("reserved sector write failed\n"); @@ -528,7 +526,6 @@ static int exfat_zero_out_disk(struct exfat_blk_dev *bd, struct exfat_user_input *ui) { int ret; - unsigned long long total_written = 0; unsigned long long size; if (ui->quick) @@ -543,7 +540,7 @@ static int exfat_zero_out_disk(struct exfat_blk_dev *bd, } exfat_debug("zero out written size : %llu, disk size : %llu\n", - total_written, bd->size); + size, bd->size); return 0; } diff --git a/tests/test_fsck.sh b/tests/test_fsck.sh index 5a13e1a..b911fc5 100755 --- a/tests/test_fsck.sh +++ b/tests/test_fsck.sh @@ -19,7 +19,7 @@ cleanup() { } if [ $# -eq 0 ]; then - TESTCASE_LIST=($(find . -name "${IMAGE_FILE}.tar.xz" | xargs dirname)) + TESTCASE_LIST=($(find . -name "${IMAGE_FILE}.tar.xz" -exec dirname {} \;)) TESTCASE_LIST+=($(find . -name "[[:digit:]]*.sh" | sort)) else TESTCASE_LIST=($@)