xtar: Patch some more obvious 1995-era code problems.

9 files changed, 84 insertions, 16 deletions

diff --git a/x11/xtar/distinfo b/x11/xtar/distinfo
index ad7fbf0b9b6..c96a0d9aac9 100644
--- a/x11/xtar/distinfo
+++ b/x11/xtar/distinfo
@@ -1,20 +1,23 @@
-$NetBSD: distinfo,v 1.1 2022/01/07 12:43:14 nia Exp $
+$NetBSD: distinfo,v 1.2 2022/01/07 13:02:31 nia Exp $
 
 BLAKE2s (xtar-1.4.tar.gz) = 3a2d17f4c1fd2d6d46c5f91b919d54367c1268b027984016aa6c992e0e0b070f
 SHA512 (xtar-1.4.tar.gz) = aac20f1eefcdc2401dc0fa39ba4291a56cb505ee4a6a5202ac6401e8bbc27dcf40368495e5b22669c21a30d90cf116d2dbdc67ce86273f4fd8df21f070d2f121
 Size (xtar-1.4.tar.gz) = 87506 bytes
 SHA1 (patch-Imakefile) = 6bbc68103dd399c0a744f837dbe3016d5a367424
-SHA1 (patch-Xbr_XbrCB.c) = db5544ed0ede603a53f091a47335505c2207b7d5
+SHA1 (patch-Xbr_XbrCB.c) = a9d3a9eaa18e69b1192225bab8df73e21786f472
 SHA1 (patch-Xbr_XbrGfx.c) = 2ff219fe99837c2b0109667866b7b822312ec0c0
+SHA1 (patch-Xbr_XbrList.c) = 49264cdf8734efef039fc50c3778d91124346735
 SHA1 (patch-Xbr_XbrList.h) = b038bfa8b9bc1300de868994ad6e6ff2fa7e20ee
-SHA1 (patch-Xbr_XbrMenu.c) = 193673bed0d88510331bb466c1cef24840aded36
+SHA1 (patch-Xbr_XbrMenu.c) = b6af1fe9a94999ff1a28133a6c3378d6efff3746
 SHA1 (patch-common_ascii.c) = 45c8d20e0e7557ff16e7984c1b18fd909c573858
-SHA1 (patch-common_file.c) = 959078bb12666c2f9970644e5f23f054abb3ae81
+SHA1 (patch-common_env.c) = 1fe7f8fd523faba3e45193d9dacea2d59874c252
+SHA1 (patch-common_file.c) = 8af8bf6cd79482cc5ac1d0c9df862e593ac7b054
 SHA1 (patch-common_magic.c) = 50b27640f9e913a32db499121c2dd1f990c60902
 SHA1 (patch-common_magic.h) = 23dacfc0d3dbbca9bdadeb1f6678cefec4c640fc
+SHA1 (patch-common_mkdirhier.c) = 91f116849c14dc5fd7eaef686bd6e58adef8340f
 SHA1 (patch-common_nums.c) = b71fbbb3f1a956155ad06fb394f18a53c6460093
-SHA1 (patch-common_pipe.c) = 827efb75e5c49808ffbcad6fa9bbea60c8666ec0
+SHA1 (patch-common_pipe.c) = 696e007302f0f8cfbc9d1395bd79f6575cceb250
 SHA1 (patch-common_regexpr.c) = 14ef6d96bb0f81fae929595204b4d3ac134e6d1c
 SHA1 (patch-common_str.c) = 9290827ba81b9255957a17c5df975036c1024365
-SHA1 (patch-common_tmpfile.c) = a8a5c1870fd200c437d97869fdb17e6fb65f058e
+SHA1 (patch-common_tmpfile.c) = a7dcac23b0adef061f65879978bdd9903c8f5d43
 SHA1 (patch-xtar.c) = 5b3eb5d2ee883efbd329f871f5f29189e9969072
