<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7d85fe6da2384abea94e1616a8c875b940fe53c3">https://github.com/macports/macports-ports/commit/7d85fe6da2384abea94e1616a8c875b940fe53c3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7d85fe6da23 macutil: fix build with recent clang
</span>7d85fe6da23 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7d85fe6da2384abea94e1616a8c875b940fe53c3
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Tue Sep 21 22:30:16 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> macutil: fix build with recent clang
</span>---
sysutils/macutil/Portfile | 4 +-
sysutils/macutil/files/patch-fix-prototypes.diff | 511 +++++++++++++++++++++++
sysutils/macutil/files/patch-hexbin-buffer.c | 18 -
sysutils/macutil/files/patch-macunpack-lzh.h | 13 -
4 files changed, 513 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/macutil/Portfile b/sysutils/macutil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e11c3a8cebd..6a515cd2f5e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/macutil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/macutil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,8 +57,7 @@ platform darwin {
</span> }
patchfiles patch-crc-makefile.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-hexbin-buffer.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-macunpack-lzh.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-prototypes.diff
</span>
extract.suffix .Z
extract.cmd uncompress
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +65,7 @@ extract.pre_args -c
</span> extract.post_args "| sh"
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -std=c89
</span>
variant universal {}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/macutil/files/patch-fix-prototypes.diff b/sysutils/macutil/files/patch-fix-prototypes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..50f9b0b54e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/macutil/files/patch-fix-prototypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,511 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru binhex/binhex.c binhex/binhex.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- binhex/binhex.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ binhex/binhex.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,14 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/machdr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/rdfile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "../fileio/rdfileopt.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/patchlevel.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *strcat();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void exit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void transname();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void do_indent();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void dofile();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOCALOPT "RilqVH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru binhex/dofile.c binhex/dofile.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- binhex/dofile.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ binhex/dofile.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/machdr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/rdfile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru comm/from.c comm/from.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- comm/from.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ comm/from.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +11,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern unsigned long binhex_updcrc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern unsigned long binhex_crcinit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void cleanup(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int receive_rec();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int receive_block();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru comm/frommac.c comm/frommac.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- comm/frommac.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ comm/frommac.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,10 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "comm.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/patchlevel.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/machdr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/fileglob.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/wrfile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "../fileio/wrfileopt.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOCALOPT "lmMxXyYzoTVH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,8 +19,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* DEBUG */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void exit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void transname();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void setup_tty();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void reset_tty();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void xm_from();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void ym_from();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char info[INFOBYTES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru comm/to.c comm/to.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- comm/to.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ comm/to.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,6 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void tputrec();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern unsigned long binhex_updcrc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern unsigned long binhex_crcinit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void cleanup(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void send_rec();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru comm/tomac.c comm/tomac.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- comm/tomac.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ comm/tomac.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,19 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "comm.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/machdr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/rdfile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "../fileio/rdfileopt.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/patchlevel.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *strcat();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void exit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void transname();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void do_indent();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void dofile();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void setup_tty();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void reset_tty();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void xm_to();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void ym_to();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOCALOPT "ilqMxXyYzoTVH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru comm/tty.c comm/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- comm/tty.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ comm/tty.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef TERMIOS_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sgtty.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* TERMIOS_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru comm/xm_from.c comm/xm_from.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- comm/xm_from.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ comm/xm_from.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,6 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef XM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/machdr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/wrfile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/masks.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "protocol.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,6 +14,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void tputc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char info[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void transname();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void cleanup();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void receive_part();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int receive_sync();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru comm/ym_from.c comm/ym_from.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- comm/ym_from.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ comm/ym_from.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,6 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef YM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/machdr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/wrfile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/masks.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "protocol.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,6 +14,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void tputc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char info[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void transname();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void cleanup();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void receive_part();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int receive_sync();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru fileio/rdfile.c fileio/rdfile.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fileio/rdfile.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fileio/rdfile.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,12 +42,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RSRC_FORMAT 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define UNIX_FORMAT 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *strcpy();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *strncpy();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *strcat();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void exit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void backtrans(char *macname, char *name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void check_files();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void read_file();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru fileio/wrfile.c fileio/wrfile.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fileio/wrfile.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fileio/wrfile.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,12 +35,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MACI 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* SCAN */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *strcpy();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *strncpy();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *strcat();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void exit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <strings.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef UNDEF /* Do not declare sprintf; not portable (but lint will complain) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *sprintf();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru fileio/wrfileopt.h fileio/wrfileopt.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fileio/wrfileopt.h 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fileio/wrfileopt.h 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int wrfileopt();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void give_wrfileopt();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern char *get_wrfileopt();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void set_wrfileopt();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void set_s_wrfileopt();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char *get_wrfileopt();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru hexbin/buffer.c hexbin/buffer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hexbin/buffer.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hexbin/buffer.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,12 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "buffer.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/wrfile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void exit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *data_fork, *rsrc_fork;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int data_size, rsrc_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int max_data_size, max_rsrc_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru hexbin/hexbin.c hexbin/hexbin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hexbin/hexbin.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hexbin/hexbin.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef TYPES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* TYPES_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru hexbin/readline.h hexbin/readline.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hexbin/readline.h 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hexbin/readline.h 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,2 +1,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char line[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int readline();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/bin.c macunpack/bin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/bin.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/bin.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "macunpack.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef BIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/cpt.c macunpack/cpt.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/cpt.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/cpt.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,9 +21,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ESC1SEEN 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ESC2SEEN 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern int free();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int gethuffbyte(node *l_nodelist);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void cpt_uncompact();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static unsigned char *cpt_data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/dd.c macunpack/dd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/dd.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/dd.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,10 +9,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/masks.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *strcpy();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *strncpy();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void cpt_wrfile1();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void core_compress();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void de_compress();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/de_huffman.c macunpack/de_huffman.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/de_huffman.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/de_huffman.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int bit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int gethuffbyte(node *l_nodelist);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void de_huffman(obytes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long obytes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/dia.c macunpack/dia.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/dia.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/dia.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,8 +9,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/kind.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static unsigned char *dia_archive;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int dia_archive_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/dir.c macunpack/dir.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/dir.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/dir.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,8 +4,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/masks.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char *dir_stack;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int dir_ptr = -64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/lzc.c macunpack/lzc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/lzc.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/lzc.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "macunpack.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LZC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/lzh.c macunpack/lzh.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/lzh.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/lzh.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,8 +17,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LZSMASK 4095
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LZBUFFSIZE 8192 /* Max of above buffsizes */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void de_lzah();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern unsigned char (*lzah_getbyte)();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void de_lzh();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/lzh.h macunpack/lzh.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/lzh.h 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/lzh.h 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,10 +58,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define lz5 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define lzs 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *lzh_pointer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *lzh_data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *lzh_finfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern int lzh_fsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern int lzh_kind;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *lzh_file;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/macbinary.c macunpack/macbinary.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/macbinary.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/macbinary.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "macunpack.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/machdr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/macunpack.c macunpack/macunpack.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/macunpack.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/macunpack.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "macunpack.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/patchlevel.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/pit.c macunpack/pit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/pit.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/pit.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "macunpack.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef PIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/wrfile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +17,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void de_huffman();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void set_huffman();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int getihuffbyte();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int pit_filehdr();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void pit_wrfile();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void pit_nocomp();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/sit.c macunpack/sit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/sit.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/sit.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "macunpack.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/stf.c macunpack/stf.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/stf.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/stf.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "macunpack.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef STF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "stf.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru macunpack/zma.c macunpack/zma.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macunpack/zma.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macunpack/zma.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,8 +9,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/masks.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void de_lzh();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* We do allow for possible backpointing, so we allocate the archive in core */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru mixed/macsave.c mixed/macsave.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mixed/macsave.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mixed/macsave.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/patchlevel.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/wrfile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru mixed/macstream.c mixed/macstream.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mixed/macstream.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mixed/macstream.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,15 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/machdr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/rdfile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/rdfileopt.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../util/patchlevel.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *malloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *realloc();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char *strcat();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void exit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void transname();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void do_indent();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOCALOPT "ilqVH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru mixed/mcb.c mixed/mcb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mixed/mcb.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mixed/mcb.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "globals.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../macunpack/macunpack.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/machdr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru util/util.c util/util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- util/util.c 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ util/util.c 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../fileio/fileglob.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "masks.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru util/util.h util/util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- util/util.h 2021-09-21 22:22:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ util/util.h 2021-09-21 22:22:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void put4();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void put2();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void do_indent();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int do_query();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern real_time set_time();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern unsigned long tomactime();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern real_time frommactime();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/macutil/files/patch-hexbin-buffer.c b/sysutils/macutil/files/patch-hexbin-buffer.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b2e1742659d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/macutil/files/patch-hexbin-buffer.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- hexbin/buffer.c.org 2005-02-01 23:57:21.489383480 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ hexbin/buffer.c 2005-02-02 00:00:23.574583423 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,12 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "globals.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../util/util.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "buffer.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../fileio/wrfile.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern char *malloc();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern char *realloc();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern void exit();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *data_fork, *rsrc_fork;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int data_size, rsrc_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int max_data_size, max_rsrc_size;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/macutil/files/patch-macunpack-lzh.h b/sysutils/macutil/files/patch-macunpack-lzh.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 74a811f123b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/macutil/files/patch-macunpack-lzh.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macunpack/lzh.h.org 2005-11-10 00:34:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macunpack/lzh.h 2005-11-10 00:34:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,10 +58,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define lz5 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define lzs 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern char *lzh_pointer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern char *lzh_data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern char *lzh_finfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern int lzh_fsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern int lzh_kind;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern char *lzh_file;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>