1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00

serialization: Do not require ‘bytevector-slice’.

Commit 40c24a92af make (guix serialization)
reliant on ‘bytevector-slice’ from Guile 3.0.9.  However, when pulling from an
old Guix, such as 1.4.0, which runs on 3.0.8, ‘bytevector-slice’ is
unavailable.  This commit addresses that.

* guix/serialization.scm (sub-bytevector): Reintroduce.
(read-byte-string): Use it.

Fixes: guix/guix#5978
Reported-by: Zelphir Kaltstahl <zelphirkaltstahl@posteo.de>
Change-Id: I9d0b3b52cd1ec5346780fdb2306c352117cb33e8
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merges: #5991
This commit is contained in:
Ludovic Courtès
2026-01-28 15:03:34 +01:00
parent 1a2ea60946
commit cf81cfadbd

View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012-2021, 2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012-2021, 2025, 2026 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -20,7 +20,6 @@
#:autoload (guix base16) (base16-string->bytevector
bytevector->base16-string)
#:use-module (rnrs bytevectors)
#:autoload (rnrs bytevectors gnu) (bytevector-slice)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-9)
#:use-module (srfi srfi-26)
@@ -30,6 +29,7 @@
#:use-module ((ice-9 rdelim) #:prefix rdelim:)
#:use-module (ice-9 match)
#:use-module (ice-9 ftw)
#:autoload (system foreign) (pointer->bytevector bytevector->pointer)
#:export (write-value
read-value
write-bytevector
@@ -106,6 +106,28 @@
(port port)))))
bv))
(define sub-bytevector
;; 'bytevector-slice' was added in Guile 3.0.9, but this code might be
;; running on older versions of Guile when running 'guix pull' from 1.4.0
;; for instance.
(match (and=> (false-if-exception
(resolve-interface '(rnrs bytevectors gnu)))
(lambda (module)
(module-ref module 'bytevector-slice)))
(#f
(lambda (bv len)
"Return a bytevector that aliases the first LEN bytes of BV."
(define max (bytevector-length bv))
(cond ((= len max) bv)
((< len max)
;; Yes, this is safe because the result of each conversion procedure
;; has its life cycle synchronized with that of its argument.
(pointer->bytevector (bytevector->pointer bv) len))
(else
(error "sub-bytevector called to get a super bytevector")))))
(slice
(cut slice <> 0 <>))))
(define (write-int n p)
(let ((b (make-bytevector 8 0)))
(bytevector-u32-set! b 0 n (endianness little))
@@ -153,7 +175,7 @@
(m (modulo len 8))
(pad (if (zero? m) 0 (- 8 m)))
(bv (get-bytevector-n* p (+ len pad))))
(bytevector-slice bv 0 len)))
(sub-bytevector bv len)))
(define (read-string p)
(utf8->string (read-byte-string p)))