diff --git a/x11/xtar/patches/patch-Xbr_XbrCB.c b/x11/xtar/patches/patch-Xbr_XbrCB.c
index 3026706cda8..a51e4a4a4b9 100644
--- a/x11/xtar/patches/patch-Xbr_XbrCB.c
+++ b/x11/xtar/patches/patch-Xbr_XbrCB.c
@@ -1,14 +1,15 @@
-$NetBSD: patch-Xbr_XbrCB.c,v 1.1 2022/01/07 12:43:14 nia Exp $
+$NetBSD: patch-Xbr_XbrCB.c,v 1.2 2022/01/07 13:02:31 nia Exp $
 
 - Fix implicit declaration warnings.
 
 --- Xbr/XbrCB.c.orig	1995-05-09 08:06:46.000000000 +0000
 +++ Xbr/XbrCB.c
-@@ -19,6 +19,7 @@
+@@ -19,6 +19,8 @@
   */
  
  #include <Xm/Xm.h>
 +#include <stdlib.h>
++#include <stdio.h>
  
  void XbrCBExitApplication(Widget, XtPointer, XtPointer);
  void XbrCBDestroyWidget(Widget, XtPointer, XtPointer);
diff --git a/x11/xtar/patches/patch-Xbr_XbrList.c b/x11/xtar/patches/patch-Xbr_XbrList.c
new file mode 100644
index 00000000000..b40459d9d06
--- /dev/null
+++ b/x11/xtar/patches/patch-Xbr_XbrList.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-Xbr_XbrList.c,v 1.1 2022/01/07 13:02:31 nia Exp $
+
+- Fix implicit declaration warnings.
+- Add missing argument to XmScrollBarSetValues.
+
+--- Xbr/XbrList.c.orig	1995-05-09 08:06:46.000000000 +0000
++++ Xbr/XbrList.c
+@@ -24,8 +24,10 @@
+  *
+  */
+ 
++#include <stdlib.h>
+ #include <Xm/Xm.h>
+ #include <Xm/List.h>
++#include <Xm/ScrollBar.h>
+ 
+ #include "XbrList.h"
+ 
+@@ -191,7 +193,7 @@ void XbrListTop(Widget w)
+     XmScrollBarGetValues(scrollbar, &value_return, &slider_size_return,
+       &increment_return, &page_increment_return);    
+     XmScrollBarSetValues(scrollbar, minimum, slider_size_return,
+-      increment_return, page_increment_return);    
++      increment_return, page_increment_return, 0);    
+ }
+ 
+ /*----------------------------------------------------------------------------
diff --git a/x11/xtar/patches/patch-Xbr_XbrMenu.c b/x11/xtar/patches/patch-Xbr_XbrMenu.c
index c9ca11b78d4..dbfe6ba73cf 100644
--- a/x11/xtar/patches/patch-Xbr_XbrMenu.c
+++ b/x11/xtar/patches/patch-Xbr_XbrMenu.c
@@ -1,13 +1,14 @@
-$NetBSD: patch-Xbr_XbrMenu.c,v 1.1 2022/01/07 12:43:14 nia Exp $
+$NetBSD: patch-Xbr_XbrMenu.c,v 1.2 2022/01/07 13:02:31 nia Exp $
 
 - Fix implicit declaration warnings.
 
 --- Xbr/XbrMenu.c.orig	1995-05-09 08:06:47.000000000 +0000
 +++ Xbr/XbrMenu.c
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,8 @@
   *
   */
  
++#include <stdio.h>
 +#include <stdlib.h>
  #include <Xm/Xm.h>
  #include <Xm/CascadeB.h>
