dosfstools: Update to 4.2

2 files changed, 5 insertions, 79 deletions

diff --git a/pkg/dosfstools/patch/0002-Use-__attribute__-consistently.patch b/pkg/dosfstools/patch/0001-Use-__attribute__-consistently.patch
index 5783ed59..1a1b5c6e 100644
--- a/pkg/dosfstools/patch/0002-Use-__attribute__-consistently.patch
+++ b/pkg/dosfstools/patch/0001-Use-__attribute__-consistently.patch
@@ -1,4 +1,4 @@
-From d38b4d1d39784aefebb585ed955d16bb674bd2ff Mon Sep 17 00:00:00 2001
+From 651393ea7aeb6e0a14cd35e72ca2350656388dc4 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 1 Jul 2019 22:52:11 -0700
 Subject: [PATCH] Use __attribute__ consistently
@@ -8,11 +8,11 @@ Subject: [PATCH] Use __attribute__ consistently
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/common.h b/src/common.h
-index e2c398c..03f6984 100644
+index 9a68531..0e13fb3 100644
 --- a/src/common.h
 +++ b/src/common.h
-@@ -24,12 +24,12 @@
- #define _COMMON_H
+@@ -41,12 +41,12 @@ extern int atari_format;	/* Use Atari variation of MS-DOS FS format */
+ extern const char *program_name;
  
  void die(const char *msg, ...)
 -    __attribute((noreturn, format(printf, 1, 2)));
@@ -27,5 +27,5 @@ index e2c398c..03f6984 100644
  /* Like die, but appends an error message according to the state of errno. */
  
 -- 
-2.22.0
+2.30.0
 
diff --git a/pkg/dosfstools/patch/0001-Use-static-inline-function-instead-of-statement-expr.patch b/pkg/dosfstools/patch/0001-Use-static-inline-function-instead-of-statement-expr.patch
deleted file mode 100644
index de1309b8..00000000
--- a/pkg/dosfstools/patch/0001-Use-static-inline-function-instead-of-statement-expr.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 825f4980d59f780e906fc2d6b55fe6646df1b415 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 4 Jun 2019 10:40:53 -0700
-Subject: [PATCH] Use static inline function instead of statement expression
-Upstream: 91978a272e4fe465c3a754a7342b496ff9e49211
-
----
- src/lfn.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/src/lfn.c b/src/lfn.c
-index b33e125..9727ab3 100644
---- a/src/lfn.c
-+++ b/src/lfn.c
-@@ -74,14 +74,6 @@ static unsigned char fat_uni2esc[64] = {
- /* for maxlen param */
- #define UNTIL_0		INT_MAX
- 
--/* Convert name part in 'lfn' from unicode to ASCII */
--#define CNV_THIS_PART(lfn)				\
--    ({							\
--	unsigned char __part_uni[CHARS_PER_LFN*2];		\
--	copy_lfn_part( __part_uni, lfn );		\
--	cnv_unicode( __part_uni, CHARS_PER_LFN, 0 );	\
--    })
--
- /* Convert name parts collected so far (from previous slots) from unicode to
-  * ASCII */
- #define CNV_PARTS_SO_FAR()					\
-@@ -155,6 +147,14 @@ static void copy_lfn_part(unsigned char *dst, LFN_ENT * lfn)
-     memcpy(dst + 22, lfn->name11_12, 4);
- }
- 
-+/* Convert name part in 'lfn' from unicode to ASCII */
-+static inline char *cnv_this_part(LFN_ENT *lfn)
-+{
-+	unsigned char __part_uni[CHARS_PER_LFN*2];
-+	copy_lfn_part( __part_uni, lfn );
-+	return cnv_unicode( __part_uni, CHARS_PER_LFN, 0 );
-+}
-+
- static void clear_lfn_slots(int start, int end)
- {
-     int i;
-@@ -222,7 +222,7 @@ void lfn_add_slot(DIR_ENT * de, off_t dir_offset)
- 	     * display the name) */
- 	    printf("A new long file name starts within an old one.\n");
- 	    if (slot == lfn_slot && lfn->alias_checksum == lfn_checksum) {
--		char *part1 = CNV_THIS_PART(lfn);
-+		char *part1 = cnv_this_part(lfn);
- 		char *part2 = CNV_PARTS_SO_FAR();
- 		printf("  It could be that the LFN start bit is wrong here\n"
- 		       "  if \"%s\" seems to match \"%s\".\n", part1, part2);
-@@ -262,7 +262,7 @@ void lfn_add_slot(DIR_ENT * de, off_t dir_offset)
- 	/* Causes: 1) start bit got lost, 2) Previous slot with start bit got
- 	 *         lost */
- 	/* Fixes: 1) delete LFN, 2) set start bit */
--	char *part = CNV_THIS_PART(lfn);
-+	char *part = cnv_this_part(lfn);
- 	printf("Long filename fragment \"%s\" found outside a LFN "
- 	       "sequence.\n  (Maybe the start bit is missing on the "
- 	       "last fragment)\n", part);
-@@ -304,7 +304,7 @@ void lfn_add_slot(DIR_ENT * de, off_t dir_offset)
- 	printf("Unexpected long filename sequence number "
- 	       "(%d vs. expected %d).\n", slot, lfn_slot);
- 	if (lfn->alias_checksum == lfn_checksum && lfn_slot > 0) {
--	    char *part1 = CNV_THIS_PART(lfn);
-+	    char *part1 = cnv_this_part(lfn);
- 	    char *part2 = CNV_PARTS_SO_FAR();
- 	    printf("  It could be that just the number is wrong\n"
- 		   "  if \"%s\" seems to match \"%s\".\n", part1, part2);
--- 
-2.20.1
-