X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=tar.php;h=e9e929386f1e3a9816b8fc11bba47a5735fb1076;hp=cf934d1e5ffc9d29343423504b2e86eafe2706e8;hb=9a3136a5bee66e1055ffb566373952b6054dd7bf;hpb=c6b6624fdc65060f3a54d9902b28c8c103da7709

diff --git a/tar.php b/tar.php
index cf934d1..e9e9293 100644
--- a/tar.php
+++ b/tar.php
@@ -2,22 +2,18 @@
 
 #  Copyright (C) 2006 Jason Woofenden
 #
-#  This file is part of wfpl.
-#
-#  wfpl is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  wfpl is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  General Public License for more details.
-#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
 #  You should have received a copy of the GNU General Public License
-#  along with wfpl; see the file COPYING.  If not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-#  MA 02111-1307, USA.
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # This file is for making a tar archive out of some strings you pass. See
@@ -41,25 +37,60 @@ function write_file($name, $data) {
 # parameters:
 #    $dirname: the name of the tar file (sans "tgz"). Also the name of the directory within.
 #    $files: a hash. The keys are the filenames, the values the file data
-function make_tar($dirname, $files) {
-	$tmpdir = '/tmp/make_tar';
-	$dirname = ereg_replace('[^a-z0-9_-]', '', $dirname);
-	if($dirname == '') $dirname = 'foo';
-	if(!file_exists($tmpdir)) {
-		mkdir($tmpdir);
+#    $extra: (optional) a function to be called right before tar-ing.
+function make_tar($dirname, $files, $pre_archive_func = false, $tmpdir = false) {
+	if(!$tmpdir) {
+		if($GLOBALS['wfpl_tmpdir']) {
+			$tmpdir = $GLOBALS['wfpl_tmpdir'];
+		} else {
+			$tmpdir = 'tmp';
+		}
 	}
+
+	# user is choosing a very non-unique directory name, so make a random one to put it in
+	$tmpdir .= '/' . sprintf('%08x%08x', mt_rand(), mt_rand());
+	mkdir($tmpdir);
+
+	$dirname = preg_replace('|[^a-z0-9_-]|i', '', $dirname);
+	if($dirname == '') $dirname = 'foo';
 	mkdir("$tmpdir/$dirname");
 	foreach($files as $filename => $file_data) {
-		$filename_fixed = ereg_replace('[^a-zA-Z0-9_.-]', '', $filename);
+		if(substr($filename, -3) == ' ->') {
+			$filename = substr($filename, 0, -3);
+			$link = true;
+		} else {
+			$link = false;
+		}
+		$filename_fixed = preg_replace('|[^a-z0-9_.-]|i', '', $filename);
 		if($filename != $filename_fixed) {
 			die("Invalid filename for tar archive");
 		}
-		write_file("$tmpdir/$dirname/$filename", $file_data);
+		if($link) {
+			$target = preg_replace('|[^a-z0-9_./-]|i', '', $file_data);
+			system("/bin/ln -s $file_data \"$tmpdir/$dirname/$filename\"");
+		} else {
+			write_file("$tmpdir/$dirname/$filename", $file_data);
+		}
+	}
+
+	if($pre_archive_func && function_exists($pre_archive_func)) {
+		$pre_archive_func("$tmpdir/$dirname");
 	}
+
 	header("Content-type: application/x-gzip");
 	passthru("tar -C $tmpdir -czf - $dirname/");
-	foreach($files as $filename => $file_data) {
-		unlink("$tmpdir/$dirname/$filename");
+	system('/bin/rm -rf ' . escapeshellarg($tmpdir));
+}
+
+# like make_tar above, except it includes a copy of wfpl
+function make_wfpl_tar($dirname, $files) {
+	make_tar($dirname, $files, 'add_wfpl_dir');
+}
+
+function add_wfpl_dir($dir) {
+	mkdir("$dir/code");
+	system("rsync -plr --exclude=\".git\" --exclude=\"*.swp\" 'inc/wfpl/' '$dir/inc/wfpl/'", $return_code);
+	if($return_code != 0) {
+		die("ERROR: while trying to copy wfpl into archive: rsync returned $return_code");
 	}
-	rmdir("$tmpdir/$dirname");
 }