X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=binary.php;h=035c97e6bc9dc15095495799bea2e6a834b0d720;hp=bc0a3aab61d0aa527a05121372be3e4b99b22d65;hb=9a3136a5bee66e1055ffb566373952b6054dd7bf;hpb=9f8ed1dba7b2bb0319ab69f843f20e0d45ff736c

diff --git a/binary.php b/binary.php
index bc0a3aa..035c97e 100644
--- a/binary.php
+++ b/binary.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 work with "raw" binary numbers in big-endian format
@@ -44,4 +41,25 @@ function pop_int(&$string) {
 	return $int;
 }
 
+# convert an array (not hash) to a string of bytes
+function array_to_raw($data) {
+	$ret = to_raw_int(count($data));
+	foreach($data as $dat) {
+		$ret .= to_raw_int(strlen($dat));
+		$ret .= $dat;
+	}
+	return $ret;
+}
+
+function raw_to_array($data) {
+	$header_count = pop_int($data);
+	$ret = array();
+	while($header_count--) {
+		$size = pop_int($data);
+		$ret[] = substr($data, 0, $size);
+		$data = substr($data, $size);
+	}
+	return $ret;
+}
+
 ?>