diff --git a/x11/xtar/patches/patch-common_env.c b/x11/xtar/patches/patch-common_env.c
new file mode 100644
index 00000000000..5e55716906f
--- /dev/null
+++ b/x11/xtar/patches/patch-common_env.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-common_env.c,v 1.1 2022/01/07 13:02:31 nia Exp $
+
+- Fix implicit declaration warnings.
+
+--- common/env.c.orig	1995-05-09 08:06:46.000000000 +0000
++++ common/env.c
+@@ -27,6 +27,7 @@
+ #include <sys/param.h>
+ #include <sys/utsname.h>
+ 
++#include "file.h"
+ #include "env.h"
+ 
+ int env_osrelease();
diff --git a/x11/xtar/patches/patch-common_file.c b/x11/xtar/patches/patch-common_file.c
index 6c1b18c5f30..cf162ced098 100644
--- a/x11/xtar/patches/patch-common_file.c
+++ b/x11/xtar/patches/patch-common_file.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-common_file.c,v 1.1 2022/01/07 12:43:14 nia Exp $
+$NetBSD: patch-common_file.c,v 1.2 2022/01/07 13:02:31 nia Exp $
 
 - Fix implicit declaration warnings.
 
 --- common/file.c.orig	1995-05-09 08:06:46.000000000 +0000
 +++ common/file.c
-@@ -22,7 +22,9 @@
+@@ -22,10 +22,13 @@
  #include <sys/stat.h>
  #include <sys/time.h>
  #include <stdio.h>
@@ -14,3 +14,7 @@ $NetBSD: patch-common_file.c,v 1.1 2022/01/07 12:43:14 nia Exp $
  #include <utime.h>
  #include <time.h>
  
++#include "env.h"
+ #include "stat.h"		/* We use stat_size()           */
+ #include "fname.h"
+ #include "magic.h"
diff --git a/x11/xtar/patches/patch-common_mkdirhier.c b/x11/xtar/patches/patch-common_mkdirhier.c
new file mode 100644
index 00000000000..f1b4707694f
--- /dev/null
+++ b/x11/xtar/patches/patch-common_mkdirhier.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-common_mkdirhier.c,v 1.1 2022/01/07 13:02:31 nia Exp $
+
+- Fix implicit declaration warnings.
+
+--- common/mkdirhier.c.orig	1995-05-09 08:06:46.000000000 +0000
++++ common/mkdirhier.c
+@@ -24,7 +24,9 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ 
++#include "file.h"
+ #include "fname.h"
++#include "stat.h"
+ 
+ int mkdirhier(char *, mode_t);
+ 
diff --git a/x11/xtar/patches/patch-common_pipe.c b/x11/xtar/patches/patch-common_pipe.c
index 06e516a2806..344b8362bd5 100644
--- a/x11/xtar/patches/patch-common_pipe.c
+++ b/x11/xtar/patches/patch-common_pipe.c
@@ -1,13 +1,14 @@
-$NetBSD: patch-common_pipe.c,v 1.1 2022/01/07 12:43:14 nia Exp $
+$NetBSD: patch-common_pipe.c,v 1.2 2022/01/07 13:02:31 nia Exp $
 
 - Fix implicit declaration warnings.
 
 --- common/pipe.c.orig	1995-05-09 08:06:46.000000000 +0000
 +++ common/pipe.c
-@@ -23,7 +23,9 @@
+@@ -23,7 +23,10 @@
  
  #include <errno.h>
  #include <stdio.h>
++#include <stdlib.h>
 +#include <string.h>
  #include <fcntl.h>
 +#include <unistd.h>
diff --git a/x11/xtar/patches/patch-common_tmpfile.c b/x11/xtar/patches/patch-common_tmpfile.c
index 158b47b9a5e..97fb462d39a 100644
--- a/x11/xtar/patches/patch-common_tmpfile.c
+++ b/x11/xtar/patches/patch-common_tmpfile.c
@@ -1,14 +1,15 @@
-$NetBSD: patch-common_tmpfile.c,v 1.1 2022/01/07 12:43:14 nia Exp $
+$NetBSD: patch-common_tmpfile.c,v 1.2 2022/01/07 13:02:31 nia Exp $
 
 - Fix implicit declaration warnings.
 
 --- common/tmpfile.c.orig	1995-05-09 08:06:46.000000000 +0000
 +++ common/tmpfile.c
-@@ -21,6 +21,7 @@
+@@ -21,6 +21,8 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
 +#include <unistd.h>
++#include "file.h"
  
  /* Data structure describing a temporary file */
  typedef struct tmp_struct {