X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=fdb.php;h=a9bb59fa3c88336e2683ce2851865353bb9e588f;hb=23ac7dc3675119a6f7a3876837bd6c656b0d2cce;hp=4e289727f8e7cf3dd6a5e5e217ca4943fc6623fb;hpb=7b70792307cbb5ff5b4442c366e1aa0498e34e9c;p=wfpl.git

diff --git a/fdb.php b/fdb.php
index 4e28972..a9bb59f 100644
--- a/fdb.php
+++ b/fdb.php
@@ -23,7 +23,8 @@
 # very simple database.
 
 # Keys are truncated to 32 bytes, made lowercase, and all characters that are
-# not alpha/numeric are replaced with underscores.
+# not alpha/numeric are replaced with underscores. Periods and hyphens are only
+# replaced if they are at the begining.
 
 # Data can be either a string or an array.
 
@@ -31,6 +32,9 @@
 # fdb_set_dir() passing the path to that directory.
 
 
+require_once('code/wfpl/file.php');
+require_once('code/wfpl/binary.php');
+
 # call this to set what directory is used to store the files
 function fdb_set_dir($dir) {
 	$GLOBALS['fdb_dir'] = $dir;
@@ -59,13 +63,19 @@ function int_at($string, $index) {
 }
 
 # remove the first 4 bytes of the string, and return them as an int
-function pop_int($&string) {
-	$int = from_raw_int(substring($string, 0 4));
+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));
+	return substr($key, 0, 32);
+}
+
 
 function fdb_get_raw($key) {
 	$key = fdb_fix_key($key);
@@ -80,14 +90,14 @@ function fdb_set_raw($key, $data) {
 # like fdb_get() except it returns an array even when there's just one element
 function fdb_geta($key) {
 	$key = fdb_fix_key($key);
-	$data = fd_get_raw($key);
+	$data = fdb_get_raw($key);
 	if($data === false) {
 		return false;
 	}
 	$header_count = pop_int($data);
 	$out = array();
 	while($header_count--) {
-		$size = int_at($data);
+		$size = pop_int($data);
 		$out[] = substr($data, 0, $size);
 		$data = substr($data, $size);
 	}
@@ -104,6 +114,9 @@ function fdb_geta($key) {
 # array in this case too)
 function fdb_get($key) {
 	$ret = fdb_geta($key);
+	if($ret == false) {
+		return false;
+	}
 	if(count($ret) == 1) {
 		return $ret[0];
 	} else {
@@ -112,7 +125,7 @@ function fdb_get($key) {
 }
 
 # data can be a string or array
-function fdb_put($key, $data) {
+function fdb_set($key, $data) {
 	$key = fdb_fix_key($key);
 	if(!is_array($data)) {
 		$data = array($data);
@@ -122,7 +135,16 @@ function fdb_put($key, $data) {
 		$out .= to_raw_int(strlen($dat));
 		$out .= $dat;
 	}
-	return $out;
+	fdb_set_raw($key, $out);
+}
+
+function fdb_delete($key) {
+	$key = fdb_fix_key($key);
+	$path = fdb_get_dir() . "/$key";
+	if(file_exists($path)) {
+		return unlink($path);
+	}
+	return false;
 }
 
 ?>