haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 20:20:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

unzip: remove superfluous line

Browse Source
This commit is contained in:
Jerome Duval
2015-02-26 17:20:27 +00:00
parent d40889cf97
commit 1ba98d584b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app-arch/unzip/patches/unzip-6.0.patchset
View File

@@ -1,4 +1,4 @@
From dbc591f74feeecb1b0848475d50dac9b7cd4fbdc Mon Sep 17 00:00:00 2001
From 9e1fdc058f3f8d1c89b70bdea27d88e7d5b40f41 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 25 Feb 2015 18:16:33 +0000
Subject: Haiku patch
@@ -84,7 +84,7 @@ index dc9eff5..2cb9af6 100644
1.8.3.4
From acf8f1b2f2ed8db58f23c9c397c84df79248ee56 Mon Sep 17 00:00:00 2001
From 663774c200aef88dbd0b9fd6224031a398639191 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 25 Feb 2015 21:47:12 +0000
Subject: merge beos.c into unix.c with __HAIKU__
@@ -562,14 +562,14 @@ index 5b2a326..a002d95 100644
1.8.3.4
From 0a3a44b7ed2f7fa56420451e99d4713e0cb602e7 Mon Sep 17 00:00:00 2001
From 88c4b77d72c2174d41dc4ee91884c889e063a897 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 25 Feb 2015 22:24:29 +0000
Subject: apply patch from Ingo Weinhold
diff --git a/unix/unix.c b/unix/unix.c
index df76ffc..773c408 100644
index df76ffc..ff7605a 100644
--- a/unix/unix.c
+++ b/unix/unix.c
@@ -1993,7 +1993,7 @@ yet, or I'd list a few)
@@ -581,7 +581,7 @@ index df76ffc..773c408 100644
{
int retval = EOK;
unsigned char *ptr;
@@ -2001,38 +2001,40 @@ static int set_file_attrs( const char *name,
@@ -2001,38 +2001,39 @@ static int set_file_attrs( const char *name,
int fd;
ptr = (unsigned char *)attr_buff;
@@ -610,11 +610,11 @@ index df76ffc..773c408 100644
- memcpy(&fa_info, ptr, sizeof(struct attr_info));
- fa_info.type = (uint32)B_BENDIAN_TO_HOST_INT32( fa_info.type );
- fa_info.size = (off_t)B_BENDIAN_TO_HOST_INT64( fa_info.size );
- ptr += sizeof(struct attr_info);
+ memcpy(&attr_type, ptr, 4); ptr += 4;
+ memcpy(&attr_size, ptr, 8); ptr += 8;
+ attr_type = (uint32)B_BENDIAN_TO_HOST_INT32( attr_type );
+ attr_size = (off_t)B_BENDIAN_TO_HOST_INT64( attr_size );
ptr += sizeof(struct attr_info);
- if (fa_info.size < 0LL) {
+ if (attr_size < 0LL) {
@@ -631,7 +631,7 @@ index df76ffc..773c408 100644
if (ptr > guard) {
/* We've got a truncated attribute. */
@@ -2042,15 +2044,15 @@ static int set_file_attrs( const char *name,
@@ -2042,15 +2043,15 @@ static int set_file_attrs( const char *name,
}
/* Wave the magic wand... this will swap Be-known types properly. */