use bi, call >string on c-strings from tar

diff --git a/extra/crypto/hmac/hmac.factor b/extra/crypto/hmac/hmac.factor
index 6e6229f18243dcc4ca9bb100ca473f422d7e1cb5..9a668aa23a096e4ddb244825c0fef5ff80d482c7 100755 (executable)
--- a/extra/crypto/hmac/hmac.factor
+++ b/extra/crypto/hmac/hmac.factor
@@ -31,8 +31,8 @@ MEMO: opad ( -- seq ) 64 HEX: 5c <array> ;
 
 : init-hmac ( K -- o i )
     64 0 pad-tail 
-    [ opad seq-bitxor ] keep
-    ipad seq-bitxor ;
+    [ opad seq-bitxor ]
+    [ ipad seq-bitxor ] bi ;
 
 PRIVATE>
 

diff --git a/extra/tar/tar.factor b/extra/tar/tar.factor
index e28187125231155aefe93ff6f5fa1dab95207f85..93554c146ac1f586e515fd1ff9697231df909096 100755 (executable)
--- a/extra/tar/tar.factor
+++ b/extra/tar/tar.factor
@@ -18,7 +18,7 @@ ERROR: checksum-error header ;
 : trim-string ( seq -- newseq ) [ "\0 " member? ] trim ;
 
 : read-c-string ( n -- str/f )
-    read [ zero? ] trim-tail [ f ] when-empty ;
+    read [ zero? ] trim-tail [ f ] when-empty >string ;
 
 : read-tar-header ( -- obj )
     \ tar-header new