X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=tar.php;h=e9e929386f1e3a9816b8fc11bba47a5735fb1076;hp=e7beedbb27de338a2c6c1a0ac23335ec8bc6a7a9;hb=062d46e16429f2e55573567518cb01c83b319ac4;hpb=4112c956c82b436e1eb0214026fc2bf16f2f2bcf

diff --git a/tar.php b/tar.php
index e7beedb..e9e9293 100644
--- a/tar.php
+++ b/tar.php
@@ -51,7 +51,7 @@ function make_tar($dirname, $files, $pre_archive_func = false, $tmpdir = false)
 	$tmpdir .= '/' . sprintf('%08x%08x', mt_rand(), mt_rand());
 	mkdir($tmpdir);
 
-	$dirname = ereg_replace('[^a-z0-9_-]', '', $dirname);
+	$dirname = preg_replace('|[^a-z0-9_-]|i', '', $dirname);
 	if($dirname == '') $dirname = 'foo';
 	mkdir("$tmpdir/$dirname");
 	foreach($files as $filename => $file_data) {
@@ -61,12 +61,12 @@ function make_tar($dirname, $files, $pre_archive_func = false, $tmpdir = false)
 		} else {
 			$link = false;
 		}
-		$filename_fixed = ereg_replace('[^a-zA-Z0-9_.-]', '', $filename);
+		$filename_fixed = preg_replace('|[^a-z0-9_.-]|i', '', $filename);
 		if($filename != $filename_fixed) {
 			die("Invalid filename for tar archive");
 		}
 		if($link) {
-			$target = ereg_replace('[^a-zA-Z0-9_./-]', '', $file_data);
+			$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);
@@ -82,14 +82,14 @@ function make_tar($dirname, $files, $pre_archive_func = false, $tmpdir = false)
 	system('/bin/rm -rf ' . escapeshellarg($tmpdir));
 }
 
-# like make_tar above, except it includes a copy of code/wfpl
+# 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\" 'code/wfpl/' '$dir/code/wfpl/'", $return_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");
 	}