diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-07-04 04:26:01 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-07-04 04:35:35 +0200 |
| commit | f7e14782025bf87aaef694a21f34010b1a95f7f6 (patch) | |
| tree | 7b147bf974e3e0d811fc950b0b1d7a2b4dc3e8b6 /guix/cpio.scm | |
| parent | 7cde70c7f88e1b283bb61d8a35c5ceeafb39884e (diff) | |
| download | guix-f7e14782025bf87aaef694a21f34010b1a95f7f6.tar guix-f7e14782025bf87aaef694a21f34010b1a95f7f6.tar.gz | |
cpio: Fix device number calculation.
“dev_t in glibc is a 64-bit quantity, with 32-bit major and minor
numbers.” — glibc's <bits/sysmacros.h>
The "tests/cpio.scm" was failing because (guix cpio) treated it as a
16-bit quantity instead, leading to header mismatches with the GNU cpio
reference output.
* guix/cpio.scm (device-number, device->major+minor): Use all the bits.
Diffstat (limited to 'guix/cpio.scm')
| -rw-r--r-- | guix/cpio.scm | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/guix/cpio.scm b/guix/cpio.scm index c9932f5bf9..8038a11f3c 100644 --- a/guix/cpio.scm +++ b/guix/cpio.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -153,15 +154,20 @@ denotes, similar to 'stat:type'." (else (error "unsupported file type" mode))))) -(define (device-number major minor) ;see <sys/sysmacros.h> +(define (device-number major minor) ; see glibc's <sys/sysmacros.h> "Return the device number for the device with MAJOR and MINOR, for use as the last argument of `mknod'." - (+ (* major 256) minor)) + (logior (ash (logand #x00000fff major) 8) + (ash (logand #xfffff000 major) 32) + (logand #x000000ff minor) + (ash (logand #xffffff00 minor) 12))) -(define (device->major+minor device) +(define (device->major+minor device) ; see glibc's <sys/sysmacros.h> "Return two values: the major and minor device numbers that make up DEVICE." - (values (ash device -8) - (logand device #xff))) + (values (logior (ash (logand #x00000000000fff00 device) -8) + (ash (logand #xfffff00000000000 device) -32)) + (logior (logand #x00000000000000ff device) + (ash (logand #x00000ffffff00000 device) -12)))) (define* (file->cpio-header file #:optional (file-name file) #:key (stat lstat)) |