From 966f2cf78de1585d8d67b1c98a6fd76aea0b8424 Mon Sep 17 00:00:00 2001
From: munja <allnbwe@gmail.com>
Date: Sun, 5 Dec 2021 00:39:47 +0000
Subject: [PATCH] fix: addressing corrupted unzips in certain cases

---
 base/mp_unzip.sas | 47 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/base/mp_unzip.sas b/base/mp_unzip.sas
index 1f38cf3..e374a14 100644
--- a/base/mp_unzip.sas
+++ b/base/mp_unzip.sas
@@ -7,19 +7,23 @@
 
   Usage:
 
-      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+      filename mc url
+        "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %mp_unzip(ziploc="/some/file.zip",outdir=/some/folder)
 
-  <h4> SAS Macros </h4>
-  @li mf_mkdir.sas
-  @li mf_getuniquefileref.sas
+  More info:  https://blogs.sas.com/content/sasdummy/2015/05/11/using-filename-zip-to-unzip-and-read-data-files-in-sas/
 
   @param ziploc= Fileref or quoted full path to zip file ("/path/to/file.zip")
   @param outdir= (%sysfunc(pathname(work))) Directory in which to write the
     outputs (created if non existant)
 
+  <h4> SAS Macros </h4>
+  @li mf_mkdir.sas
+  @li mf_getuniquefileref.sas
+  @li mp_binarycopy.sas
+
   @version 9.4
   @author Allan Bowe
   @source https://github.com/sasjs/core
@@ -31,14 +35,16 @@
   ,outdir=%sysfunc(pathname(work))
 )/*/STORE SOURCE*/;
 
-%local f1 f2 f3;
+%local f1 f2 ;
 %let f1=%mf_getuniquefileref();
 %let f2=%mf_getuniquefileref();
-%let f3=%mf_getuniquefileref();
 
 /* Macro variable &datazip would be read from the file */
 filename &f1 ZIP &ziploc;
 
+/* create target folder */
+%mf_mkdir(&outdir)
+
 /* Read the "members" (files) from the ZIP file */
 data _data_(keep=memname isFolder);
   length memname $200 isFolder 8;
@@ -53,21 +59,32 @@ data _data_(keep=memname isFolder);
   end;
   rc=dclose(fid);
 run;
-filename &f1 clear;
+
+filename &f2 temp;
 
 /* loop through each entry and either create the subfolder or extract member */
-%mf_mkdir(&outdir)
 data _null_;
   set &syslast;
+  file &f2;
   if isFolder then call execute('%mf_mkdir(&outdir/'!!memname!!')');
   else do;
-    call execute(
-      cats('filename &f2 zip &ziploc member="',memname,'" recfm=n;')
-    );
-    call execute('filename &f3 "&outdir/'!!trim(memname)!!'" recfm=n;');
-    call execute('data _null_; rc=fcopy("&f2","&f3");run;');
-    call execute('filename &f2 clear; filename &f3 clear;');
+    qname=quote(cats("&outdir/",memname));
+    bname=cats('(',memname,')');
+    put '/* hat tip: "data _null_" on SAS-L */';
+    put 'data _null_;';
+    put '  infile &f1 ' bname ' lrecl=256 recfm=F length=length eof=eof unbuf;';
+    put '  file ' qname ' lrecl=256 recfm=N;';
+    put '  input;';
+    put '  put _infile_ $varying256. length;';
+    put '  return;';
+    put 'eof:';
+    put '  stop;';
+    put 'run;';
   end;
 run;
 
-%mend mp_unzip;
\ No newline at end of file
+%inc &f2/source2;
+
+filename &f2 clear;
+
+%mend mp_unzip;