me
/
guix
Archived
1
0
Fork 0
Code

cpio: Properly handle Unicode characters in file names. 

Fixes <https://issues.guix.gnu.org/61722>.

* guix/cpio.scm (file->cpio-header): Compute the file name length in bytes rather than in
characters.
(file->cpio-header*, special-file->cpio-header*): Likewise.
(write-cpio-archive): Likewise, and write the file name as UTF-8 bytes, not
textually, to avoid encoding it as ISO-8859-1.
Maxim Cournoyer 2023-02-23 23:37:32 -05:00
parent bbc10628b6
commit 61f691fdfb
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/cpio.scm
View File

@ -170,7 +170,7 @@ using FILE-NAME as its file name."
#:size (stat:size st) #:size (stat:size st)
#:dev (stat:dev st) #:dev (stat:dev st)
#:rdev (stat:rdev st) #:rdev (stat:rdev st)
#:name-size (string-length file-name)))) #:name-size (string-utf8-length file-name))))
(define* (file->cpio-header* file (define* (file->cpio-header* file
#:optional (file-name file) #:optional (file-name file)
@ -182,7 +182,7 @@ produced in a deterministic fashion."
(make-cpio-header #:mode (stat:mode st) (make-cpio-header #:mode (stat:mode st)
#:nlink (stat:nlink st) #:nlink (stat:nlink st)
#:size (stat:size st) #:size (stat:size st)
#:name-size (string-length file-name)))) #:name-size (string-utf8-length file-name))))
(define* (special-file->cpio-header* file (define* (special-file->cpio-header* file
device-type device-type
@ -201,7 +201,7 @@ The number of hard links is assumed to be 1."
permission-bits) permission-bits)
#:nlink 1 #:nlink 1
#:rdev (device-number device-major device-minor) #:rdev (device-number device-major device-minor)
#:name-size (string-length file-name))) #:name-size (string-utf8-length file-name)))
(define %trailer (define %trailer
"TRAILER!!!") "TRAILER!!!")
@ -237,7 +237,7 @@ produces with the '-H newc' option."
;; We're padding the header + following file name + trailing zero, and ;; We're padding the header + following file name + trailing zero, and
;; the header is 110 byte long. ;; the header is 110 byte long.
(write-padding (+ 110 1 (string-length file)) port) (write-padding (+ 110 (string-utf8-length file) 1) port)
(case (mode->type (cpio-header-mode header)) (case (mode->type (cpio-header-mode header))
((regular) ((regular)
@ -246,7 +246,7 @@ produces with the '-H newc' option."
(dump-port input port)))) (dump-port input port))))
((symlink) ((symlink)
(let ((target (readlink file))) (let ((target (readlink file)))
(put-string port target))) (put-bytevector port (string->utf8 target))))
((directory) ((directory)
#t) #t)
((block-special) ((block-special)