.gitignore

@@ -3,8 +3,8 @@
 /config/app.php
 /config/.env
 /logs/*
-/tmp/*
-/vendor/*
+/tmp/
+/vendor/
 /webroot/files/*
 
 # OS generated files #

README.md

@@ -1,6 +1,5 @@
 [![GitHub license](https://img.shields.io/github/license/fawno/SimpleSCCU)](https://github.com/fawno/SimpleSCCU/blob/master/LICENSE)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/fawno/SimpleSCCU)](https://github.com/fawno/SimpleSCCU/tags)
-[![GitHub release](https://img.shields.io/github/release/fawno/SimpleSCCU)](https://github.com/fawno/SimpleSCCU/releases)
 [![Packagist](https://img.shields.io/packagist/v/fawno/simplesccu)](https://packagist.org/packages/fawno/simplesccu)
 [![Packagist Downloads](https://img.shields.io/packagist/dt/fawno/simplesccu)](https://packagist.org/packages/fawno/simplesccu/stats)
 [![GitHub issues](https://img.shields.io/github/issues/fawno/SimpleSCCU)](https://github.com/fawno/SimpleSCCU/issues)

src/SimpleSCCU.php

@@ -26,48 +26,37 @@ public static function unpack (string $bin) : array {
 			fwrite ($fp, $bin);
 			rewind($fp);
 
-			$header = unpack('a4app/Nlength/N2/Ncount/a', fread($fp, 21));
+			$header = unpack('a4app/Nlength/nver/x6/Ncount', fread($fp, 20));
 			if ($header['app'] != 'SCCU') {
         throw new SimpleSCCUException('Invalid app mark', SimpleSCCUException::ERROR_FORMAT_UNKNOWN);
 			}
 
-			do {
-				fseek($fp, -1, SEEK_CUR);
-				$fhead = unpack('a2mark/Nlength/na/Nb', fread($fp, 12));
+			for ($i = $header['count']; $i; $i--) {
+				$fheader = unpack('a2start/Nlength/nmark/x4', fread($fp, 12));
 
-				$key = '';
-				while ("\x00" != $c = fread($fp, 1)) {
-					$key .= $c;
-				}
+				$string = fread($fp, $fheader['length'] - 12);
 
-				$value = '';
-				while ("\x00" != $c = fread($fp, 1)) {
-					$value .= $c;
-				}
+				$key = current(unpack('Z*', $string));
+				$field = unpack(sprintf('Z%ukey/x/Z*value', strlen($key)), $string);
 
-				$fields[$key] = $value;
+				$fields[$key] = $field['value'];
+			}
 
-				while ("\x00" == fread($fp, 1));
-			} while (!feof($fp));
 			fclose($fp);
 
 			return $fields;
 		}
 
     public static function pack (array $fields) : string {
-      $sccu = pack('N*', 0x10000, 0, count($fields));
+      $sccu = pack('nx6N', 1, count($fields));
 
       foreach ($fields as $key => $value) {
-        $mark = (strlen($key) < 10) ? "\x00\x0C" : "\x00\x16";
-        $mark .= "\x00\x00\x00\x00";
+        $mark = (strlen($key) < 10) ? 0x0C : 0x16;
 
-        $lenght = strlen($key . $value) + 13;
-        $end = 2 - ($lenght % 2);
-        $lenght += $end;
+        $end = strlen($key . $value) % 2;
+        $lenght = strlen($key . $value) + $end + 14;
 
-        $sccu .= '[[' . pack('N*', $lenght) . $mark;
-        $sccu .= $key . "\x00";
-        $sccu .= $value . str_repeat("\x00", $end);
+        $sccu .= '[[' . pack('Nnx4Z*Z*x' . $end, $lenght, $mark, $key, $value);
       }
 
       $sccu = 'SCCU' . pack('N*', strlen($sccu) + 8) . $sccu;