openbsd-ports/archivers/bzip/patches/patch-bzip_c

57 lines
1.7 KiB
Plaintext

--- bzip.c.orig Fri Aug 30 22:35:28 1996
+++ bzip.c Thu Oct 4 22:14:49 2001
@@ -114,9 +114,9 @@
--*/
#if BZ_UNIX_32
+ #include <sys/types.h>
#include <utime.h>
#include <unistd.h>
- #include <malloc.h>
#include <sys/stat.h>
#include <sys/times.h>
@@ -2578,7 +2578,7 @@ void bitStreamEOF ()
/*---------------------------------------------*/
-void mySignalCatcher ( IntNative *n )
+void mySignalCatcher ( IntNative n )
{
fprintf ( stderr,
"\n%s: Control-C (or similar) caught, quitting.\n",
@@ -2588,7 +2588,7 @@ void mySignalCatcher ( IntNative *n )
/*---------------------------------------------*/
-void mySIGSEGVorSIGBUScatcher ( IntNative *n )
+void mySIGSEGVorSIGBUScatcher ( IntNative n )
{
if (compressing)
fprintf ( stderr,
@@ -3130,11 +3130,6 @@ IntNative main ( IntNative argc, Char *a
signal (SIGBUS, mySIGSEGVorSIGBUScatcher);
#endif
- if ( ! (argc > 1 && strcmp ( "-Q", argv[1] ) == 0) )
- fprintf ( stderr,
- "BZIP, a block-sorting file compressor. "
- "Version 0.21, 25-August-96.\n" );
-
#if DEBUG
if ( ! (argc > 1 && strcmp ( "-Q", argv[1] ) == 0) )
fprintf ( stderr, "BZIP: *** compiled with debugging ON ***\n" );
@@ -3204,6 +3199,12 @@ IntNative main ( IntNative argc, Char *a
exit ( 1 );
break;
}
+
+ if (verbose) {
+ fprintf ( stderr,
+ "BZIP, a block-sorting file compressor. "
+ "Version 0.21, 25-August-96.\n" );
+ }
if ( opMode == OM_FILE_TO_STDOUT && numFileNames != 1) {
fprintf ( stderr, "%s: Option -c requires you to supply exactly one filename.\n",