X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=fdb.php;h=55504645da6191a839c3c0b0d388974fd1ece9ed;hp=99f63cb98f1c6dc0c39cb82c30b486498587a445;hb=9a3136a5bee66e1055ffb566373952b6054dd7bf;hpb=1297396379e2f82280539e6fbcbe52ec4770b7ec

diff --git a/fdb.php b/fdb.php
index 99f63cb..5550464 100644
--- a/fdb.php
+++ b/fdb.php
@@ -2,21 +2,18 @@
 
 #  Copyright (C) 2007 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 Lesser General Public License as published by the Free
-#  Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
-#  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#  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 this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # This file contains code to use a web-writeable directory full of files as a
@@ -32,7 +29,8 @@
 # fdb_set_dir() passing the path to that directory.
 
 
-require_once('code/wfpl/file.php');
+require_once(__DIR__.'/'.'file.php');
+require_once(__DIR__.'/'.'binary.php');
 
 # call this to set what directory is used to store the files
 function fdb_set_dir($dir) {
@@ -41,37 +39,15 @@ function fdb_set_dir($dir) {
 
 function fdb_get_dir() {
 	if(!isset($GLOBALS['fdb_dir'])) {
-		die('you must call fdb_set_dir() before calling other functions in code/wfpl/fdb.php');
+		die('you must call fdb_set_dir() before calling other functions in wfpl/fdb.php');
 	}
 	return $GLOBALS['fdb_dir'];
 }
 
-# return a 4 bytes that represent the passed integer as a big-endian binary number
-function to_raw_int($int) {
-	return chr($int >> 24) . chr(($int >> 16) & 0xff) . chr(($int >> 8) & 0xff) . chr($int & 0xff);
-}
-
-# return a php number from the string you pass in. The first 4 bytes of the
-# string are read in as a binary value in big-endian format.
-function from_raw_int($quad) {
-	return (ord(substr($quad, 0, 1)) << 24) + (ord(substr($quad, 1, 1)) << 16) + (ord(substr($quad, 2, 1)) << 8) + ord(substr($quad, 3, 1));
-}
-
-function int_at($string, $index) {
-	return from_raw_int(substr($string, $index * 4, 4));
-}
-
-# remove the first 4 bytes of the string, and return them as an int
-function pop_int(&$string) {
-	$int = from_raw_int(substr($string, 0, 4));
-	$string = substr($string, 4);
-	return $int;
-}
-
 
 function fdb_fix_key($key) {
-	$key = ereg_replace('[^a-z0-9.-]', '_', strtolower($key));
-	$key = ereg_replace('^[-.]', '_', strtolower($key));
+	$key = preg_replace('|[^a-z0-9.-]|', '_', strtolower($key));
+	$key = preg_replace('|^[-.]|', '_', strtolower($key));
 	return substr($key, 0, 32);
 }
 
@@ -93,14 +69,7 @@ function fdb_geta($key) {
 	if($data === false) {
 		return false;
 	}
-	$header_count = pop_int($data);
-	$out = array();
-	while($header_count--) {
-		$size = pop_int($data);
-		$out[] = substr($data, 0, $size);
-		$data = substr($data, $size);
-	}
-	return $out;
+	return raw_to_array($data);
 }
 
 # returns:
@@ -129,12 +98,7 @@ function fdb_set($key, $data) {
 	if(!is_array($data)) {
 		$data = array($data);
 	}
-	$out = to_raw_int(count($data));
-	foreach($data as $dat) {
-		$out .= to_raw_int(strlen($dat));
-		$out .= $dat;
-	}
-	fdb_set_raw($key, $out);
+	fdb_set_raw($key, array_to_raw($data));
 }
 
 function fdb_delete($key) {