From 2b214ce885a39e20f2853cfcdf6e8bf0c4a813e1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 29 May 2016 08:39:36 +0200 Subject: dosfstools: update to 4.0 --- package/dosfstools/Makefile | 17 ++---- package/dosfstools/patches/patch-Makefile | 30 ---------- package/dosfstools/patches/patch-src_boot_c | 77 ------------------------- package/dosfstools/patches/patch-src_boot_h | 11 ---- package/dosfstools/patches/patch-src_check_c | 49 ---------------- package/dosfstools/patches/patch-src_check_h | 11 ---- package/dosfstools/patches/patch-src_fat_c | 32 ---------- package/dosfstools/patches/patch-src_fat_h | 11 ---- package/dosfstools/patches/patch-src_fatlabel_c | 11 ---- package/dosfstools/patches/patch-src_fsck_fat_h | 38 ------------ package/dosfstools/patches/patch-src_io_c | 59 ------------------- package/dosfstools/patches/patch-src_io_h | 35 ----------- package/dosfstools/patches/patch-src_lfn_c | 74 ------------------------ package/dosfstools/patches/patch-src_lfn_h | 20 ------- 14 files changed, 4 insertions(+), 471 deletions(-) delete mode 100644 package/dosfstools/patches/patch-Makefile delete mode 100644 package/dosfstools/patches/patch-src_boot_c delete mode 100644 package/dosfstools/patches/patch-src_boot_h delete mode 100644 package/dosfstools/patches/patch-src_check_c delete mode 100644 package/dosfstools/patches/patch-src_check_h delete mode 100644 package/dosfstools/patches/patch-src_fat_c delete mode 100644 package/dosfstools/patches/patch-src_fat_h delete mode 100644 package/dosfstools/patches/patch-src_fatlabel_c delete mode 100644 package/dosfstools/patches/patch-src_fsck_fat_h delete mode 100644 package/dosfstools/patches/patch-src_io_c delete mode 100644 package/dosfstools/patches/patch-src_io_h delete mode 100644 package/dosfstools/patches/patch-src_lfn_c delete mode 100644 package/dosfstools/patches/patch-src_lfn_h (limited to 'package/dosfstools') diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index b2ee4eea8..64c5545b2 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= dosfstools -PKG_VERSION:= 3.0.28 +PKG_VERSION:= 4.0 PKG_RELEASE:= 1 -PKG_HASH:= ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2 +PKG_HASH:= 9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf PKG_DESCR:= utilities to create and check fat filesystems PKG_SECTION:= sys/fs PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools/ @@ -16,18 +16,9 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_TARGET_LIBICONV_TINY),y) -XAKE_FLAGS+= LDLIBS=-liconv -endif - -CONFIG_STYLE:= manual -XAKE_FLAGS+= PREFIX="" - dosfstools-install: ${INSTALL_DIR} ${IDIR_DOSFSTOOLS}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/sbin/dosfsck ${IDIR_DOSFSTOOLS}/usr/sbin - ${CP} ${WRKINST}/sbin/fsck.{msdos,vfat,fat} ${IDIR_DOSFSTOOLS}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/sbin/mkdosfs ${IDIR_DOSFSTOOLS}/usr/sbin - ${CP} ${WRKINST}/sbin/mkfs.{msdos,vfat,fat} ${IDIR_DOSFSTOOLS}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/fsck.fat ${IDIR_DOSFSTOOLS}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/mkfs.fat ${IDIR_DOSFSTOOLS}/usr/sbin include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dosfstools/patches/patch-Makefile b/package/dosfstools/patches/patch-Makefile deleted file mode 100644 index e1b4b528c..000000000 --- a/package/dosfstools/patches/patch-Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- dosfstools-3.0.26.orig/Makefile 2014-01-17 07:09:28.000000000 +0100 -+++ dosfstools-3.0.26/Makefile 2014-06-25 12:07:32.125122609 +0200 -@@ -32,7 +32,8 @@ OPTFLAGS = -O2 -fomit-frame-pointer -D_G - #WARNFLAGS = -Wall -pedantic -std=c99 - WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes - DEBUGFLAGS = -g --CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) -+CFLAGS ?= -+CFLAGS += $(WARNFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 - - VPATH = src - -@@ -48,7 +49,7 @@ mkfs.fat: mkfs.fat.o - - rebuild: distclean build - --install: install-bin install-doc install-man install-symlinks -+install: install-bin install-symlinks - - install-bin: build - install -d -m 0755 $(DESTDIR)/$(SBINDIR) -@@ -73,7 +74,7 @@ install-man: - install -D -m 0644 $${MANPAGE} $(DESTDIR)/$(MANDIR)/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \ - done; \ - done --install-symlinks: install-bin install-man -+install-symlinks: install-bin - if [ -e $(DESTDIR)/$(SBINDIR)/fatlabel ]; \ - then \ - ln -sf fatlabel $(DESTDIR)/$(SBINDIR)/dosfslabel; \ diff --git a/package/dosfstools/patches/patch-src_boot_c b/package/dosfstools/patches/patch-src_boot_c deleted file mode 100644 index 4fe35c509..000000000 --- a/package/dosfstools/patches/patch-src_boot_c +++ /dev/null @@ -1,77 +0,0 @@ ---- dosfstools-3.0.26.orig/src/boot.c 2014-01-17 07:06:54.000000000 +0100 -+++ dosfstools-3.0.26/src/boot.c 2014-05-17 08:59:02.419708114 +0200 -@@ -155,7 +155,7 @@ static void check_backup_boot(DOS_FS * f - fs->backupboot_start = bbs * lss; - b->backup_boot = htole16(bbs); - fs_write(fs->backupboot_start, sizeof(*b), b); -- fs_write((loff_t) offsetof(struct boot_sector, backup_boot), -+ fs_write((off_t) offsetof(struct boot_sector, backup_boot), - sizeof(b->backup_boot), &b->backup_boot); - printf("Created backup of boot sector in sector %d\n", bbs); - return; -@@ -233,9 +233,9 @@ static void read_fsinfo(DOS_FS * fs, str - break; - if (s > 0 && s < le16toh(b->reserved)) { - init_fsinfo(&i); -- fs_write((loff_t) s * lss, sizeof(i), &i); -+ fs_write((off_t) s * lss, sizeof(i), &i); - b->info_sector = htole16(s); -- fs_write((loff_t) offsetof(struct boot_sector, info_sector), -+ fs_write((off_t) offsetof(struct boot_sector, info_sector), - sizeof(b->info_sector), &b->info_sector); - if (fs->backupboot_start) - fs_write(fs->backupboot_start + -@@ -327,7 +327,7 @@ void read_boot(DOS_FS * fs) - unsigned total_sectors; - unsigned short logical_sector_size, sectors; - unsigned fat_length; -- loff_t data_size; -+ off_t data_size; - - fs_read(0, sizeof(b), &b); - logical_sector_size = GET_UNALIGNED_W(b.sector_size); -@@ -352,18 +352,18 @@ void read_boot(DOS_FS * fs) - if (verbose) - printf("Checking we can access the last sector of the filesystem\n"); - /* Can't access last odd sector anyway, so round down */ -- fs_test((loff_t) ((total_sectors & ~1) - 1) * (loff_t) logical_sector_size, -+ fs_test((off_t) ((total_sectors & ~1) - 1) * (off_t) logical_sector_size, - logical_sector_size); - fat_length = le16toh(b.fat_length) ? - le16toh(b.fat_length) : le32toh(b.fat32_length); -- fs->fat_start = (loff_t) le16toh(b.reserved) * logical_sector_size; -- fs->root_start = ((loff_t) le16toh(b.reserved) + b.fats * fat_length) * -+ fs->fat_start = (off_t) le16toh(b.reserved) * logical_sector_size; -+ fs->root_start = ((off_t) le16toh(b.reserved) + b.fats * fat_length) * - logical_sector_size; - fs->root_entries = GET_UNALIGNED_W(b.dir_entries); - fs->data_start = fs->root_start + ROUND_TO_MULTIPLE(fs->root_entries << - MSDOS_DIR_BITS, - logical_sector_size); -- data_size = (loff_t) total_sectors *logical_sector_size - fs->data_start; -+ data_size = (off_t) total_sectors *logical_sector_size - fs->data_start; - fs->clusters = data_size / fs->cluster_size; - fs->root_cluster = 0; /* indicates standard, pre-FAT32 root dir */ - fs->fsinfo_start = 0; /* no FSINFO structure */ -@@ -491,10 +491,10 @@ static void write_boot_label(DOS_FS * fs - } - } - --loff_t find_volume_de(DOS_FS * fs, DIR_ENT * de) -+off_t find_volume_de(DOS_FS * fs, DIR_ENT * de) - { - uint32_t cluster; -- loff_t offset; -+ off_t offset; - int i; - - if (fs->root_cluster) { -@@ -525,7 +525,7 @@ static void write_volume_label(DOS_FS * - { - time_t now = time(NULL); - struct tm *mtime = localtime(&now); -- loff_t offset; -+ off_t offset; - int created; - DIR_ENT de; - diff --git a/package/dosfstools/patches/patch-src_boot_h b/package/dosfstools/patches/patch-src_boot_h deleted file mode 100644 index 6ed917b8a..000000000 --- a/package/dosfstools/patches/patch-src_boot_h +++ /dev/null @@ -1,11 +0,0 @@ ---- dosfstools-3.0.26.orig/src/boot.h 2014-01-17 07:06:55.000000000 +0100 -+++ dosfstools-3.0.26/src/boot.h 2014-03-26 13:29:53.000000000 +0100 -@@ -25,7 +25,7 @@ - - void read_boot(DOS_FS * fs); - void write_label(DOS_FS * fs, char *label); --loff_t find_volume_de(DOS_FS * fs, DIR_ENT * de); -+off_t find_volume_de(DOS_FS * fs, DIR_ENT * de); - - /* Reads the boot sector from the currently open device and initializes *FS */ - diff --git a/package/dosfstools/patches/patch-src_check_c b/package/dosfstools/patches/patch-src_check_c deleted file mode 100644 index cdfc953fe..000000000 --- a/package/dosfstools/patches/patch-src_check_c +++ /dev/null @@ -1,49 +0,0 @@ ---- dosfstools-3.0.26.orig/src/check.c 2014-03-07 18:35:11.000000000 +0100 -+++ dosfstools-3.0.26/src/check.c 2014-03-26 10:04:41.000000000 +0100 -@@ -64,7 +64,7 @@ static DOS_FILE *root; - p->dir_ent.start = htole16(__v&0xffff); \ - p->dir_ent.starthi = htole16(__v>>16); \ - __v = htole32(__v); \ -- fs_write((loff_t)offsetof(struct boot_sector,root_cluster), \ -+ fs_write((off_t)offsetof(struct boot_sector,root_cluster), \ - sizeof(((struct boot_sector *)0)->root_cluster), \ - &__v); \ - } \ -@@ -75,16 +75,16 @@ static DOS_FILE *root; - } \ - } while(0) - --loff_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern) -+off_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern) - { - static int curr_num = 0; -- loff_t offset; -+ off_t offset; - - if (fs->root_cluster) { - DIR_ENT d2; - int i = 0, got = 0; - uint32_t clu_num, prev = 0; -- loff_t offset2; -+ off_t offset2; - - clu_num = fs->root_cluster; - offset = cluster_start(fs, clu_num); -@@ -333,7 +333,7 @@ static int bad_name(DOS_FILE * file) - return 0; - } - --static void lfn_remove(loff_t from, loff_t to) -+static void lfn_remove(off_t from, off_t to) - { - DIR_ENT empty; - -@@ -949,7 +949,7 @@ static void new_dir(void) - * @param cp - */ - static void add_file(DOS_FS * fs, DOS_FILE *** chain, DOS_FILE * parent, -- loff_t offset, FDSC ** cp) -+ off_t offset, FDSC ** cp) - { - DOS_FILE *new; - DIR_ENT de; diff --git a/package/dosfstools/patches/patch-src_check_h b/package/dosfstools/patches/patch-src_check_h deleted file mode 100644 index 7f0b5e643..000000000 --- a/package/dosfstools/patches/patch-src_check_h +++ /dev/null @@ -1,11 +0,0 @@ ---- dosfstools-3.0.26.orig/src/check.h 2014-01-17 07:07:02.000000000 +0100 -+++ dosfstools-3.0.26/src/check.h 2014-03-26 13:25:47.000000000 +0100 -@@ -23,7 +23,7 @@ - #ifndef _CHECK_H - #define _CHECK_H - --loff_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern); -+off_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern); - - /* Allocate a free slot in the root directory for a new file. The file name is - constructed after 'pattern', which must include a %d type format for printf diff --git a/package/dosfstools/patches/patch-src_fat_c b/package/dosfstools/patches/patch-src_fat_c deleted file mode 100644 index 15bfd16db..000000000 --- a/package/dosfstools/patches/patch-src_fat_c +++ /dev/null @@ -1,32 +0,0 @@ ---- dosfstools-3.0.26.orig/src/fat.c 2014-01-17 07:07:05.000000000 +0100 -+++ dosfstools-3.0.26/src/fat.c 2014-03-26 13:37:03.000000000 +0100 -@@ -180,7 +180,7 @@ void set_fat(DOS_FS * fs, uint32_t clust - { - unsigned char *data = NULL; - int size; -- loff_t offs; -+ off_t offs; - - if (new == -1) - new = FAT_EOF(fs); -@@ -264,9 +264,9 @@ uint32_t next_cluster(DOS_FS * fs, uint3 - return FAT_IS_EOF(fs, value) ? -1 : value; - } - --loff_t cluster_start(DOS_FS * fs, uint32_t cluster) -+off_t cluster_start(DOS_FS * fs, uint32_t cluster) - { -- return fs->data_start + ((loff_t) cluster - -+ return fs->data_start + ((off_t) cluster - - 2) * (uint64_t)fs->cluster_size; - } - -@@ -475,7 +475,7 @@ void reclaim_file(DOS_FS * fs) - /* If this cluster is the head of an orphan chain... */ - if (get_owner(fs, i) == &orphan && !num_refs[i]) { - DIR_ENT de; -- loff_t offset; -+ off_t offset; - files++; - offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); - de.start = htole16(i & 0xffff); diff --git a/package/dosfstools/patches/patch-src_fat_h b/package/dosfstools/patches/patch-src_fat_h deleted file mode 100644 index 9a5a81b88..000000000 --- a/package/dosfstools/patches/patch-src_fat_h +++ /dev/null @@ -1,11 +0,0 @@ ---- dosfstools-3.0.26.orig/src/fat.h 2014-01-17 07:07:07.000000000 +0100 -+++ dosfstools-3.0.26/src/fat.h 2014-03-26 13:29:04.000000000 +0100 -@@ -49,7 +49,7 @@ uint32_t next_cluster(DOS_FS * fs, uint3 - last cluster of the respective cluster chain. CLUSTER must not be a bad - cluster. */ - --loff_t cluster_start(DOS_FS * fs, uint32_t cluster); -+off_t cluster_start(DOS_FS * fs, uint32_t cluster); - - /* Returns the byte offset of CLUSTER, relative to the respective device. */ - diff --git a/package/dosfstools/patches/patch-src_fatlabel_c b/package/dosfstools/patches/patch-src_fatlabel_c deleted file mode 100644 index 1a5e2c2cf..000000000 --- a/package/dosfstools/patches/patch-src_fatlabel_c +++ /dev/null @@ -1,11 +0,0 @@ ---- dosfstools-3.0.26.orig/src/fatlabel.c 2014-01-17 07:07:08.000000000 +0100 -+++ dosfstools-3.0.26/src/fatlabel.c 2014-03-26 13:23:52.000000000 +0100 -@@ -92,7 +92,7 @@ int main(int argc, char *argv[]) - char *device = NULL; - char label[12] = { 0 }; - -- loff_t offset; -+ off_t offset; - DIR_ENT de; - - check_atari(); diff --git a/package/dosfstools/patches/patch-src_fsck_fat_h b/package/dosfstools/patches/patch-src_fsck_fat_h deleted file mode 100644 index feaefb58e..000000000 --- a/package/dosfstools/patches/patch-src_fsck_fat_h +++ /dev/null @@ -1,38 +0,0 @@ ---- dosfstools-3.0.26.orig/src/fsck.fat.h 2014-02-08 18:53:10.000000000 +0100 -+++ dosfstools-3.0.26/src/fsck.fat.h 2014-03-26 13:29:32.000000000 +0100 -@@ -143,8 +143,8 @@ typedef struct { - typedef struct _dos_file { - DIR_ENT dir_ent; - char *lfn; -- loff_t offset; -- loff_t lfn_offset; -+ off_t offset; -+ off_t lfn_offset; - struct _dos_file *parent; /* parent directory */ - struct _dos_file *next; /* next entry */ - struct _dos_file *first; /* first entry (directory only) */ -@@ -157,19 +157,19 @@ typedef struct { - - typedef struct { - int nfats; -- loff_t fat_start; -+ off_t fat_start; - unsigned int fat_size; /* unit is bytes */ - unsigned int fat_bits; /* size of a FAT entry */ - unsigned int eff_fat_bits; /* # of used bits in a FAT entry */ - uint32_t root_cluster; /* 0 for old-style root dir */ -- loff_t root_start; -+ off_t root_start; - unsigned int root_entries; -- loff_t data_start; -+ off_t data_start; - unsigned int cluster_size; - uint32_t clusters; -- loff_t fsinfo_start; /* 0 if not present */ -+ off_t fsinfo_start; /* 0 if not present */ - long free_clusters; -- loff_t backupboot_start; /* 0 if not present */ -+ off_t backupboot_start; /* 0 if not present */ - unsigned char *fat; - DOS_FILE **cluster_owner; - char *label; diff --git a/package/dosfstools/patches/patch-src_io_c b/package/dosfstools/patches/patch-src_io_c deleted file mode 100644 index f95e07fc0..000000000 --- a/package/dosfstools/patches/patch-src_io_c +++ /dev/null @@ -1,59 +0,0 @@ ---- dosfstools-3.0.26.orig/src/io.c 2014-01-17 07:07:14.000000000 +0100 -+++ dosfstools-3.0.26/src/io.c 2014-05-17 08:59:02.559708625 +0200 -@@ -48,7 +48,7 @@ - - typedef struct _change { - void *data; -- loff_t pos; -+ off_t pos; - int size; - struct _change *next; - } CHANGE; -@@ -60,7 +60,7 @@ unsigned device_no; - - #ifdef __DJGPP__ - #include "volume.h" /* DOS lowlevel disk access functions */ --loff_t llseek(int fd, loff_t offset, int whence) -+off_t llseek(int fd, off_t offset, int whence) - { - if ((whence != SEEK_SET) || (fd == 4711)) - return -1; /* only those supported */ -@@ -72,9 +72,9 @@ loff_t llseek(int fd, loff_t offset, int - #define read(a,b,c) ReadVolume(b,c) - #define write(a,b,c) WriteVolume(b,c) - #else --loff_t llseek(int fd, loff_t offset, int whence) -+off_t llseek(int fd, off_t offset, int whence) - { -- return (loff_t) lseek64(fd, (off64_t) offset, whence); -+ return (off_t) lseek64(fd, (off64_t) offset, whence); - } - #endif - -@@ -118,7 +118,7 @@ void fs_open(char *path, int rw) - * @param[in] size Number of bytes to read - * @param[out] data Where to put the data read - */ --void fs_read(loff_t pos, int size, void *data) -+void fs_read(off_t pos, int size, void *data) - { - CHANGE *walk; - int got; -@@ -145,7 +145,7 @@ void fs_read(loff_t pos, int size, void - } - } - --int fs_test(loff_t pos, int size) -+int fs_test(off_t pos, int size) - { - void *scratch; - int okay; -@@ -158,7 +158,7 @@ int fs_test(loff_t pos, int size) - return okay; - } - --void fs_write(loff_t pos, int size, void *data) -+void fs_write(off_t pos, int size, void *data) - { - CHANGE *new; - int did; diff --git a/package/dosfstools/patches/patch-src_io_h b/package/dosfstools/patches/patch-src_io_h deleted file mode 100644 index 3ec0fd809..000000000 --- a/package/dosfstools/patches/patch-src_io_h +++ /dev/null @@ -1,35 +0,0 @@ ---- dosfstools-3.0.26.orig/src/io.h 2014-02-08 18:53:10.000000000 +0100 -+++ dosfstools-3.0.26/src/io.h 2014-03-26 13:27:15.000000000 +0100 -@@ -27,9 +27,9 @@ - #ifndef _IO_H - #define _IO_H - --#include /* for loff_t */ -+#include /* for off_t */ - --loff_t llseek(int fd, loff_t offset, int whence); -+off_t llseek(int fd, off_t offset, int whence); - - /* lseek() analogue for large offsets. */ - -@@ -38,17 +38,17 @@ void fs_open(char *path, int rw); - /* Opens the filesystem PATH. If RW is zero, the filesystem is opened - read-only, otherwise, it is opened read-write. */ - --void fs_read(loff_t pos, int size, void *data); -+void fs_read(off_t pos, int size, void *data); - - /* Reads SIZE bytes starting at POS into DATA. Performs all applicable - changes. */ - --int fs_test(loff_t pos, int size); -+int fs_test(off_t pos, int size); - - /* Returns a non-zero integer if SIZE bytes starting at POS can be read without - errors. Otherwise, it returns zero. */ - --void fs_write(loff_t pos, int size, void *data); -+void fs_write(off_t pos, int size, void *data); - - /* If write_immed is non-zero, SIZE bytes are written from DATA to the disk, - starting at POS. If write_immed is zero, the change is added to a list in diff --git a/package/dosfstools/patches/patch-src_lfn_c b/package/dosfstools/patches/patch-src_lfn_c deleted file mode 100644 index dfda2dc3e..000000000 --- a/package/dosfstools/patches/patch-src_lfn_c +++ /dev/null @@ -1,74 +0,0 @@ ---- dosfstools-3.0.26.orig/src/lfn.c 2014-01-17 07:07:16.000000000 +0100 -+++ dosfstools-3.0.26/src/lfn.c 2014-03-26 13:24:23.000000000 +0100 -@@ -52,7 +52,7 @@ typedef struct { - unsigned char *lfn_unicode = NULL; - unsigned char lfn_checksum; - int lfn_slot = -1; --loff_t *lfn_offsets = NULL; -+off_t *lfn_offsets = NULL; - int lfn_parts = 0; - - static unsigned char fat_uni2esc[64] = { -@@ -170,7 +170,7 @@ static void clear_lfn_slots(int start, i - } - } - --void lfn_fix_checksum(loff_t from, loff_t to, const char *short_name) -+void lfn_fix_checksum(off_t from, off_t to, const char *short_name) - { - int i; - __u8 sum; -@@ -195,7 +195,7 @@ void lfn_reset(void) - - /* This function is only called with de->attr == VFAT_LN_ATTR. It stores part - * of the long name. */ --void lfn_add_slot(DIR_ENT * de, loff_t dir_offset) -+void lfn_add_slot(DIR_ENT * de, off_t dir_offset) - { - LFN_ENT *lfn = (LFN_ENT *) de; - int slot = lfn->id & LFN_ID_SLOTMASK; -@@ -253,7 +253,7 @@ void lfn_add_slot(DIR_ENT * de, loff_t d - lfn_slot = slot; - lfn_checksum = lfn->alias_checksum; - lfn_unicode = alloc((lfn_slot * CHARS_PER_LFN + 1) * 2); -- lfn_offsets = alloc(lfn_slot * sizeof(loff_t)); -+ lfn_offsets = alloc(lfn_slot * sizeof(off_t)); - lfn_parts = 0; - } else if (lfn_slot == -1 && slot != 0) { - /* No LFN in progress, but slot found; start bit missing */ -@@ -272,7 +272,7 @@ void lfn_add_slot(DIR_ENT * de, loff_t d - switch (interactive ? get_key("123", "?") : '2') { - case '1': - if (!lfn_offsets) -- lfn_offsets = alloc(sizeof(loff_t)); -+ lfn_offsets = alloc(sizeof(off_t)); - lfn_offsets[0] = dir_offset; - clear_lfn_slots(0, 0); - lfn_reset(); -@@ -287,7 +287,7 @@ void lfn_add_slot(DIR_ENT * de, loff_t d - lfn_slot = slot; - lfn_checksum = lfn->alias_checksum; - lfn_unicode = alloc((lfn_slot * CHARS_PER_LFN + 1) * 2); -- lfn_offsets = alloc(lfn_slot * sizeof(loff_t)); -+ lfn_offsets = alloc(lfn_slot * sizeof(off_t)); - lfn_parts = 0; - break; - } -@@ -319,7 +319,7 @@ void lfn_add_slot(DIR_ENT * de, loff_t d - switch (interactive ? get_key(can_fix ? "123" : "12", "?") : '2') { - case '1': - if (!lfn_offsets) { -- lfn_offsets = alloc(sizeof(loff_t)); -+ lfn_offsets = alloc(sizeof(off_t)); - lfn_parts = 0; - } - lfn_offsets[lfn_parts++] = dir_offset; -@@ -406,7 +406,7 @@ void lfn_add_slot(DIR_ENT * de, loff_t d - - /* This function is always called when de->attr != VFAT_LN_ATTR is found, to - * retrieve the previously constructed LFN. */ --char *lfn_get(DIR_ENT * de, loff_t * lfn_offset) -+char *lfn_get(DIR_ENT * de, off_t * lfn_offset) - { - char *lfn; - __u8 sum; diff --git a/package/dosfstools/patches/patch-src_lfn_h b/package/dosfstools/patches/patch-src_lfn_h deleted file mode 100644 index 0027ce035..000000000 --- a/package/dosfstools/patches/patch-src_lfn_h +++ /dev/null @@ -1,20 +0,0 @@ ---- dosfstools-3.0.26.orig/src/lfn.h 2014-01-17 07:07:17.000000000 +0100 -+++ dosfstools-3.0.26/src/lfn.h 2014-03-26 13:24:56.000000000 +0100 -@@ -26,14 +26,14 @@ - void lfn_reset(void); - /* Reset the state of the LFN parser. */ - --void lfn_add_slot(DIR_ENT * de, loff_t dir_offset); -+void lfn_add_slot(DIR_ENT * de, off_t dir_offset); - /* Process a dir slot that is a VFAT LFN entry. */ - --char *lfn_get(DIR_ENT * de, loff_t * lfn_offset); -+char *lfn_get(DIR_ENT * de, off_t * lfn_offset); - /* Retrieve the long name for the proper dir entry. */ - - void lfn_check_orphaned(void); - --void lfn_fix_checksum(loff_t from, loff_t to, const char *short_name); -+void lfn_fix_checksum(off_t from, off_t to, const char *short_name); - - #endif -- cgit v1.2.3