FEAT: bincode: reading of STRING-BYTES and OCTEL-BYTES (string and octal number from fixed size bytes)

Author: Oldes

src/boot/words.r

@@ -226,4 +226,6 @@ devices-out
 
 msdos-datetime
 msdos-date
-msdos-time
+msdos-time
+octal-bytes
+string-bytes

src/core/u-bincode.c

@@ -1203,6 +1203,8 @@ static REBCNT EncodedU32_Size(u32 value) {
 							SET_INT32(temp, cp[0] + (cp[1] << 8) + (cp[2] << 16));
 							break;
 						case SYM_BYTES:
+						case SYM_OCTAL_BYTES:
+						case SYM_STRING_BYTES:
 							//puts("bytes");
 							next = ++value;
 							if (IS_GET_WORD(next)) next = Get_Var(next);
@@ -1218,10 +1220,27 @@ static REBCNT EncodedU32_Size(u32 value) {
 							ASSERT_READ_SIZE(value, cp, ep, n);
 						readNBytes:
 							//printf("num: %i\n", n);
-							VAL_SET(temp, REB_BINARY);
-							bin_new = Copy_Series_Part(bin, VAL_INDEX(buffer_read), n);
-							VAL_SERIES(temp) = bin_new;
-							VAL_INDEX(temp) = 0;
+							if (cmd == SYM_BYTES || cmd == SYM_STRING_BYTES) {
+								
+								bin_new = Copy_Series_Part(bin, VAL_INDEX(buffer_read), n);
+								VAL_SERIES(temp) = bin_new;
+								VAL_INDEX(temp) = 0;
+								if (cmd == SYM_BYTES) {
+									VAL_SET(temp, REB_BINARY);
+								}
+								else {
+									VAL_SET(temp, REB_STRING);
+									VAL_TAIL(temp) = strnlen(VAL_BIN(temp), n);
+								}
+							}
+							else {// octal number
+								u = 0;
+								i = 0;
+								while ((i < n) && cp[i]) {
+									u = (u << 3) | (u64)(cp[i++] - '0');
+								}
+								SET_INTEGER(temp, u);
+							}
 							break;
 						case SYM_STRING:
 							bp = cp;
@@ -1403,7 +1422,6 @@ static REBCNT EncodedU32_Size(u32 value) {
 							                         + mst->time.minute * 60
 							                         + mst->time.hour * 3600);
 							break;
-							
 						default:
 							Trap1(RE_INVALID_SPEC, value);
 					}

src/tests/units/bincode-test.r3

@@ -351,6 +351,14 @@ is-protected-error?: func[code][
 
 		--assert error? try [binary/write b [msdos-date 15:33:18]] ;<- date required
 
+	--test-- "BinCode - STRING-BYTES (read)"
+		;- used for fixed size strings (used for example in TAR files)
+		--assert ["test" 1]= binary/read #{746573740000000001} [STRING-BYTES 8 UI8]
+
+	--test-- "BinCode - OCTAL-BYTES (read)"
+		;- used for fixed size octal numbers (used for example in TAR files)
+		--assert 8 = binary/read/with #{3130} 'OCTAL-BYTES 2
+
 ===end-group===