rpms/ncompress
7
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase cont (patch1): lfs

Browse Source 
Version: 4.2.4.4-1
This commit is contained in:
Pavel Raiskup 2013-03-02 08:31:57 +01:00
parent 1b6dc3c2bc
commit 426d717ee1
3 changed files with 28 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ncompress-4.2.4-lfs2.patch
View File

@ -1,52 +0,0 @@
--- ncompress-4.2.4/compress42.c.lfs 2002-06-19 19:19:33.000000000 -0400
+++ ncompress-4.2.4/compress42.c 2002-06-19 19:20:48.000000000 -0400
@@ -130,6 +130,7 @@
* Add variable bit length output.
*
*/
+#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <ctype.h>
@@ -168,30 +169,6 @@
# define SIG_TYPE void (*)()
#endif
-#ifndef NOFUNCDEF
- extern void *malloc LARGS((int));
- extern void free LARGS((void *));
-#ifndef _IBMR2
- extern int open LARGS((char const *,int,...));
-#endif
- extern int close LARGS((int));
- extern int read LARGS((int,void *,int));
- extern int write LARGS((int,void const *,int));
- extern int chmod LARGS((char const *,int));
- extern int unlink LARGS((char const *));
- extern int chown LARGS((char const *,int,int));
- extern int utime LARGS((char const *,struct utimbuf const *));
- extern char *strcpy LARGS((char *,char const *));
- extern char *strcat LARGS((char *,char const *));
- extern int strcmp LARGS((char const *,char const *));
- extern unsigned strlen LARGS((char const *));
- extern void *memset LARGS((void *,char,unsigned int));
- extern void *memcpy LARGS((void *,void const *,unsigned int));
- extern int atoi LARGS((char const *));
- extern void exit LARGS((int));
- extern int isatty LARGS((int));
-#endif
-
#define MARK(a) { asm(" .globl M.a"); asm("M.a:"); }
#ifdef DEF_ERRNO
@@ -535,8 +512,8 @@
char ofname[MAXPATHLEN]; /* Output filename */
int fgnd_flag = 0; /* Running in background (SIGINT=SIGIGN) */
-long bytes_in; /* Total number of byte from input */
-long bytes_out; /* Total number of byte to output */
+long long bytes_in; /* Total number of byte from input */
+long long bytes_out; /* Total number of byte to output */
/*
* 8086 & 80286 Has a problem with array bigger than 64K so fake the array

23
ncompress-4.2.4.4-lfs.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/compress42.c b/compress42.c
index 804d099..b3b3add 100644
--- a/compress42.c
+++ b/compress42.c
@@ -130,6 +130,7 @@
* Add variable bit length output.
*
*/
+#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -538,8 +539,8 @@ int remove_ofname = 0; /* Remove output file on a error */
char ofname[MAXPATHLEN]; /* Output filename */
int fgnd_flag = 0; /* Running in background (SIGINT=SIGIGN) */
-long bytes_in; /* Total number of byte from input */
-long bytes_out; /* Total number of byte to output */
+long long bytes_in; /* Total number of byte from input */
+long long bytes_out; /* Total number of byte to output */
/*
* 8086 & 80286 Has a problem with array bigger than 64K so fake the array

6
ncompress.spec
View File

@ -11,7 +11,11 @@ Source: http://prdownloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version
# ~> downstream
Patch0: ncompress-4.2.4.4-make.patch
Patch1: ncompress-4.2.4-lfs2.patch
# from dist-git commit 0539779d937
# (praiskup: removed redundant part as -DNOFUNCDEF is defined)
# ~> downstream
Patch1: ncompress-4.2.4.4-lfs.patch
Patch2: ncompress-4.2.4-filenamelen.patch
Patch3: ncompress-2GB.patch
Patch4: ncompress-4.2.4-zerobyteforce.patch