emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/cpio-mode f4a1a89 44/61: Version 0.08


From: Stefan Monnier
Subject: [elpa] externals/cpio-mode f4a1a89 44/61: Version 0.08
Date: Fri, 11 Jan 2019 15:25:31 -0500 (EST)

branch: externals/cpio-mode
commit f4a1a89fbccb79a8cdac5d9927542ff3b3ea89c6
Author: dlewan <address@hidden>
Commit: GitHub <address@hidden>

    Version 0.08
    
    Binary format.
---
 QUESTIONS              |    4 +-
 README                 |   40 +-
 configure.ac           |    4 +-
 cpio-bin.el            |  488 +++++-
 cpio-dired-crc-test.el | 3900 +++++++++++++++++++++++++-----------------------
 cpio-dired-odc-test.el |  297 ++--
 cpio-dired-test.el     | 3748 +++++++++++++++++++++++-----------------------
 cpio-newc.el           |    9 +-
 cpio.el                |   25 +-
 9 files changed, 4609 insertions(+), 3906 deletions(-)

diff --git a/QUESTIONS b/QUESTIONS
index 315c929..51359e5 100644
--- a/QUESTIONS
+++ b/QUESTIONS
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#      $Id: QUESTIONS,v 1.2 2018/05/12 16:35:59 doug Exp $     
+#      $Id: QUESTIONS,v 1.3 2018/06/09 05:48:04 doug Exp $     
 
 cpio(1) related questions:
 • cpio(1) accepts block size on its command line.
@@ -21,6 +21,8 @@ cpio(1) related questions:
   after an affirmative response to a prompt.
   From lisp code, however, it will over-write any files.
   Is that the right way to operate?
+• How should I handle (1) contiguous data files, (2) doors (on Solaris)
+  and (3) migrated files (Cray)?
 
 Dired related questions:
 • I only use Linux and other UNIX flavored operating systems.
diff --git a/README b/README
index a708381..2582b34 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 # -*- mode: org; encoding: utf-8 -*-
-#      $Id: README,v 1.4 2018/05/12 16:35:59 doug Exp $        
+#      $Id: README,v 1.5 2018/06/04 18:50:14 doug Exp $        
 
 
 * Intent
@@ -30,8 +30,8 @@ To add a new archive type a devloper should be able to do so
 merely by being able to parse an entry and
 write a parsed entry back to a file.
  
-Right now (2017 Dec 10), the cpio-mode package supports the above
-for the "newc" format of cpio archives.
+Right now (2018 May 21), the cpio-mode package supports the above
+for the newc, crc and odc formats of cpio archives.
 However, the internal structure of cpio-mode implements
 all of the manipulation code in terms of parsed headers
 (which look much like inodes), so adding new formats should be
@@ -39,6 +39,16 @@ relatively easy.
 See the documentation in cpio.el
 for a slightly more detailed description of this structure.
 
+You should be able to add a new format if
+1. it has entry headers that have an inode-like format;
+2. the end of a [padded] entry header is the start of the entry contents.
+
+If you need to extend the inode-like format (for example the crc format),
+then you can simply add the extensions to the attributes
+of the entries in the catalog.
+This will likely require updating the various build-catalog functions
+and the make-header-string functions.
+
 * Other code
 
 Some more generic code is delivered with cpio-mode.
@@ -102,13 +112,29 @@ cab-test.el provides basic testing of 
cpio-affiliated-buffers.el.
 cpio-newc-test.el provides basic testing of some of the function
 implemented in cpio-newc.el.
 
-cpio-dired-test.el provides basic testing of some dired-like functions.
-This testing typically takes the form
+The following files contain tests that exercise cpio function
+through the dired-style interface.
+    * cpio-dired-test.el -- tests of the newc format.
+    * cpio-dired-crc-test.el
+    * cpio-dired-odc-test.el
+
+The general form of a check is the following:
     1. Do something.
     2. Compare the dired-style buffers.
     3. Compare the archive buffers.
+    4. Compare the catalogs.
 Occasionally, there are other things, like checking for modification,
 or visibility of a window.
 Some tests use a "large" cpio archive (one with 26·5 = 130 entries).
-Those are not fast, so be patient if you're going to run these.
-
+Those are not fast, so be patient if you're going to run them.
+
+All dired tests are based on cpio-dired-test.el and,
+yes, there's duplicated code.
+Some of this should be cleaned up once development seems stable.
+
+* Cruft
+There's a fair amount of cruft in the code at the moment.
+If I've done my job correctly, it is at least separate
+from the main body of code (like on a different page).
+Some is tools that have been built to help with development;
+some is just hacks.
diff --git a/configure.ac b/configure.ac
index 4b43f3f..b44a928 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-dnl    $Id: configure.ac,v 1.6 2018/06/03 14:01:54 doug Exp $  
+dnl    $Id: configure.ac,v 1.7 2018/06/09 05:51:07 doug Exp $  
 
 # 
 # Copyright © 2015, 2017, 2018 Douglas Lewan, address@hidden
@@ -20,7 +20,7 @@ dnl   $Id: configure.ac,v 1.6 2018/06/03 14:01:54 doug Exp $
 # 
 
 dnl Autoconf requirements
-AC_INIT(cpio-mode, 0.07, address@hidden)
+AC_INIT(cpio-mode, 0.08, address@hidden)
 AC_PREFIX_DEFAULT(${HOME}/local)
 dnl information on the package
 dnl checks for programs
diff --git a/cpio-bin.el b/cpio-bin.el
index 4fa5a5c..992657f 100644
--- a/cpio-bin.el
+++ b/cpio-bin.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cpio-bin.el --- handle bin cpio entry header formats
-;      $Id: cpio-bin.el,v 1.4 2018/05/12 16:36:00 doug Exp $   
+;      $Id: cpio-bin.el,v 1.5 2018/06/09 05:20:11 doug Exp $   
 
 ;; COPYRIGHT
 ;; 
@@ -36,17 +36,501 @@
 ;;
 ;; Dependencies
 ;; 
-
+(require 'bindat)
 
 ;; 
 ;; Vars
 ;; 
 
+;; \307q\0\375c\9\244\201\350\3\350\3\1\0\0\0\377Z\320q\2\0\0\0\4\0a\0
+;; \307q \0\375 c\9 \244\201 \350\3 \350\3 \1\0 \0\0 \377Z\320q \2\0 \0\0\4\0 
a\0
+(defconst *cpio-bin-magic-re* "\307q" ; 070707 \307q
+  "RE to match the magic number of a bin archive.")
+(setq *cpio-bin-magic-re* "\307q")
+
+(defconst *cpio-bin-dev-re* "\\w\\w"
+  "RE to match the c_dev field in a bin header.")
+(setq *cpio-bin-dev-re* "\\w\\w")
+
+(defconst *cpio-bin-ino-re* "\\w\\w"
+  "RE to match the c_ino field in a bin header.")
+(setq *cpio-bin-ino-re* "\\w\\w")
+
+(defconst *cpio-bin-mode-re* "\\w\\w"
+  "RE to match the c_mode field in a bin header.")
+(setq *cpio-bin-mode-re* "\\w\\w")
+
+(defconst *cpio-bin-uid-re* "\\w\\w"
+  "RE to match the c_uid field in a bin header.")
+(setq *cpio-bin-uid-re* "\\w\\w")
+
+(defconst *cpio-bin-gid-re* "\\w\\w"
+  "RE to match the c_gid field in a bin header.")
+(setq *cpio-bin-gid-re* "\\w\\w")
+
+(defconst *cpio-bin-nlink-re* "\\w\\w"
+  "RE to match the c_nlink field in a bin header.")
+(setq *cpio-bin-nlink-re* "\\w\\w")
+
+(defconst *cpio-bin-rdev-re* "\\w\\w"
+  "RE to match the c_rdev field in a bin header.")
+(setq *cpio-bin-rdev-re* "\\w\\w")
+
+(defconst *cpio-bin-mtime-re* "\\w\\w\\w\\w"
+  "RE to match the c_mtime field in a bin header.")
+(setq *cpio-bin-mtime-re* "\\w\\w\\w\\w")
+
+(defconst *cpio-bin-namesize-re* "\\w\\w"
+  "RE to match the c_rdev field in a bin header.")
+(setq *cpio-bin-rdev-re* "\\w\\w")
+
+(defconst *cpio-bin-filesize-re* "\\w\\w\\w\\w"
+  "RE to match the c_filesize field in a bin header.")
+(setq *cpio-bin-filesize-re* "\\w\\w\\w\\w")
+
+(defconst *cpio-bin-filename-re* ()
+  "RE to match a filename in a bin header.")
+(setq *cpio-bin-filename-re* "[[:print:]]+")
+
+(defconst *cpio-bin-header-re* ()
+  "RE to match bin header format cpio archives.")
+(setq *cpio-bin-header-re* (concat "\\(" *cpio-bin-magic-re*    "\\)"
+                                  "\\(" *cpio-bin-dev-re*      "\\)"
+                                  "\\(" *cpio-bin-ino-re*      "\\)"
+                                  "\\(" *cpio-bin-mode-re*     "\\)"
+                                  "\\(" *cpio-bin-uid-re*      "\\)"
+                                  "\\(" *cpio-bin-gid-re*      "\\)"
+                                  "\\(" *cpio-bin-nlink-re*    "\\)"
+                                  "\\(" *cpio-bin-rdev-re*     "\\)"
+                                  "\\(" *cpio-bin-mtime-re*    "\\)"
+                                  "\\(" *cpio-bin-namesize-re* "\\)"
+                                  "\\(" *cpio-bin-filesize-re* "\\)"
+                                  "\\(" *cpio-bin-filename-re* "\\)"
+                                  "\0"))
+
+(defvar  *cpio-bin-name-field-offset* (length 
"\307q\0\375z\r\244\201\350\350\0\0\0[\211\255\0\0\0\0")
+  "The offset of the name field in a cpio binary header.")
+
+(defconst cpio-bin-index-spec
+  '(;; (:magic u16)
+    (:dev      u16)
+    (:ino      u16)    
+    (:mode     u16)
+    (:uid      u16)
+    (:gid      u16)
+    (:nlink    u16)
+    (:rdev     u16)
+    (:mtime    u32)
+    (:namesize u16)
+    (:filesize u32)
+    (:filename strz (:namesize))))
+(setq cpio-bin-index-spec 
+  '((:magic    u16r)
+    (:dev      u16r)
+    (:ino      u16r)   
+    (:mode     u16r)
+    (:uid      u16r)
+    (:gid      u16r)
+    (:nlink    u16r)
+    (:rdev     u16r)
+    (:mtime0   u16r)
+    (:mtime1   u16r)
+    (:namesize u16r)
+    (:filesize0        u16r)
+    (:filesize1        u16r)
+    (:filename strz (:namesize))))
+
+(defconst *cpio-bin-magic* *cpio-bin-magic-re*
+  "The string that identifies an entry as a BIN style cpio(1) entry.")
+(setq *cpio-bin-magic* *cpio-bin-magic-re*)
+
+(defconst *cpio-bin-magic-int* #o070707
+  "An integer value of the cpio bin magic number.")
+
+(defconst *cpio-bin-padding-modulus* 2
+  "The modulus to which some things are padded in a BIN cpio archive.")
+(setq *cpio-bin-padding-modulus* 2)
+
+(defconst *cpio-bin-padding-char* ?\0
+  "A character to be used for padding headers and entry contents
+in a bin cpio archive.")
+(setq *cpio-bin-padding-char* ?\0)
+
+(defconst *cpio-bin-padding-str* "\0"
+  "A single character string of the character
+to be used for padding headers and entry contents
+in a bin cpio archive.")
+(setq *cpio-bin-padding-str* "\0")
+
+(defconst *cpio-bin-trailer* (string-as-unibyte 
"\307q\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0TRAILER!!!\0\0")
+  "The TRAILER string of a cpio binary archive.")
+  
+(defcustom *cpio-bin-blocksize* 512
+  "The default blocksize for a cpio binary archive.")
+
 
 ;; 
 ;; Library
 ;; 
 
+(defun cpio-bin-header-at-point (&optional where)
+  "Return the header string at or following point WHERE.
+If WHERE is not given, then use point.
+CAVEATS:
+1. This searches for the magic number at the begining of the header;
+   if WHERE is inside the magic number, then the search will fail.
+   This works best if you are (looking-at) a header.
+2. This returns the pure header;
+   it does not provide the filename itself."
+  (unless where (setq where (point)))
+  (let ((fname "cpio-bin-header-at-point")
+       (found nil))
+    (save-match-data
+      (cond ((looking-at *cpio-bin-header-re*)
+            (string-as-unibyte (match-string-no-properties 0)))
+           (t
+            (forward-char (length *cpio-bin-magic-re*))
+            (while (and (re-search-backward *cpio-bin-magic-re* (point-min) t)
+                        (not (setq found (looking-at *cpio-bin-header-re*)))))
+            (if found 
+                (string-as-unibyte (match-string-no-properties 0))))))))
+
+(defun cpio-bin-parse-header (header-string)
+  "Return the internal entry header structure encoded in HEADER-STRING.
+HEADER-STRING is a unibyte string.
+The function does NOT get the contents of that entry."
+  (let ((fname "cpio-bin-parse-header")
+       (header-info)
+       (mtime)
+       (filesize)
+       (result)
+       (entry-name)
+       )
+    ;; (error "%s() is not yet implemented" fname)
+    (setq header-info (bindat-unpack cpio-bin-index-spec
+                                    header-string))
+    (setq mtime (list (bindat-get-field header-info :mtime0)
+                     (bindat-get-field header-info :mtime1)))
+    ;; (current-time-string mtime)
+    (setq filesize (+ (* 256 256 (bindat-get-field header-info :filesize0))
+                     (bindat-get-field header-info :filesize1)))
+    (cond ((string-equal (setq entry-name (bindat-get-field header-info 
:filename))
+                        "TRAILER!!!")
+          nil)
+         (t
+          (setq result
+                (vector (bindat-get-field header-info :ino)
+                        (bindat-get-field header-info :mode)
+                        (bindat-get-field header-info :uid)
+                        (bindat-get-field header-info :gid)
+                        
+                        (bindat-get-field header-info :nlink)
+                        mtime
+                        filesize
+                        (bindat-get-field header-info :dev)
+                        
+                        0                              ;dev min
+                        (bindat-get-field header-info :rdev)
+                        0                              ;rdev min
+                        (bindat-get-field header-info :namesize)
+                        
+                        0                              ;checksum
+                   entry-name))
+          (if (cpio-entry-name result)
+              result
+            nil)))
+    ))
+
+(defun cpio-bin-header-size (header-string namesize)
+  "Determine the length of the header implied by the given HEADER-STRING."
+  (let ((fname "cpio-bin-header-size")
+       ;; CAUTION: The following assumes that (string-to-number) doesn't care 
about leading zeroes.
+       ;; The namesize in the header includes the terminating NULL at the end 
of the name.
+       (local-namesize (1- namesize))
+       (total -1))
+    (if (= 0 (mod (setq total (+ 1 *cpio-bin-name-field-offset* 
local-namesize)) 
+                 *cpio-bin-padding-modulus*))
+       (setq total (1+ total)))
+    (round-up total *cpio-bin-padding-modulus*)))
+
+;;;;;;;;;;;;;;;;
+;; 
+;; Header construction
+;; 
+
+(defun cpio-bin-make-header-string (attrs &optional contents)
+  "Make a BIN style padded cpio header for the given ATTRibuteS.
+This function does NOT include the contents."
+  (let ((fname "cpio-bin-make-header-string")
+       (name (cpio-entry-name attrs))
+       (header-string)
+       (padding)
+       (mtime (cpio-bin-make-mtime attrs))
+       (filesize (cpio-bin-make-filesize attrs)))
+    (setq header-string 
+         (bindat-pack cpio-bin-index-spec
+                      (list
+                       (cons :magic     (cpio-bin-make-magic    attrs))
+                       (cons :dev       (cpio-bin-make-dev-maj  attrs))
+                       (cons :ino       (cpio-bin-make-ino      attrs))
+                       (cons :mode      (cpio-bin-make-mode     attrs))
+                       (cons :uid       (cpio-bin-make-uid      attrs))
+                       (cons :gid       (cpio-bin-make-gid      attrs))
+                       (cons :nlink     (cpio-bin-make-nlink    attrs))
+                       (cons :rdev      (cpio-bin-make-rdev-maj attrs))
+                       (cons :mtime0    (car  mtime))
+                       (cons :mtime1    (cdr  mtime))
+                       (cons :namesize  (1+ (length name)))
+                       (cons :filesize0 (car  filesize))
+                       (cons :filesize1 (cdr  filesize))
+                       (cons :filename  (concat name "\0")))))
+    (setq header-string (pad-right header-string (round-up (length 
header-string)
+                                                          
*cpio-bin-padding-modulus*)
+                                  "\0"))
+    ;; (setq header-string (pad-right header-string (round-up (length 
header-string) *cpio-bin-padding-modulus*) "\0"))
+    ;; Check (at least during development).
+    ;; (if (string-match-p *cpio-bin-header-re* header-string)
+    ;; header-string
+    ;; (error "%s(): I built a bad header: [[%s]]" fname header-string))))
+    ))
+
+
+(defun cpio-bin-make-magic (attrs)
+  "Return the BIN magic header string"
+  (let ((fname "cpio-bin-make-magic"))
+    *cpio-bin-magic-int*))
+
+(defun cpio-bin-make-ino (attrs)
+  "Return a string value for the inode from the file attributes ATTRS."
+  (let ((fname "cpio-bin-make-ino"))
+    (cpio-ino attrs)))
+
+(defun cpio-bin-BIG-inode-to-string (ino)
+  "Convert the BIG inode format (HIGH MIDDLE . LOW) to a printable integer.
+Since we're writing a BIN CPIO header it must be < 8 digits.
+N.B. On my 64 bit machine most-positive-fixnum is 2305843009213693951.
+I likely won't need this, but someone might."
+  ;; There's a contract here that INO is a triple of integers.
+  (let ((fname "cpio-bin-BIG-inode-to-string"))
+    (hex-format-triple ino)))
+
+(defun cpio-bin-big-inode-to-string (ino)
+  "Convert the big inode format (HIGH . LOW) to a printable integer.
+Since we're writing a BIN CPIO header it must be < 8 digits.
+N.B. On my 64 bit machine most-positive-fixnum is 2305843009213693951.
+I likely won't need this, but someone might."
+  (let ((fname "cpio-bin-big-inode-to-string"))
+    (error "%s() is not yet implemented." fname)
+    (hex-digit-count (integer-hex-digits))))
+
+(defun cpio-bin-make-mode (attrs)
+  "Return a string value for the mode from the file attributes ATTRS."
+  (let ((fname "cpio-bin-make-mode"))
+    ;; (error "%s() is not yet implemented." fname)
+    (cpio-mode-value attrs)))
+
+(defun cpio-bin-make-uid (attrs)
+  "Return an integer string value for the UID from the file attributes ATTRS."
+  (let ((fname "cpio-bin-make-uid"))
+    ;; (error "%s() is not yet implemented." fname)
+    (cpio-uid attrs)))
+
+(defun cpio-bin-make-gid (attrs)
+  "Return an integer string value for the GID from the file attributes ATTRS."
+  (let ((fname "cpio-bin-make-gid"))
+    ;; (error "%s() is not yet implemented." fname)
+    (cpio-gid attrs)))
+
+(defun cpio-bin-make-nlink (attrs)
+  "Return an integer string value for the number of links from the file 
attributes ATTRS."
+  (let ((fname "cpio-bin-make-nlink"))
+    ;; (error "%s() is not yet implemented." fname)
+    (cpio-nlink attrs)))
+
+(defun cpio-bin-make-mtime (attrs)
+  "Return a string value for the mod time from the file attributes ATTRS."
+  (let* ((fname "cpio-bin-make-mtime")
+        (mod-time (cpio-mtime attrs))
+        (high-time (car mod-time))
+        (low-time (cadr mod-time))
+        )
+    ;;(error "%s() is not yet implemented." fname)
+    (cons high-time low-time)))
+
+(defun cpio-bin-make-filesize (attrs)
+  "Return an 8 digit hex string for the filesize attribute among the given 
ATTRs."
+  (let ((fname "cpio-bin-make-filesize")
+       (filesize (cpio-entry-size attrs))
+       )
+    ;; (error "%s() is not yet implemented." fname)
+    (cons (lsh (logand #xFFFF0000 filesize) 8)
+              (logand #xFFFF filesize))))
+
+(defun cpio-bin-make-dev-maj (attrs)
+  "Return a string value for the WWWW from the file attributes ATTRS."
+  (let ((fname "cpio-bin-make-dev-maj"))
+    ;; (error "%s() is not yet implemented." fname)
+    (cpio-dev-maj attrs)))
+
+(defun cpio-bin-make-dev-min (attrs)
+  "Return a string value for the WWWW from the file attributes ATTRS."
+  (let ((fname "cpio-bin-make-dev-min"))
+    0))
+
+(defun cpio-bin-make-rdev-maj (attrs)
+  "Return a string value for the WWWW from the file attributes ATTRS."
+  (let ((fname "cpio-bin-make-rdev-maj"))
+    ;; (error "%s() is not yet implemented." fname)
+    (cpio-rdev-maj attrs)))
+
+(defun cpio-bin-make-rdev-min (attrs)
+  "Return a string value for the WWWW from the file attributes ATTRS."
+  (let ((fname "cpio-bin-make-rdev-min"))
+    0))
+
+(defun cpio-bin-make-chksum (attrs)
+  "Return a string value for the bin cpio entry from the file attributes 
ATTRS."
+  (let ((fname "cpio-bin-make-chksum"))
+    0))
+
+;; Filename is not one of ATTRS. ∴ It doesn't get a constructor here.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 
+;; Functions for whole entries
+;; 
+(defun cpio-bin-parse-header-at-point ()
+  "Parse the bin cpio header that begins at point.
+If there is no header there, then signal an error."
+  (let ((fname "cpio-bin-parse-header-at-point"))
+    (unless (looking-at-p *cpio-bin-header-re*) (error "%s(): point is not 
looking at a bin header."))
+    (cpio-bin-parse-header (string-as-unibyte (match-string-no-properties 
0)))))
+
+(defun cpio-bin-goto-next-header ()
+  "Move the point to the beginning of the next bin cpio header.
+If point is looking-at such a header, then that is the next one
+and there is no movement.
+\(Thus, a caller may have to make sure that point has moved.\)
+This returns the a marker for point where the header is found, if one is found.
+It returns NIL otherwise.
+This sets match-data for the entire header and each field."
+  (let ((fname "cpio-bin-goto-next-header")
+       (header-start)
+       (header-string))
+    (cond ((re-search-forward *cpio-bin-header-re* (point-max) t)
+          (setq header-start (goto-char (match-beginning 0)))
+          (setq header-string (match-string-no-properties 0))
+          (cons (point-marker) header-string))
+         (t nil))))
+
+(defun cpio-bin-build-catalog ()
+  "Build an internal structure reflecting the contents of the bin cpio archive 
in the current buffer.
+See the variable *cpio-catalog* for more information.
+CAVEAT: This respects neither narrowing nor the point."
+  (let ((fname "cpio-bin-build-catalog")
+       (header-start)                  ;A marker.
+       (header-end)
+       (that-header-string)
+       (header-info ())
+       (parsed-header t)
+       (filesize)                      ;A marker.
+       (contents-start)
+       (contents-end)                  ;NOT NEEDED?
+       (those-contents)                ;
+       (catalog ()))
+    (widen)
+    (goto-char (point-min))
+    (while (and (setq header-info (cpio-bin-goto-next-header))
+               (setq header-start (car header-info))
+               (setq that-header-string (cdr header-info))
+               parsed-header)
+      (cond ((setq parsed-header (cpio-bin-parse-header-at-point))
+            (setq filesize (cpio-entry-size parsed-header))
+            (forward-char (length that-header-string))
+            (setq header-end (point))
+            ;; A little bit of arithmétic gymnastics here
+            ;; because cpio, being written in C, starts counting at 0, but
+            ;; emacs' points start at 1.
+            (goto-char (1+ (round-up (1- header-end) 
*cpio-bin-padding-modulus*)))
+            (setq contents-start (point-marker))
+            (set-marker-insertion-type contents-start *insert-after*)
+            ;; It feels like I really want a function for getting the contents.
+            ;; But it's not obvious what is simpler or appropriately more 
general
+            ;; than this one-liner.
+            ;; Indeed. (setq those-contents (buffer-substring-no-properties 
contents-start contents-end))
+            (push (cons  (cpio-entry-name parsed-header)
+                         (vector
+                          parsed-header
+                          header-start
+                          contents-start
+                          'cpio-mode-entry-unmodified))
+                  catalog)
+            (setq contents-end (+ contents-start filesize -1))
+            (goto-char contents-end))
+           (t t)))
+    (nreverse catalog)))
+
+(defun cpio-bin-start-of-trailer ()
+  "Return the character position of the (ostensible) start of the trailer
+for the current cpio archive."
+  (let ((fname "cpio-bin-start-of-trailer")
+       (end-of-contents 0))
+    (mapc (lambda (ce)
+           (let ((attrs (cpio-entry-attrs-from-catalog-entry e)))
+             (setq end-of-contents (+ (cpio-entry-size attrs) 
(cpio-contents-start e)))))
+         *cpio-catalog*)
+    end-of-contents))
+
+(defun cpio-bin-end-of-archive ()
+  "Calculate the location of the end of the current archive
+once the TRAILER is written and padded."
+  (let ((fname "cpio-bin-end-of-archive")
+       (end-of-contents (cpio-bin-start-of-trailer)))
+    (round-up (+ end-of-contents (length *cpio-bin-trailer*)) 512)))
+
+(defun cpio-bin-adjust-trailer ()
+  "Replace thed current trailer in the current cpio bin archive."
+  (let* ((fname "cpio-bin-adjust-trailer"))
+    (cpio-bin-delete-trailer)
+    (cpio-bin-insert-trailer)))
+
+(defun cpio-bin-insert-trailer ()
+  "Insert a bin trailer into a cpio archive."
+  (let* ((fname "cpio-bin-insert-trailer")
+        (base-trailer *cpio-bin-trailer*)
+        (base-len (length base-trailer))
+        (len))
+    ;; ...and insert the new trailer...
+    (setq buffer-read-only nil)
+    (insert base-trailer)
+    (goto-char (point-max))
+    ;; ...with padding.
+    (setq len (round-up (1- (point)) *cpio-bin-blocksize*))
+    (setq len (1+ (- len (point))))
+    (insert (make-string len ?\0))
+    (setq buffer-read-only t)))
+
+(defun cpio-bin-delete-trailer ()
+  "Delete the trailer in the current cpio bin archive."
+  (let ((fname "cpio-bin-delete-trailer"))
+    (unless (eq major-mode 'cpio-mode)
+      (error "%s(): Called outside of a cpio archive buffer." fname))
+    ;; First, get to the end of the last entry in the archive.
+    (goto-char (point-min))
+    (mapc (lambda (e)
+           (let* ((ename (car e))      ;Isn't there a generic function for 
this?
+                  (attrs (cpio-entry-attrs ename))
+                  ;; Fencepost issue here.
+                  (entry-end (+ (cpio-contents-start ename)
+                                (cpio-entry-size attrs))))
+             (goto-char entry-end)
+             (skip-chars-forward "\0")))
+         *cpio-catalog*)
+    ;; Next, delete what's left...
+    (setq buffer-read-only nil)
+    (delete-region (point) (point-max))
+    (setq buffer-read-only t)))
+
 
 ;; 
 ;; Commands
diff --git a/cpio-dired-crc-test.el b/cpio-dired-crc-test.el
index 06809ef..8b22636 100644
--- a/cpio-dired-crc-test.el
+++ b/cpio-dired-crc-test.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cpio-dired-crc-test.el --- brief description
-;      $Id: cpio-dired-crc-test.el,v 1.3 2018/06/03 14:01:55 doug Exp $        
+;      $Id: cpio-dired-crc-test.el,v 1.4 2018/06/04 19:21:15 doug Exp $        
 
 ;; COPYRIGHT
 
@@ -760,99 +760,188 @@ TRAILER!!!       (( filename ))
 ")
 
 (defvar *cdmt-crc-untouched-catalog "((\"a\" .
-  [[235538648 33188 1000 1000 1
-             (23281 65535)
-             4 253 0 0 0 2 127 \"a\"]
-   #<marker at 1 in alphabet_small.crc.cpio> #<marker at 113 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538648 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small.crc.cpio> #<marker at 113 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"aa\" .
-  [[235538674 33188 1000 1000 1
-             (23281 65535)
-             5 253 0 0 0 3 224 \"aa\"]
-   #<marker at 117 in alphabet_small.crc.cpio> #<marker at 233 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538674 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small.crc.cpio> #<marker at 233 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" .
-  [[235538688 33188 1000 1000 1
-             (23281 65535)
-             6 253 0 0 0 4 321 \"aaa\"]
-   #<marker at 241 in alphabet_small.crc.cpio> #<marker at 357 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538688 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small.crc.cpio> #<marker at 357 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" .
-  [[235538691 33188 1000 1000 1
-             (23281 65535)
-             7 253 0 0 0 5 418 \"aaaa\"]
-   #<marker at 365 in alphabet_small.crc.cpio> #<marker at 481 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538691 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small.crc.cpio> #<marker at 481 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" .
-  [[235538692 33188 1000 1000 1
-             (23281 65535)
-             8 253 0 0 0 6 515 \"aaaaa\"]
-   #<marker at 489 in alphabet_small.crc.cpio> #<marker at 605 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538692 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small.crc.cpio> #<marker at 605 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa.d\" .
-  [[235538695 16877 1000 1000 2
-             (23268 65535)
-             0 253 0 0 0 8 0 \"aaaaa.d\"]
-   #<marker at 613 in alphabet_small.crc.cpio> #<marker at 733 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538695 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"aaaaa.d\"]
+\\s-+#<marker at 613 in alphabet_small.crc.cpio> #<marker at 733 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"b\" .
-  [[235538693 33188 1000 1000 1
-             (23281 65535)
-             4 253 0 0 0 2 128 \"b\"]
-   #<marker at 733 in alphabet_small.crc.cpio> #<marker at 845 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538693 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small.crc.cpio> #<marker at 845 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"bb\" .
-  [[235538694 33188 1000 1000 1
-             (23281 65535)
-             5 253 0 0 0 3 226 \"bb\"]
-   #<marker at 849 in alphabet_small.crc.cpio> #<marker at 965 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538694 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small.crc.cpio> #<marker at 965 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" .
-  [[235538696 33188 1000 1000 1
-             (23281 65535)
-             6 253 0 0 0 4 324 \"bbb\"]
-   #<marker at 973 in alphabet_small.crc.cpio> #<marker at 1089 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538696 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small.crc.cpio> #<marker at 1089 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" .
-  [[235538697 33188 1000 1000 1
-             (23281 65535)
-             7 253 0 0 0 5 422 \"bbbb\"]
-   #<marker at 1097 in alphabet_small.crc.cpio> #<marker at 1213 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538697 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small.crc.cpio> #<marker at 1213 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" .
-  [[235538698 33188 1000 1000 1
-             (23281 65535)
-             8 253 0 0 0 6 520 \"bbbbb\"]
-   #<marker at 1221 in alphabet_small.crc.cpio> #<marker at 1337 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538698 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small.crc.cpio> #<marker at 1337 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb.d\" .
-  [[235538701 16877 1000 1000 2
-             (23268 65535)
-             0 253 0 0 0 8 0 \"bbbbb.d\"]
-   #<marker at 1345 in alphabet_small.crc.cpio> #<marker at 1465 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538701 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"bbbbb.d\"]
+\\s-+#<marker at 1345 in alphabet_small.crc.cpio> #<marker at 1465 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"c\" .
-  [[235538699 33188 1000 1000 1
-             (23281 65535)
-             4 253 0 0 0 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small.crc.cpio> #<marker at 1577 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538699 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small.crc.cpio> #<marker at 1577 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"cc\" .
-  [[235538700 33188 1000 1000 1
-             (23281 65535)
-             5 253 0 0 0 3 228 \"cc\"]
-   #<marker at 1581 in alphabet_small.crc.cpio> #<marker at 1697 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538700 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small.crc.cpio> #<marker at 1697 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" .
-  [[235538702 33188 1000 1000 1
-             (23281 65535)
-             6 253 0 0 0 4 327 \"ccc\"]
-   #<marker at 1705 in alphabet_small.crc.cpio> #<marker at 1821 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538702 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small.crc.cpio> #<marker at 1821 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" .
-  [[235538703 33188 1000 1000 1
-             (23281 65535)
-             7 253 0 0 0 5 426 \"cccc\"]
-   #<marker at 1829 in alphabet_small.crc.cpio> #<marker at 1945 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538703 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small.crc.cpio> #<marker at 1945 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" .
-  [[235538704 33188 1000 1000 1
-             (23281 65535)
-             8 253 0 0 0 6 525 \"ccccc\"]
-   #<marker at 1953 in alphabet_small.crc.cpio> #<marker at 2069 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538704 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small.crc.cpio> #<marker at 2069 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
  (\"ccccc.d\" .
-  [[235538707 16877 1000 1000 2
-             (23268 65535)
-             0 253 0 0 0 8 0 \"ccccc.d\"]
-   #<marker at 2077 in alphabet_small.crc.cpio> #<marker at 2197 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified]))
+\\s-+[[235538707 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"ccccc.d\"]
+\\s-+#<marker at 2077 in alphabet_small.crc.cpio> #<marker at 2197 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified]))
 "
   "An string representing an untouched catalog.")
-
-
+(setq *cdmt-crc-untouched-catalog "((\"a\" .
+\\s-+[[235538648 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small.crc.cpio> #<marker at 113 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"aa\" .
+\\s-+[[235538674 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small.crc.cpio> #<marker at 233 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"aaa\" .
+\\s-+[[235538688 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small.crc.cpio> #<marker at 357 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"aaaa\" .
+\\s-+[[235538691 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small.crc.cpio> #<marker at 481 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"aaaaa\" .
+\\s-+[[235538692 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small.crc.cpio> #<marker at 605 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"aaaaa.d\" .
+\\s-+[[235538695 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"aaaaa.d\"]
+\\s-+#<marker at 613 in alphabet_small.crc.cpio> #<marker at 733 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"b\" .
+\\s-+[[235538693 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small.crc.cpio> #<marker at 845 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"bb\" .
+\\s-+[[235538694 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small.crc.cpio> #<marker at 965 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"bbb\" .
+\\s-+[[235538696 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small.crc.cpio> #<marker at 1089 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"bbbb\" .
+\\s-+[[235538697 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small.crc.cpio> #<marker at 1213 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"bbbbb\" .
+\\s-+[[235538698 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small.crc.cpio> #<marker at 1337 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"bbbbb.d\" .
+\\s-+[[235538701 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"bbbbb.d\"]
+\\s-+#<marker at 1345 in alphabet_small.crc.cpio> #<marker at 1465 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"c\" .
+\\s-+[[235538699 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small.crc.cpio> #<marker at 1577 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"cc\" .
+\\s-+[[235538700 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small.crc.cpio> #<marker at 1697 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"ccc\" .
+\\s-+[[235538702 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small.crc.cpio> #<marker at 1821 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"cccc\" .
+\\s-+[[235538703 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small.crc.cpio> #<marker at 1945 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"ccccc\" .
+\\s-+[[235538704 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small.crc.cpio> #<marker at 2069 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified])
+ (\"ccccc.d\" .
+\\s-+[[235538707 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"ccccc.d\"]
+\\s-+#<marker at 2077 in alphabet_small.crc.cpio> #<marker at 2197 in 
alphabet_small.crc.cpio> cpio-mode-entry-unmodified]))
+")
 
 (defvar *cdmt-crc-untouched-large-archive-buffer* "070702      (( magic    ))
 DEADBEEF       (( ino      ))
@@ -6520,7 +6609,7 @@ If MAKE is non-nil, then run 'make crc' as part of the 
reset."
                             *cdmt-crc-large-archive*)))
     (cd run-dir)
     (mapc (lambda (an)
-           (setq cpio-archive-buffer (find-file-noselect an nil nil))
+           (setq cpio-archive-buffer (find-file-noselect an 'no-warn))
            (if (and (file-exists-p an)
                     (buffer-live-p (get-buffer cpio-archive-buffer)))
                (with-current-buffer cpio-archive-buffer
@@ -6540,7 +6629,7 @@ If MAKE is non-nil, then run 'make crc' as part of the 
reset."
                         *cdmt-crc-small-archive*))
 
     (delete-other-windows)
-    (with-current-buffer (setq cpio-archive-buffer (find-file-noselect 
archive-name nil nil))
+    (with-current-buffer (setq cpio-archive-buffer (find-file-noselect 
archive-name 'no-warn))
       (if (string-match "/test_data/.+/test_data/" (buffer-file-name))
          (error "Bogus archive!"))
       (cpio-mode))
@@ -7239,91 +7328,92 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
    #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
-" cpio-catalog-contents-after)))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+" cpio-catalog-contents-after))
+
 
     (cdmt-crc-reset)
     
@@ -7370,91 +7460,91 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
    #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccccc\.d\" \.
   \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
              ([[:digit:]]+ [[:digit:]]+)
              0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
    #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
-" cpio-catalog-contents-after)))
+" cpio-catalog-contents-after))
 
     (cdmt-crc-reset)
 
@@ -7497,95 +7587,95 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
 " cpio-dired-buffer-contents)))
     (should (and "Expecting \`...\' to have group 7777."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
     
     (cdmt-crc-test-save)))
@@ -7971,95 +8061,95 @@ TRAILER!!!      (( filename ))
 " cpio-archive-buffer-contents)))
     (should (and "Expecting a mode of 0755 (33261) on the first entry."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -8106,95 +8196,95 @@ TRAILER!!!      (( filename ))
                 "Expecting aaaaa.d to have mode 040600 (16768)."
 
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
        
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -8238,95 +8328,95 @@ TRAILER!!!      (( filename ))
 
     (should (and "Expecting ... to have mode 0100660 (33200)."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -8708,95 +8798,95 @@ TRAILER!!!      (( filename ))
                 "• ... have mode 33200 for files."
                 "                16816 for directories."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 238 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 238 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 363 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 363 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 488 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 488 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 970 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 970 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1095 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1095 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1220 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1220 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1702 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1702 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1827 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1827 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1952 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1952 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-crc-test-save)))
@@ -8852,95 +8942,95 @@ TRAILER!!!      (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "The owner of 'a' should be 9999."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 9999 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 9999 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-crc-reset)
@@ -8990,85 +9080,85 @@ TRAILER!!!      (( filename ))
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
    #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 8888 [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 8888 [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
   \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
              ([[:digit:]]+ [[:digit:]]+)
@@ -9117,95 +9207,95 @@ TRAILER!!!      (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting ... to be owned by 7777."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
     
     (cdmt-crc-test-save)))
@@ -9260,95 +9350,95 @@ TRAILER!!!      (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting entry 'a' to have owner 9999 and group 1111."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 9999 1111 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 9999 1111 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-crc-reset)
@@ -9392,95 +9482,95 @@ TRAILER!!!      (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting 4 entries with owner 8888 and group 2222."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 2222 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 2222 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 2222 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 2222 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 2222 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 2222 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 8888 2222 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 8888 2222 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-crc-reset)
@@ -9524,95 +9614,95 @@ TRAILER!!!      (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting ... to have owner 7777 and group 3333."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 7777 3333 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 3333 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 7777 3333 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 3333 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 7777 3333 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 3333 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-crc-test-save)))
@@ -10007,100 +10097,100 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        
4 \\(?:a\\(?:pr\\|ug\\)\\|de
 " cpio-dired-buffer-contents)))
     (should (and "Expecting to see an entry »d«."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"d\"]
-   #<marker at 2197 in alphabet_small\.crc\.cpio> #<marker at 2309 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"d\"]
+\\s-+#<marker at 2197 in alphabet_small\.crc\.cpio> #<marker at 2309 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-crc-test-save)))
@@ -10594,110 +10684,110 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        
6 \\(?:a\\(?:pr\\|ug\\)\\|de
 " cpio-dired-buffer-contents)))
     (should (and "Expecting to see ... entries in newDirectory-1."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-1/ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 327 
\"newDirectory-1/ccc\"]
-   #<marker at 2197 in alphabet_small\.crc\.cpio> #<marker at 2329 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 327 
\"newDirectory-1/ccc\"]
+\\s-+#<marker at 2197 in alphabet_small\.crc\.cpio> #<marker at 2329 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-1/bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 324 
\"newDirectory-1/bbb\"]
-   #<marker at 2337 in alphabet_small\.crc\.cpio> #<marker at 2469 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 324 
\"newDirectory-1/bbb\"]
+\\s-+#<marker at 2337 in alphabet_small\.crc\.cpio> #<marker at 2469 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-1/aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 321 
\"newDirectory-1/aaa\"]
-   #<marker at 2477 in alphabet_small\.crc\.cpio> #<marker at 2609 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 321 
\"newDirectory-1/aaa\"]
+\\s-+#<marker at 2477 in alphabet_small\.crc\.cpio> #<marker at 2609 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-crc-test-save)))
@@ -11291,155 +11381,155 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        
6 \\(?:a\\(?:pr\\|ug\\)\\|de
 " cpio-dired-buffer-contents)))
     (should (and "Expecting all entries named with at least 3 letters to have 
copies in newDirectory-3."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/ccccc\.d\"]
-   #<marker at 2197 in alphabet_small\.crc\.cpio> #<marker at 2333 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/ccccc\.d\"]
+\\s-+#<marker at 2197 in alphabet_small\.crc\.cpio> #<marker at 2333 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 525 
\"newDirectory-3/ccccc\"]
-   #<marker at 2333 in alphabet_small\.crc\.cpio> #<marker at 2465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 525 
\"newDirectory-3/ccccc\"]
+\\s-+#<marker at 2333 in alphabet_small\.crc\.cpio> #<marker at 2465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 426 
\"newDirectory-3/cccc\"]
-   #<marker at 2473 in alphabet_small\.crc\.cpio> #<marker at 2605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 426 
\"newDirectory-3/cccc\"]
+\\s-+#<marker at 2473 in alphabet_small\.crc\.cpio> #<marker at 2605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 327 
\"newDirectory-3/ccc\"]
-   #<marker at 2613 in alphabet_small\.crc\.cpio> #<marker at 2745 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 327 
\"newDirectory-3/ccc\"]
+\\s-+#<marker at 2613 in alphabet_small\.crc\.cpio> #<marker at 2745 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/bbbbb\.d\"]
-   #<marker at 2753 in alphabet_small\.crc\.cpio> #<marker at 2889 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/bbbbb\.d\"]
+\\s-+#<marker at 2753 in alphabet_small\.crc\.cpio> #<marker at 2889 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 520 
\"newDirectory-3/bbbbb\"]
-   #<marker at 2889 in alphabet_small\.crc\.cpio> #<marker at 3021 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 520 
\"newDirectory-3/bbbbb\"]
+\\s-+#<marker at 2889 in alphabet_small\.crc\.cpio> #<marker at 3021 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 422 
\"newDirectory-3/bbbb\"]
-   #<marker at 3029 in alphabet_small\.crc\.cpio> #<marker at 3161 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 422 
\"newDirectory-3/bbbb\"]
+\\s-+#<marker at 3029 in alphabet_small\.crc\.cpio> #<marker at 3161 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 324 
\"newDirectory-3/bbb\"]
-   #<marker at 3169 in alphabet_small\.crc\.cpio> #<marker at 3301 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 324 
\"newDirectory-3/bbb\"]
+\\s-+#<marker at 3169 in alphabet_small\.crc\.cpio> #<marker at 3301 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/aaaaa\.d\"]
-   #<marker at 3309 in alphabet_small\.crc\.cpio> #<marker at 3445 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/aaaaa\.d\"]
+\\s-+#<marker at 3309 in alphabet_small\.crc\.cpio> #<marker at 3445 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 515 
\"newDirectory-3/aaaaa\"]
-   #<marker at 3445 in alphabet_small\.crc\.cpio> #<marker at 3577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 515 
\"newDirectory-3/aaaaa\"]
+\\s-+#<marker at 3445 in alphabet_small\.crc\.cpio> #<marker at 3577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 418 
\"newDirectory-3/aaaa\"]
-   #<marker at 3585 in alphabet_small\.crc\.cpio> #<marker at 3717 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 418 
\"newDirectory-3/aaaa\"]
+\\s-+#<marker at 3585 in alphabet_small\.crc\.cpio> #<marker at 3717 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 321 
\"newDirectory-3/aaa\"]
-   #<marker at 3725 in alphabet_small\.crc\.cpio> #<marker at 3857 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 321 
\"newDirectory-3/aaa\"]
+\\s-+#<marker at 3725 in alphabet_small\.crc\.cpio> #<marker at 3857 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-crc-test-save)))
@@ -11810,90 +11900,90 @@ TRAILER!!!    (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with entry »a« deleted."
                 (string-match "((\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 117 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 117 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 125 in alphabet_small\.crc\.cpio> #<marker at 241 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 125 in alphabet_small\.crc\.cpio> #<marker at 241 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 249 in alphabet_small\.crc\.cpio> #<marker at 365 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 249 in alphabet_small\.crc\.cpio> #<marker at 365 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 373 in alphabet_small\.crc\.cpio> #<marker at 489 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 373 in alphabet_small\.crc\.cpio> #<marker at 489 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 497 in alphabet_small\.crc\.cpio> #<marker at 617 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 497 in alphabet_small\.crc\.cpio> #<marker at 617 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 617 in alphabet_small\.crc\.cpio> #<marker at 729 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 617 in alphabet_small\.crc\.cpio> #<marker at 729 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 849 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 849 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 857 in alphabet_small\.crc\.cpio> #<marker at 973 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 857 in alphabet_small\.crc\.cpio> #<marker at 973 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 981 in alphabet_small\.crc\.cpio> #<marker at 1097 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 981 in alphabet_small\.crc\.cpio> #<marker at 1097 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1105 in alphabet_small\.crc\.cpio> #<marker at 1221 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1105 in alphabet_small\.crc\.cpio> #<marker at 1221 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1229 in alphabet_small\.crc\.cpio> #<marker at 1349 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1229 in alphabet_small\.crc\.cpio> #<marker at 1349 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1349 in alphabet_small\.crc\.cpio> #<marker at 1461 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1349 in alphabet_small\.crc\.cpio> #<marker at 1461 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1581 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1581 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1589 in alphabet_small\.crc\.cpio> #<marker at 1705 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1589 in alphabet_small\.crc\.cpio> #<marker at 1705 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1713 in alphabet_small\.crc\.cpio> #<marker at 1829 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1713 in alphabet_small\.crc\.cpio> #<marker at 1829 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1837 in alphabet_small\.crc\.cpio> #<marker at 1953 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1837 in alphabet_small\.crc\.cpio> #<marker at 1953 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 1961 in alphabet_small\.crc\.cpio> #<marker at 2081 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 1961 in alphabet_small\.crc\.cpio> #<marker at 2081 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -12174,70 +12264,70 @@ TRAILER!!!    (( filename ))
     (should (and "Expecting a catalog with entries"
                 "    »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted."
                 (string-match "((\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 117 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 117 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 125 in alphabet_small\.crc\.cpio> #<marker at 241 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 125 in alphabet_small\.crc\.cpio> #<marker at 241 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 249 in alphabet_small\.crc\.cpio> #<marker at 365 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 249 in alphabet_small\.crc\.cpio> #<marker at 365 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 373 in alphabet_small\.crc\.cpio> #<marker at 489 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 373 in alphabet_small\.crc\.cpio> #<marker at 489 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 497 in alphabet_small\.crc\.cpio> #<marker at 613 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 497 in alphabet_small\.crc\.cpio> #<marker at 613 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 621 in alphabet_small\.crc\.cpio> #<marker at 737 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 621 in alphabet_small\.crc\.cpio> #<marker at 737 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 745 in alphabet_small\.crc\.cpio> #<marker at 865 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 745 in alphabet_small\.crc\.cpio> #<marker at 865 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 865 in alphabet_small\.crc\.cpio> #<marker at 977 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 865 in alphabet_small\.crc\.cpio> #<marker at 977 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 981 in alphabet_small\.crc\.cpio> #<marker at 1097 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 981 in alphabet_small\.crc\.cpio> #<marker at 1097 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1105 in alphabet_small\.crc\.cpio> #<marker at 1221 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1229 in alphabet_small\.crc\.cpio> #<marker at 1345 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1105 in alphabet_small\.crc\.cpio> #<marker at 1221 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+ (\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1229 in alphabet_small\.crc\.cpio> #<marker at 1345 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1353 in alphabet_small\.crc\.cpio> #<marker at 1469 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1353 in alphabet_small\.crc\.cpio> #<marker at 1469 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 1477 in alphabet_small\.crc\.cpio> #<marker at 1597 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 1477 in alphabet_small\.crc\.cpio> #<marker at 1597 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -12462,55 +12552,55 @@ TRAILER!!!    (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with further entries \`...\' deleted."
                 (string-match "((\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 117 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 117 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 125 in alphabet_small\.crc\.cpio> #<marker at 241 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 125 in alphabet_small\.crc\.cpio> #<marker at 241 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 249 in alphabet_small\.crc\.cpio> #<marker at 365 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 249 in alphabet_small\.crc\.cpio> #<marker at 365 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 373 in alphabet_small\.crc\.cpio> #<marker at 489 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 373 in alphabet_small\.crc\.cpio> #<marker at 489 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 497 in alphabet_small\.crc\.cpio> #<marker at 617 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 497 in alphabet_small\.crc\.cpio> #<marker at 617 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 617 in alphabet_small\.crc\.cpio> #<marker at 729 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 617 in alphabet_small\.crc\.cpio> #<marker at 729 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 849 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 849 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 857 in alphabet_small\.crc\.cpio> #<marker at 973 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 857 in alphabet_small\.crc\.cpio> #<marker at 973 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 981 in alphabet_small\.crc\.cpio> #<marker at 1097 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 981 in alphabet_small\.crc\.cpio> #<marker at 1097 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 1105 in alphabet_small\.crc\.cpio> #<marker at 1225 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 1105 in alphabet_small\.crc\.cpio> #<marker at 1225 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-crc-test-save)))
@@ -12609,95 +12699,95 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
     
     (should (and "Expecting catalog with first entry »d«."
                 (string-match "((\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"d\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"d\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -12741,95 +12831,95 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
        
     (should (and "Expecting a catalog with the above changes."
                 (string-match "((\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"d\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"d\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 17 321 
\"newDirectory/aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 17 321 
\"newDirectory/aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 18 418 
\"newDirectory/aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 18 418 
\"newDirectory/aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 515 
\"newDirectory/aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 515 
\"newDirectory/aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory/aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory/aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -12872,95 +12962,95 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
 " cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with \`...\' entries in newDirectory-1."
                 (string-match "((\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"d\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"d\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 17 321 
\"newDirectory/aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 17 321 
\"newDirectory/aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 18 418 
\"newDirectory/aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 18 418 
\"newDirectory/aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 515 
\"newDirectory/aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 515 
\"newDirectory/aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory/aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory/aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-1/bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 324 
\"newDirectory-1/bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 324 
\"newDirectory-1/bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-1/ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 327 
\"newDirectory-1/ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 327 
\"newDirectory-1/ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-crc-test-save)))
@@ -13556,100 +13646,100 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        
4 \\(?:a\\(?:pr\\|ug\\)\\|de
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
    #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"#a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 127 
\"#a\"]
-   #<marker at 2197 in alphabet_small\.crc\.cpio> #<marker at 2313 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 127 \"#a\"]
+\\s-+#<marker at 2197 in alphabet_small\.crc\.cpio> #<marker at 2313 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"#b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 128 
\"#b\"]
-   #<marker at 2317 in alphabet_small\.crc\.cpio> #<marker at 2433 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 128 \"#b\"]
+\\s-+#<marker at 2317 in alphabet_small\.crc\.cpio> #<marker at 2433 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"#c\" \.
   \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
              ([[:digit:]]+ [[:digit:]]+)
@@ -14264,130 +14354,130 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        
5 \\(?:a\\(?:pr\\|ug\\)\\|de
     (should (and "Expecting a catalog with entries with the suffixes"
                 "    aux bak dvi log orig reg toc."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.crc\.cpio> #<marker at 113 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.crc\.cpio> #<marker at 233 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.crc\.cpio> #<marker at 357 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.crc\.cpio> #<marker at 481 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.crc\.cpio> #<marker at 605 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.crc\.cpio> #<marker at 733 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.crc\.cpio> #<marker at 845 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.crc\.cpio> #<marker at 965 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.crc\.cpio> #<marker at 1089 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.crc\.cpio> #<marker at 1213 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.crc\.cpio> #<marker at 1337 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.crc\.cpio> #<marker at 1465 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.crc\.cpio> #<marker at 1577 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.crc\.cpio> #<marker at 1697 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.crc\.cpio> #<marker at 1821 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.crc\.cpio> #<marker at 1945 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.crc\.cpio> #<marker at 2069 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.crc\.cpio> #<marker at 2197 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.aux\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 
\"aa\.aux\"]
-   #<marker at 2197 in alphabet_small\.crc\.cpio> #<marker at 2317 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 \"aa\.aux\"]
+\\s-+#<marker at 2197 in alphabet_small\.crc\.cpio> #<marker at 2317 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.bak\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 
\"aa\.bak\"]
-   #<marker at 2325 in alphabet_small\.crc\.cpio> #<marker at 2445 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 \"aa\.bak\"]
+\\s-+#<marker at 2325 in alphabet_small\.crc\.cpio> #<marker at 2445 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.dvi\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 
\"aa\.dvi\"]
-   #<marker at 2453 in alphabet_small\.crc\.cpio> #<marker at 2573 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 \"aa\.dvi\"]
+\\s-+#<marker at 2453 in alphabet_small\.crc\.cpio> #<marker at 2573 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.log\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 
\"aa\.log\"]
-   #<marker at 2581 in alphabet_small\.crc\.cpio> #<marker at 2701 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 \"aa\.log\"]
+\\s-+#<marker at 2581 in alphabet_small\.crc\.cpio> #<marker at 2701 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.orig\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 224 
\"aa\.orig\"]
-   #<marker at 2709 in alphabet_small\.crc\.cpio> #<marker at 2829 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 224 \"aa\.orig\"]
+\\s-+#<marker at 2709 in alphabet_small\.crc\.cpio> #<marker at 2829 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.rej\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 
\"aa\.rej\"]
-   #<marker at 2837 in alphabet_small\.crc\.cpio> #<marker at 2957 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 \"aa\.rej\"]
+\\s-+#<marker at 2837 in alphabet_small\.crc\.cpio> #<marker at 2957 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.toc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 
\"aa\.toc\"]
-   #<marker at 2965 in alphabet_small\.crc\.cpio> #<marker at 3085 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 224 \"aa\.toc\"]
+\\s-+#<marker at 2965 in alphabet_small\.crc\.cpio> #<marker at 3085 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
     (cdmt-crc-test-save)))
 
@@ -16063,101 +16153,101 @@ newDirectory        (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with a new directory called 
»newDirectory«."
                 (string-match "((\"newDirectory\" \\.
-  [[1 16877 [[:digit:]]+ [[:digit:]]+ 1
-      ([[:digit:]]+ [[:digit:]]+)
-      0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 13 0 
\"newDirectory\"]
-   #<marker at 2197 in alphabet_small\\.crc\\.cpio> #<marker at 2321 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[1 16877 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 13 0 
\"newDirectory\"]
+\\s-+#<marker at 2197 in alphabet_small\\.crc\\.cpio> #<marker at 2321 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"a\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
-   #<marker at 1 in alphabet_small\\.crc\\.cpio> #<marker at 113 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\\.crc\\.cpio> #<marker at 113 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 
\"aa\"]
-   #<marker at 117 in alphabet_small\\.crc\\.cpio> #<marker at 233 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 224 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\\.crc\\.cpio> #<marker at 233 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 
\"aaa\"]
-   #<marker at 241 in alphabet_small\\.crc\\.cpio> #<marker at 357 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 321 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\\.crc\\.cpio> #<marker at 357 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\\.crc\\.cpio> #<marker at 481 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 418 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\\.crc\\.cpio> #<marker at 481 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\\.crc\\.cpio> #<marker at 605 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 515 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\\.crc\\.cpio> #<marker at 605 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\\.d\" \\.
-  [[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\\.d\"]
-   #<marker at 613 in alphabet_small\\.crc\\.cpio> #<marker at 733 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\\.d\"]
+\\s-+#<marker at 613 in alphabet_small\\.crc\\.cpio> #<marker at 733 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
-   #<marker at 733 in alphabet_small\\.crc\\.cpio> #<marker at 845 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 128 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\\.crc\\.cpio> #<marker at 845 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 
\"bb\"]
-   #<marker at 849 in alphabet_small\\.crc\\.cpio> #<marker at 965 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 226 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\\.crc\\.cpio> #<marker at 965 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 
\"bbb\"]
-   #<marker at 973 in alphabet_small\\.crc\\.cpio> #<marker at 1089 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 324 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\\.crc\\.cpio> #<marker at 1089 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\\.crc\\.cpio> #<marker at 1213 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 422 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\\.crc\\.cpio> #<marker at 1213 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\\.crc\\.cpio> #<marker at 1337 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 520 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\\.crc\\.cpio> #<marker at 1337 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\\.d\" \\.
-  [[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\\.d\"]
-   #<marker at 1345 in alphabet_small\\.crc\\.cpio> #<marker at 1465 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\\.crc\\.cpio> #<marker at 1465 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
-   #<marker at 1465 in alphabet_small\\.crc\\.cpio> #<marker at 1577 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 129 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\\.crc\\.cpio> #<marker at 1577 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 
\"cc\"]
-   #<marker at 1581 in alphabet_small\\.crc\\.cpio> #<marker at 1697 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 228 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\\.crc\\.cpio> #<marker at 1697 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 
\"ccc\"]
-   #<marker at 1705 in alphabet_small\\.crc\\.cpio> #<marker at 1821 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 327 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\\.crc\\.cpio> #<marker at 1821 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\\.crc\\.cpio> #<marker at 1945 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 426 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\\.crc\\.cpio> #<marker at 1945 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\\.crc\\.cpio> #<marker at 2069 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 525 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\\.crc\\.cpio> #<marker at 2069 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\\.d\" \\.
-  [[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\\.d\"]
-   #<marker at 2077 in alphabet_small\\.crc\\.cpio> #<marker at 2197 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified]))
-"cpio-catalog-contents-after)))
+\\s-+[[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\\.crc\\.cpio> #<marker at 2197 in 
alphabet_small\\.crc\\.cpio> cpio-mode-entry-unmodified]))
+" cpio-catalog-contents-after)))
     
     (cdmt-crc-test-save)))
 
diff --git a/cpio-dired-odc-test.el b/cpio-dired-odc-test.el
index c5456ab..88dc8de 100644
--- a/cpio-dired-odc-test.el
+++ b/cpio-dired-odc-test.el
@@ -1,7 +1,6 @@
-;      $Id: cpio-dired-odc-test.el,v 1.3 2018/06/03 14:01:55 doug Exp $        
 ;; -*- coding: utf-8 -*-
 ;;; cpio-dired-test.el --- Tests of cpio-dired-mode.
-;      $Id: cpio-dired-odc-test.el,v 1.3 2018/06/03 14:01:55 doug Exp $        
+;      $Id: cpio-dired-odc-test.el,v 1.4 2018/06/04 19:21:15 doug Exp $        
 
 ;; COPYRIGHT
 
@@ -777,187 +776,187 @@ TRAILER!!!      (( filename ))
 ")
 
 (defvar *cdmt-odc-untouched-small-catalog* "((\"a\" .
-  [[43252341448 33188 1000 1000 1
-        (23281 65535)
-        4 253 0 0 0 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 113 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341448 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small.odc.cpio> #<marker at 113 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"aa\" .
-  [[43252341474 33188 1000 1000 1
-        (23281 65535)
-        5 253 0 0 0 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small.odc.cpio> #<marker at 233 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341474 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small.odc.cpio> #<marker at 233 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" .
-  [[43252341508 33188 1000 1000 1
-        (23281 65535)
-        6 253 0 0 0 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small.odc.cpio> #<marker at 357 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341508 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small.odc.cpio> #<marker at 357 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" .
-  [[43252341511 33188 1000 1000 1
-        (23281 65535)
-        7 253 0 0 0 5 0 \"aaaa\"]
-   #<marker at 365 in alphabet_small.odc.cpio> #<marker at 481 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341511 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small.odc.cpio> #<marker at 481 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" .
-  [[43252341512 33188 1000 1000 1
-        (23281 65535)
-        8 253 0 0 0 6 0 \"aaaaa\"]
-   #<marker at 489 in alphabet_small.odc.cpio> #<marker at 605 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341512 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small.odc.cpio> #<marker at 605 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa.d\" .
-  [[43252341515 16877 1000 1000 2
-        (23268 65535)
-        0 253 0 0 0 8 0 \"aaaaa.d\"]
-   #<marker at 613 in alphabet_small.odc.cpio> #<marker at 733 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341515 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"aaaaa.d\"]
+\\s-+#<marker at 613 in alphabet_small.odc.cpio> #<marker at 733 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"b\" .
-  [[43252341513 33188 1000 1000 1
-        (23281 65535)
-        4 253 0 0 0 2 0 \"b\"]
-   #<marker at 733 in alphabet_small.odc.cpio> #<marker at 845 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341513 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small.odc.cpio> #<marker at 845 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"bb\" .
-  [[43252341514 33188 1000 1000 1
-        (23281 65535)
-        5 253 0 0 0 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small.odc.cpio> #<marker at 965 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341514 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small.odc.cpio> #<marker at 965 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" .
-  [[43252341516 33188 1000 1000 1
-        (23281 65535)
-        6 253 0 0 0 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small.odc.cpio> #<marker at 1089 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341516 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small.odc.cpio> #<marker at 1089 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" .
-  [[43252341517 33188 1000 1000 1
-        (23281 65535)
-        7 253 0 0 0 5 0 \"bbbb\"]
-   #<marker at 1097 in alphabet_small.odc.cpio> #<marker at 1213 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341517 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small.odc.cpio> #<marker at 1213 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" .
-  [[43252341518 33188 1000 1000 1
-        (23281 65535)
-        8 253 0 0 0 6 0 \"bbbbb\"]
-   #<marker at 1221 in alphabet_small.odc.cpio> #<marker at 1337 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341518 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small.odc.cpio> #<marker at 1337 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb.d\" .
-  [[43252341601 16877 1000 1000 2
-        (23268 65535)
-        0 253 0 0 0 8 0 \"bbbbb.d\"]
-   #<marker at 1345 in alphabet_small.odc.cpio> #<marker at 1465 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341601 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"bbbbb.d\"]
+\\s-+#<marker at 1345 in alphabet_small.odc.cpio> #<marker at 1465 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"c\" .
-  [[43252341519 33188 1000 1000 1
-        (23281 65535)
-        4 253 0 0 0 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small.odc.cpio> #<marker at 1577 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341519 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small.odc.cpio> #<marker at 1577 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"cc\" .
-  [[43252341600 33188 1000 1000 1
-        (23281 65535)
-        5 253 0 0 0 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small.odc.cpio> #<marker at 1697 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341600 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small.odc.cpio> #<marker at 1697 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" .
-  [[43252341602 33188 1000 1000 1
-        (23281 65535)
-        6 253 0 0 0 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small.odc.cpio> #<marker at 1821 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341602 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small.odc.cpio> #<marker at 1821 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" .
-  [[43252341603 33188 1000 1000 1
-        (23281 65535)
-        7 253 0 0 0 5 0 \"cccc\"]
-   #<marker at 1829 in alphabet_small.odc.cpio> #<marker at 1945 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341603 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small.odc.cpio> #<marker at 1945 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" .
-  [[43252341604 33188 1000 1000 1
-        (23281 65535)
-        8 253 0 0 0 6 0 \"ccccc\"]
-   #<marker at 1953 in alphabet_small.odc.cpio> #<marker at 2069 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341604 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small.odc.cpio> #<marker at 2069 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"ccccc.d\" .
-  [[43252341607 16877 1000 1000 2
-        (23268 65535)
-        0 253 0 0 0 8 0 \"ccccc.d\"]
-   #<marker at 2077 in alphabet_small.odc.cpio> #<marker at 2197 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
+\\s-+[[43252341607 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"ccccc.d\"]
+\\s-+#<marker at 2077 in alphabet_small.odc.cpio> #<marker at 2197 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
 "
   "An string representing an untouched catalog.")
 (setq *cdmt-odc-untouched-small-catalog* "((\"a\" .
-  [[43252341448 33188 1000 1000 1
-        (23281 65535)
-        4 253 0 0 0 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 113 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341448 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small.odc.cpio> #<marker at 113 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"aa\" .
-  [[43252341474 33188 1000 1000 1
-        (23281 65535)
-        5 253 0 0 0 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small.odc.cpio> #<marker at 233 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341474 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small.odc.cpio> #<marker at 233 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" .
-  [[43252341508 33188 1000 1000 1
-        (23281 65535)
-        6 253 0 0 0 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small.odc.cpio> #<marker at 357 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341508 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small.odc.cpio> #<marker at 357 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" .
-  [[43252341511 33188 1000 1000 1
-        (23281 65535)
-        7 253 0 0 0 5 0 \"aaaa\"]
-   #<marker at 365 in alphabet_small.odc.cpio> #<marker at 481 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341511 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small.odc.cpio> #<marker at 481 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" .
-  [[43252341512 33188 1000 1000 1
-        (23281 65535)
-        8 253 0 0 0 6 0 \"aaaaa\"]
-   #<marker at 489 in alphabet_small.odc.cpio> #<marker at 605 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341512 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small.odc.cpio> #<marker at 605 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa.d\" .
-  [[43252341515 16877 1000 1000 2
-        (23268 65535)
-        0 253 0 0 0 8 0 \"aaaaa.d\"]
-   #<marker at 613 in alphabet_small.odc.cpio> #<marker at 733 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341515 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"aaaaa.d\"]
+\\s-+#<marker at 613 in alphabet_small.odc.cpio> #<marker at 733 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"b\" .
-  [[43252341513 33188 1000 1000 1
-        (23281 65535)
-        4 253 0 0 0 2 0 \"b\"]
-   #<marker at 733 in alphabet_small.odc.cpio> #<marker at 845 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341513 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small.odc.cpio> #<marker at 845 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"bb\" .
-  [[43252341514 33188 1000 1000 1
-        (23281 65535)
-        5 253 0 0 0 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small.odc.cpio> #<marker at 965 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341514 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small.odc.cpio> #<marker at 965 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" .
-  [[43252341516 33188 1000 1000 1
-        (23281 65535)
-        6 253 0 0 0 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small.odc.cpio> #<marker at 1089 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341516 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small.odc.cpio> #<marker at 1089 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" .
-  [[43252341517 33188 1000 1000 1
-        (23281 65535)
-        7 253 0 0 0 5 0 \"bbbb\"]
-   #<marker at 1097 in alphabet_small.odc.cpio> #<marker at 1213 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341517 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small.odc.cpio> #<marker at 1213 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" .
-  [[43252341518 33188 1000 1000 1
-        (23281 65535)
-        8 253 0 0 0 6 0 \"bbbbb\"]
-   #<marker at 1221 in alphabet_small.odc.cpio> #<marker at 1337 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341518 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small.odc.cpio> #<marker at 1337 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb.d\" .
-  [[43252341601 16877 1000 1000 2
-        (23268 65535)
-        0 253 0 0 0 8 0 \"bbbbb.d\"]
-   #<marker at 1345 in alphabet_small.odc.cpio> #<marker at 1465 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341601 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"bbbbb.d\"]
+\\s-+#<marker at 1345 in alphabet_small.odc.cpio> #<marker at 1465 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"c\" .
-  [[43252341519 33188 1000 1000 1
-        (23281 65535)
-        4 253 0 0 0 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small.odc.cpio> #<marker at 1577 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341519 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small.odc.cpio> #<marker at 1577 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"cc\" .
-  [[43252341600 33188 1000 1000 1
-        (23281 65535)
-        5 253 0 0 0 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small.odc.cpio> #<marker at 1697 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341600 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small.odc.cpio> #<marker at 1697 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" .
-  [[43252341602 33188 1000 1000 1
-        (23281 65535)
-        6 253 0 0 0 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small.odc.cpio> #<marker at 1821 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341602 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small.odc.cpio> #<marker at 1821 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" .
-  [[43252341603 33188 1000 1000 1
-        (23281 65535)
-        7 253 0 0 0 5 0 \"cccc\"]
-   #<marker at 1829 in alphabet_small.odc.cpio> #<marker at 1945 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341603 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small.odc.cpio> #<marker at 1945 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" .
-  [[43252341604 33188 1000 1000 1
-        (23281 65535)
-        8 253 0 0 0 6 0 \"ccccc\"]
-   #<marker at 1953 in alphabet_small.odc.cpio> #<marker at 2069 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[43252341604 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small.odc.cpio> #<marker at 2069 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
  (\"ccccc.d\" .
-  [[43252341607 16877 1000 1000 2
-        (23268 65535)
-        0 253 0 0 0 8 0 \"ccccc.d\"]
-   #<marker at 2077 in alphabet_small.odc.cpio> #<marker at 2197 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
+\\s-+[[43252341607 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"ccccc.d\"]
+\\s-+#<marker at 2077 in alphabet_small.odc.cpio> #<marker at 2197 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
 ")
 
 (defvar *cdmt-odc-untouched-large-archive-buffer* "070707      (( magic    ))
@@ -7317,7 +7316,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        8 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents)))
-    (should (and "Expecting a catalog with the firwat entry having group 9999."
+    (should (and "Expecting a catalog with the first entry having group 9999."
                 (string-match "((\"a\" \.
 \\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 9999 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -7408,8 +7407,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
 \\s-+([[:digit:]]+ [[:digit:]]+)
 \\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
 \\s-+#<marker at 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-"
- cpio-catalog-contents-after)))
+" cpio-catalog-contents-after)))
 
     (cdmt-odc-reset)
     
@@ -15752,6 +15750,7 @@ cpio-mouse-face is not yet implemented -- expect an 
error."
   (should-error (cpio-mouse-face)
      :type 'error))
 
+
 (ert-deftest cdmt-odc-revert-buffer ()
   "Test revert-buffer.
 revert-buffer is not yet implemented -- expect an error."
diff --git a/cpio-dired-test.el b/cpio-dired-test.el
index 83b9088..867eebe 100644
--- a/cpio-dired-test.el
+++ b/cpio-dired-test.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cpio-dired-test.el --- Tests of cpio-dired-mode.
-;      $Id: cpio-dired-test.el,v 1.4 2018/06/03 14:01:55 doug Exp $    
+;      $Id: cpio-dired-test.el,v 1.5 2018/06/04 19:21:15 doug Exp $    
 
 ;; COPYRIGHT
 
@@ -776,99 +776,188 @@ TRAILER!!!       (( filename ))
 ")
 
 (defvar *cdmt-untouched-small-catalog* "((\"a\" .
-  [[235538648 33188 1000 1000 1
-             (23281 65535)
-             4 253 0 0 0 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.newc.cpio> #<marker at 113 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538648 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small.newc.cpio> #<marker at 113 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"aa\" .
-  [[235538674 33188 1000 1000 1
-             (23281 65535)
-             5 253 0 0 0 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small.newc.cpio> #<marker at 233 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538674 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small.newc.cpio> #<marker at 233 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" .
-  [[235538688 33188 1000 1000 1
-             (23281 65535)
-             6 253 0 0 0 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small.newc.cpio> #<marker at 357 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538688 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small.newc.cpio> #<marker at 357 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" .
-  [[235538691 33188 1000 1000 1
-             (23281 65535)
-             7 253 0 0 0 5 0 \"aaaa\"]
-   #<marker at 365 in alphabet_small.newc.cpio> #<marker at 481 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538691 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small.newc.cpio> #<marker at 481 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" .
-  [[235538692 33188 1000 1000 1
-             (23281 65535)
-             8 253 0 0 0 6 0 \"aaaaa\"]
-   #<marker at 489 in alphabet_small.newc.cpio> #<marker at 605 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538692 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small.newc.cpio> #<marker at 605 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa.d\" .
-  [[235538695 16877 1000 1000 2
-             (23268 65535)
-             0 253 0 0 0 8 0 \"aaaaa.d\"]
-   #<marker at 613 in alphabet_small.newc.cpio> #<marker at 733 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538695 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"aaaaa.d\"]
+\\s-+#<marker at 613 in alphabet_small.newc.cpio> #<marker at 733 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"b\" .
-  [[235538693 33188 1000 1000 1
-             (23281 65535)
-             4 253 0 0 0 2 0 \"b\"]
-   #<marker at 733 in alphabet_small.newc.cpio> #<marker at 845 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538693 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small.newc.cpio> #<marker at 845 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"bb\" .
-  [[235538694 33188 1000 1000 1
-             (23281 65535)
-             5 253 0 0 0 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small.newc.cpio> #<marker at 965 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538694 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small.newc.cpio> #<marker at 965 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" .
-  [[235538696 33188 1000 1000 1
-             (23281 65535)
-             6 253 0 0 0 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small.newc.cpio> #<marker at 1089 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538696 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small.newc.cpio> #<marker at 1089 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" .
-  [[235538697 33188 1000 1000 1
-             (23281 65535)
-             7 253 0 0 0 5 0 \"bbbb\"]
-   #<marker at 1097 in alphabet_small.newc.cpio> #<marker at 1213 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538697 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small.newc.cpio> #<marker at 1213 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" .
-  [[235538698 33188 1000 1000 1
-             (23281 65535)
-             8 253 0 0 0 6 0 \"bbbbb\"]
-   #<marker at 1221 in alphabet_small.newc.cpio> #<marker at 1337 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538698 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small.newc.cpio> #<marker at 1337 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb.d\" .
-  [[235538701 16877 1000 1000 2
-             (23268 65535)
-             0 253 0 0 0 8 0 \"bbbbb.d\"]
-   #<marker at 1345 in alphabet_small.newc.cpio> #<marker at 1465 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538701 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"bbbbb.d\"]
+\\s-+#<marker at 1345 in alphabet_small.newc.cpio> #<marker at 1465 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"c\" .
-  [[235538699 33188 1000 1000 1
-             (23281 65535)
-             4 253 0 0 0 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small.newc.cpio> #<marker at 1577 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538699 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small.newc.cpio> #<marker at 1577 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"cc\" .
-  [[235538700 33188 1000 1000 1
-             (23281 65535)
-             5 253 0 0 0 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small.newc.cpio> #<marker at 1697 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538700 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small.newc.cpio> #<marker at 1697 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" .
-  [[235538702 33188 1000 1000 1
-             (23281 65535)
-             6 253 0 0 0 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small.newc.cpio> #<marker at 1821 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538702 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small.newc.cpio> #<marker at 1821 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" .
-  [[235538703 33188 1000 1000 1
-             (23281 65535)
-             7 253 0 0 0 5 0 \"cccc\"]
-   #<marker at 1829 in alphabet_small.newc.cpio> #<marker at 1945 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538703 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small.newc.cpio> #<marker at 1945 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" .
-  [[235538704 33188 1000 1000 1
-             (23281 65535)
-             8 253 0 0 0 6 0 \"ccccc\"]
-   #<marker at 1953 in alphabet_small.newc.cpio> #<marker at 2069 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+\\s-+[[235538704 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small.newc.cpio> #<marker at 2069 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
  (\"ccccc.d\" .
-  [[235538707 16877 1000 1000 2
-             (23268 65535)
-             0 253 0 0 0 8 0 \"ccccc.d\"]
-   #<marker at 2077 in alphabet_small.newc.cpio> #<marker at 2197 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified]))
+\\s-+[[235538707 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"ccccc.d\"]
+\\s-+#<marker at 2077 in alphabet_small.newc.cpio> #<marker at 2197 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified]))
 "
   "An string representing an untouched catalog.")
-
-
+(setq *cdmt-untouched-small-catalog* "((\"a\" .
+\\s-+[[235538648 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small.newc.cpio> #<marker at 113 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"aa\" .
+\\s-+[[235538674 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small.newc.cpio> #<marker at 233 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"aaa\" .
+\\s-+[[235538688 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small.newc.cpio> #<marker at 357 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"aaaa\" .
+\\s-+[[235538691 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small.newc.cpio> #<marker at 481 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"aaaaa\" .
+\\s-+[[235538692 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small.newc.cpio> #<marker at 605 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"aaaaa.d\" .
+\\s-+[[235538695 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"aaaaa.d\"]
+\\s-+#<marker at 613 in alphabet_small.newc.cpio> #<marker at 733 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"b\" .
+\\s-+[[235538693 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small.newc.cpio> #<marker at 845 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"bb\" .
+\\s-+[[235538694 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small.newc.cpio> #<marker at 965 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"bbb\" .
+\\s-+[[235538696 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small.newc.cpio> #<marker at 1089 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"bbbb\" .
+\\s-+[[235538697 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small.newc.cpio> #<marker at 1213 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"bbbbb\" .
+\\s-+[[235538698 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small.newc.cpio> #<marker at 1337 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"bbbbb.d\" .
+\\s-+[[235538701 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"bbbbb.d\"]
+\\s-+#<marker at 1345 in alphabet_small.newc.cpio> #<marker at 1465 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"c\" .
+\\s-+[[235538699 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+4 253 0 0 0 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small.newc.cpio> #<marker at 1577 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"cc\" .
+\\s-+[[235538700 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+5 253 0 0 0 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small.newc.cpio> #<marker at 1697 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"ccc\" .
+\\s-+[[235538702 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+6 253 0 0 0 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small.newc.cpio> #<marker at 1821 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"cccc\" .
+\\s-+[[235538703 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+7 253 0 0 0 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small.newc.cpio> #<marker at 1945 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"ccccc\" .
+\\s-+[[235538704 33188 1000 1000 1
+\\s-+(23281 65535)
+\\s-+8 253 0 0 0 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small.newc.cpio> #<marker at 2069 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified])
+ (\"ccccc.d\" .
+\\s-+[[235538707 16877 1000 1000 2
+\\s-+(23268 65535)
+\\s-+0 253 0 0 0 8 0 \"ccccc.d\"]
+\\s-+#<marker at 2077 in alphabet_small.newc.cpio> #<marker at 2197 in 
alphabet_small.newc.cpio> cpio-mode-entry-unmodified]))
+")
 
 (defvar *cdmt-untouched-large-archive-buffer* "070701  (( magic    ))
 DEADBEEF       (( ino      ))
@@ -6537,7 +6626,7 @@ If MAKE is non-nil, then run 'make newc' as part of the 
reset."
                             *cdmt-large-archive*)))
     (cd run-dir)
     (mapc (lambda (an)
-           (setq cpio-archive-buffer (find-file-noselect an 'nowarn))
+           (setq cpio-archive-buffer (find-file-noselect an nil nil))
            (if (and (file-exists-p an)
                     (buffer-live-p (get-buffer cpio-archive-buffer)))
                (with-current-buffer cpio-archive-buffer
@@ -7220,85 +7309,85 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
    #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccccc\.d\" \.
   \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
              ([[:digit:]]+ [[:digit:]]+)
@@ -7351,85 +7440,85 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
    #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccccc\.d\" \.
   \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
              ([[:digit:]]+ [[:digit:]]+)
@@ -7478,95 +7567,95 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
 " cpio-dired-buffer-contents)))
     (should (and "Expecting \`...\' to have group 7777."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
- (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\])
+ (\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
     
     (cdmt-test-save)))
@@ -7952,95 +8041,95 @@ TRAILER!!!      (( filename ))
 " cpio-archive-buffer-contents)))
     (should (and "Expecting a mode of 0755 (33261) on the first entry."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -8087,95 +8176,95 @@ TRAILER!!!      (( filename ))
                 "Expecting aaaaa.d to have mode 040600 (16768)."
 
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
        
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -8219,95 +8308,95 @@ TRAILER!!!      (( filename ))
 
     (should (and "Expecting ... to have mode 0100660 (33200)."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -8689,95 +8778,95 @@ TRAILER!!!      (( filename ))
                 "• ... have mode 33200 for files."
                 "                16816 for directories."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 238 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 238 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 363 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 363 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 488 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 488 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 970 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 970 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1095 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1095 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1220 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1220 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1702 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1702 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1827 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1827 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1952 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1952 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-test-save)))
@@ -8833,97 +8922,97 @@ TRAILER!!!      (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "The owner of 'a' should be 9999."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 9999 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 9999 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
-" cpio-catalog-contents-after)))
-
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+" cpio-catalog-contents-after)))
+
     (cdmt-reset)
     
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -8971,85 +9060,85 @@ TRAILER!!!      (( filename ))
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
    #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 8888 [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 8888 [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
   \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
              ([[:digit:]]+ [[:digit:]]+)
@@ -9098,95 +9187,95 @@ TRAILER!!!      (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting ... to be owned by 7777."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
     
     (cdmt-test-save)))
@@ -9241,95 +9330,95 @@ TRAILER!!!      (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting entry 'a' to have owner 9999 and group 1111."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 9999 1111 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 9999 1111 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-reset)
@@ -9373,95 +9462,95 @@ TRAILER!!!      (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting 4 entries with owner 8888 and group 2222."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 2222 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 2222 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 2222 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 2222 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 2222 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 8888 2222 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 8888 2222 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 8888 2222 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-reset)
@@ -9505,95 +9594,95 @@ TRAILER!!!      (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting ... to have owner 7777 and group 3333."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 7777 3333 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 3333 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 7777 3333 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 3333 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 7777 3333 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 7777 3333 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-test-save)))
@@ -9988,100 +10077,100 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        
4 \\(?:a\\(?:pr\\|ug\\)\\|de
 " cpio-dired-buffer-contents)))
     (should (and "Expecting to see an entry »d«."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
-   #<marker at 2197 in alphabet_small\.newc\.cpio> #<marker at 2309 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
+\\s-+#<marker at 2197 in alphabet_small\.newc\.cpio> #<marker at 2309 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-test-save)))
@@ -10679,8 +10768,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\s-+([[:digit:]]+ [[:digit:]]+)
 \\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/aaa\"]
 \\s-+#<marker at 2477 in alphabet_small\.newc\.cpio> #<marker at 2609 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
-"
-cpio-catalog-contents-after)))
+" cpio-catalog-contents-after)))
 
     (cdmt-test-save)))
 
@@ -11273,155 +11361,155 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        
6 \\(?:a\\(?:pr\\|ug\\)\\|de
 " cpio-dired-buffer-contents)))
     (should (and "Expecting all entries named with at least 3 letters to have 
copies in newDirectory-3."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/ccccc\.d\"]
-   #<marker at 2197 in alphabet_small\.newc\.cpio> #<marker at 2333 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/ccccc\.d\"]
+\\s-+#<marker at 2197 in alphabet_small\.newc\.cpio> #<marker at 2333 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory-3/ccccc\"]
-   #<marker at 2333 in alphabet_small\.newc\.cpio> #<marker at 2465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory-3/ccccc\"]
+\\s-+#<marker at 2333 in alphabet_small\.newc\.cpio> #<marker at 2465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 0 
\"newDirectory-3/cccc\"]
-   #<marker at 2473 in alphabet_small\.newc\.cpio> #<marker at 2605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 0 
\"newDirectory-3/cccc\"]
+\\s-+#<marker at 2473 in alphabet_small\.newc\.cpio> #<marker at 2605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-3/ccc\"]
-   #<marker at 2613 in alphabet_small\.newc\.cpio> #<marker at 2745 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-3/ccc\"]
+\\s-+#<marker at 2613 in alphabet_small\.newc\.cpio> #<marker at 2745 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/bbbbb\.d\"]
-   #<marker at 2753 in alphabet_small\.newc\.cpio> #<marker at 2889 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/bbbbb\.d\"]
+\\s-+#<marker at 2753 in alphabet_small\.newc\.cpio> #<marker at 2889 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory-3/bbbbb\"]
-   #<marker at 2889 in alphabet_small\.newc\.cpio> #<marker at 3021 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory-3/bbbbb\"]
+\\s-+#<marker at 2889 in alphabet_small\.newc\.cpio> #<marker at 3021 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 0 
\"newDirectory-3/bbbb\"]
-   #<marker at 3029 in alphabet_small\.newc\.cpio> #<marker at 3161 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 0 
\"newDirectory-3/bbbb\"]
+\\s-+#<marker at 3029 in alphabet_small\.newc\.cpio> #<marker at 3161 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-3/bbb\"]
-   #<marker at 3169 in alphabet_small\.newc\.cpio> #<marker at 3301 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-3/bbb\"]
+\\s-+#<marker at 3169 in alphabet_small\.newc\.cpio> #<marker at 3301 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/aaaaa\.d\"]
-   #<marker at 3309 in alphabet_small\.newc\.cpio> #<marker at 3445 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/aaaaa\.d\"]
+\\s-+#<marker at 3309 in alphabet_small\.newc\.cpio> #<marker at 3445 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory-3/aaaaa\"]
-   #<marker at 3445 in alphabet_small\.newc\.cpio> #<marker at 3577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory-3/aaaaa\"]
+\\s-+#<marker at 3445 in alphabet_small\.newc\.cpio> #<marker at 3577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 0 
\"newDirectory-3/aaaa\"]
-   #<marker at 3585 in alphabet_small\.newc\.cpio> #<marker at 3717 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 0 
\"newDirectory-3/aaaa\"]
+\\s-+#<marker at 3585 in alphabet_small\.newc\.cpio> #<marker at 3717 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-3/aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-3/aaa\"]
-   #<marker at 3725 in alphabet_small\.newc\.cpio> #<marker at 3857 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-3/aaa\"]
+\\s-+#<marker at 3725 in alphabet_small\.newc\.cpio> #<marker at 3857 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-test-save)))
@@ -11792,90 +11880,90 @@ TRAILER!!!    (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with entry »a« deleted."
                 (string-match "((\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 117 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 117 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 125 in alphabet_small\.newc\.cpio> #<marker at 241 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 125 in alphabet_small\.newc\.cpio> #<marker at 241 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 249 in alphabet_small\.newc\.cpio> #<marker at 365 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 249 in alphabet_small\.newc\.cpio> #<marker at 365 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 373 in alphabet_small\.newc\.cpio> #<marker at 489 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 373 in alphabet_small\.newc\.cpio> #<marker at 489 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 497 in alphabet_small\.newc\.cpio> #<marker at 617 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 497 in alphabet_small\.newc\.cpio> #<marker at 617 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 617 in alphabet_small\.newc\.cpio> #<marker at 729 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 617 in alphabet_small\.newc\.cpio> #<marker at 729 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 849 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 849 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 857 in alphabet_small\.newc\.cpio> #<marker at 973 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 857 in alphabet_small\.newc\.cpio> #<marker at 973 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 981 in alphabet_small\.newc\.cpio> #<marker at 1097 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 981 in alphabet_small\.newc\.cpio> #<marker at 1097 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1105 in alphabet_small\.newc\.cpio> #<marker at 1221 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1105 in alphabet_small\.newc\.cpio> #<marker at 1221 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1229 in alphabet_small\.newc\.cpio> #<marker at 1349 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1229 in alphabet_small\.newc\.cpio> #<marker at 1349 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1349 in alphabet_small\.newc\.cpio> #<marker at 1461 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1349 in alphabet_small\.newc\.cpio> #<marker at 1461 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1581 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1581 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1589 in alphabet_small\.newc\.cpio> #<marker at 1705 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1589 in alphabet_small\.newc\.cpio> #<marker at 1705 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1713 in alphabet_small\.newc\.cpio> #<marker at 1829 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1713 in alphabet_small\.newc\.cpio> #<marker at 1829 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1837 in alphabet_small\.newc\.cpio> #<marker at 1953 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1837 in alphabet_small\.newc\.cpio> #<marker at 1953 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 1961 in alphabet_small\.newc\.cpio> #<marker at 2081 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 1961 in alphabet_small\.newc\.cpio> #<marker at 2081 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -12156,70 +12244,70 @@ TRAILER!!!    (( filename ))
     (should (and "Expecting a catalog with entries"
                 "    »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted."
                 (string-match "((\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 117 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 117 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 125 in alphabet_small\.newc\.cpio> #<marker at 241 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 125 in alphabet_small\.newc\.cpio> #<marker at 241 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 249 in alphabet_small\.newc\.cpio> #<marker at 365 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 249 in alphabet_small\.newc\.cpio> #<marker at 365 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 373 in alphabet_small\.newc\.cpio> #<marker at 489 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 373 in alphabet_small\.newc\.cpio> #<marker at 489 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 497 in alphabet_small\.newc\.cpio> #<marker at 613 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 497 in alphabet_small\.newc\.cpio> #<marker at 613 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 621 in alphabet_small\.newc\.cpio> #<marker at 737 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 621 in alphabet_small\.newc\.cpio> #<marker at 737 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 745 in alphabet_small\.newc\.cpio> #<marker at 865 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 745 in alphabet_small\.newc\.cpio> #<marker at 865 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 865 in alphabet_small\.newc\.cpio> #<marker at 977 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 865 in alphabet_small\.newc\.cpio> #<marker at 977 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 981 in alphabet_small\.newc\.cpio> #<marker at 1097 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 981 in alphabet_small\.newc\.cpio> #<marker at 1097 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1105 in alphabet_small\.newc\.cpio> #<marker at 1221 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1105 in alphabet_small\.newc\.cpio> #<marker at 1221 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1229 in alphabet_small\.newc\.cpio> #<marker at 1345 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1229 in alphabet_small\.newc\.cpio> #<marker at 1345 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1353 in alphabet_small\.newc\.cpio> #<marker at 1469 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1353 in alphabet_small\.newc\.cpio> #<marker at 1469 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 1477 in alphabet_small\.newc\.cpio> #<marker at 1597 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 1477 in alphabet_small\.newc\.cpio> #<marker at 1597 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -12443,55 +12531,55 @@ TRAILER!!!    (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with further entries \`...\' deleted."
                 (string-match "((\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 117 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 117 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 125 in alphabet_small\.newc\.cpio> #<marker at 241 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 125 in alphabet_small\.newc\.cpio> #<marker at 241 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 249 in alphabet_small\.newc\.cpio> #<marker at 365 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 249 in alphabet_small\.newc\.cpio> #<marker at 365 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 373 in alphabet_small\.newc\.cpio> #<marker at 489 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 373 in alphabet_small\.newc\.cpio> #<marker at 489 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 497 in alphabet_small\.newc\.cpio> #<marker at 617 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 497 in alphabet_small\.newc\.cpio> #<marker at 617 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 617 in alphabet_small\.newc\.cpio> #<marker at 729 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 617 in alphabet_small\.newc\.cpio> #<marker at 729 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 849 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 849 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 857 in alphabet_small\.newc\.cpio> #<marker at 973 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 857 in alphabet_small\.newc\.cpio> #<marker at 973 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 981 in alphabet_small\.newc\.cpio> #<marker at 1097 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 981 in alphabet_small\.newc\.cpio> #<marker at 1097 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 1105 in alphabet_small\.newc\.cpio> #<marker at 1225 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 1105 in alphabet_small\.newc\.cpio> #<marker at 1225 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-test-save)))
@@ -12590,95 +12678,95 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
     
     (should (and "Expecting catalog with first entry »d«."
                 (string-match "((\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -12722,95 +12810,95 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
        
     (should (and "Expecting a catalog with the above changes."
                 (string-match "((\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 17 0 
\"newDirectory/aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 17 0 
\"newDirectory/aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 18 0 
\"newDirectory/aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 18 0 
\"newDirectory/aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory/aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory/aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory/aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory/aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -12853,95 +12941,95 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
 " cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with \`...\' entries in newDirectory-1."
                 (string-match "((\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 17 0 
\"newDirectory/aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 17 0 
\"newDirectory/aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 18 0 
\"newDirectory/aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 18 0 
\"newDirectory/aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory/aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory/aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory/aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory/aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory/aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-1/bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"newDirectory-1/ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
 
     (cdmt-test-save)))
@@ -13137,9 +13225,9 @@ cpio-dired-find-entry-other-window is not yet 
implemented -- expect an error."
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
      (should (and "Expecting an archive with autosave entries"
-                "for each single character entry."
-                "(The copy used to create them must update the archive.)"
-                (string-equal "070701  (( magic    ))
+                 "for each single character entry."
+                 "(The copy used to create them must update the archive.)"
+                 (string-equal "070701 (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
 000003E8       (( uid      ))
@@ -13537,110 +13625,111 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        
4 \\(?:a\\(?:pr\\|ug\\)\\|de
 " cpio-dired-buffer-contents)))
      (should (and "Expecting a catalog with autosave entries for each 
one-character entry."
                  (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+>>>>>>> 1.3.18.2
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"#a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"#a\"]
-   #<marker at 2197 in alphabet_small\.newc\.cpio> #<marker at 2313 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"#a\"]
+\\s-+#<marker at 2197 in alphabet_small\.newc\.cpio> #<marker at 2313 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"#b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"#b\"]
-   #<marker at 2317 in alphabet_small\.newc\.cpio> #<marker at 2433 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"#b\"]
+\\s-+#<marker at 2317 in alphabet_small\.newc\.cpio> #<marker at 2433 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"#c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"#c\"]
-   #<marker at 2437 in alphabet_small\.newc\.cpio> #<marker at 2553 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"#c\"]
+\\s-+#<marker at 2437 in alphabet_small\.newc\.cpio> #<marker at 2553 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-cpio-dired-flag-backup-entries ()
@@ -14250,130 +14339,130 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        
5 \\(?:a\\(?:pr\\|ug\\)\\|de
     (should (and "Expecting a catalog with entries with the suffixes"
                 "    aux bak dvi log orig reg toc."
                 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\.newc\.cpio> #<marker at 113 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\.newc\.cpio> #<marker at 233 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\.newc\.cpio> #<marker at 357 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\.newc\.cpio> #<marker at 481 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\.newc\.cpio> #<marker at 605 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\.d\"]
-   #<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 613 in alphabet_small\.newc\.cpio> #<marker at 733 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\.newc\.cpio> #<marker at 845 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\.newc\.cpio> #<marker at 965 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\.newc\.cpio> #<marker at 1089 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\.newc\.cpio> #<marker at 1213 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\.newc\.cpio> #<marker at 1337 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\.d\"]
-   #<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\.newc\.cpio> #<marker at 1465 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\.newc\.cpio> #<marker at 1577 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\.newc\.cpio> #<marker at 1697 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\.newc\.cpio> #<marker at 1821 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\.newc\.cpio> #<marker at 1945 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\.newc\.cpio> #<marker at 2069 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\.d\" \.
-  \[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\.d\"]
-   #<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\.newc\.cpio> #<marker at 2197 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.aux\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 
\"aa\.aux\"]
-   #<marker at 2197 in alphabet_small\.newc\.cpio> #<marker at 2317 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.aux\"]
+\\s-+#<marker at 2197 in alphabet_small\.newc\.cpio> #<marker at 2317 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.bak\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 
\"aa\.bak\"]
-   #<marker at 2325 in alphabet_small\.newc\.cpio> #<marker at 2445 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.bak\"]
+\\s-+#<marker at 2325 in alphabet_small\.newc\.cpio> #<marker at 2445 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.dvi\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 
\"aa\.dvi\"]
-   #<marker at 2453 in alphabet_small\.newc\.cpio> #<marker at 2573 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.dvi\"]
+\\s-+#<marker at 2453 in alphabet_small\.newc\.cpio> #<marker at 2573 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.log\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 
\"aa\.log\"]
-   #<marker at 2581 in alphabet_small\.newc\.cpio> #<marker at 2701 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.log\"]
+\\s-+#<marker at 2581 in alphabet_small\.newc\.cpio> #<marker at 2701 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.orig\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aa\.orig\"]
-   #<marker at 2709 in alphabet_small\.newc\.cpio> #<marker at 2829 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aa\.orig\"]
+\\s-+#<marker at 2709 in alphabet_small\.newc\.cpio> #<marker at 2829 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.rej\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 
\"aa\.rej\"]
-   #<marker at 2837 in alphabet_small\.newc\.cpio> #<marker at 2957 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.rej\"]
+\\s-+#<marker at 2837 in alphabet_small\.newc\.cpio> #<marker at 2957 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
  (\"aa\.toc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 
\"aa\.toc\"]
-   #<marker at 2965 in alphabet_small\.newc\.cpio> #<marker at 3085 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.toc\"]
+\\s-+#<marker at 2965 in alphabet_small\.newc\.cpio> #<marker at 3085 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
 " cpio-catalog-contents-after)))
     (cdmt-test-save)))
 
@@ -15464,7 +15553,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
         (cpio-dired-buffer)
         (cpio-dired-buffer-contents)
        (cpio-catalog-contents-before)
-       (cpio-catalog-contents-after))
+       !(cpio-catalog-contents-after))
 
     (cdmt-reset 'make)
 
@@ -15661,6 +15750,7 @@ cpio-mouse-face is not yet implemented -- expect an 
error."
   (should-error (cpio-mouse-face)
      :type 'error))
 
+
 (ert-deftest cdmt-revert-buffer ()
   "Test revert-buffer.
 revert-buffer is not yet implemented -- expect an error."
@@ -16050,100 +16140,100 @@ newDirectory        (( filename ))
 " cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with a new directory called 
»newDirectory«."
                 (string-match "((\"newDirectory\" \\.
-  [[1 16877 [[:digit:]]+ [[:digit:]]+ 1
-      ([[:digit:]]+ [[:digit:]]+)
-      0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 13 0 
\"newDirectory\"]
-   #<marker at 2197 in alphabet_small\\.newc\\.cpio> #<marker at 2321 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[1 16877 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 13 0 
\"newDirectory\"]
+\\s-+#<marker at 2197 in alphabet_small\\.newc\\.cpio> #<marker at 2321 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"a\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small\\.newc\\.cpio> #<marker at 113 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small\\.newc\\.cpio> #<marker at 113 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"aa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 117 in alphabet_small\\.newc\\.cpio> #<marker at 233 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 117 in alphabet_small\\.newc\\.cpio> #<marker at 233 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"aaa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 241 in alphabet_small\\.newc\\.cpio> #<marker at 357 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 241 in alphabet_small\\.newc\\.cpio> #<marker at 357 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"aaaa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"aaaa\"]
-   #<marker at 365 in alphabet_small\\.newc\\.cpio> #<marker at 481 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 365 in alphabet_small\\.newc\\.cpio> #<marker at 481 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"aaaaa\"]
-   #<marker at 489 in alphabet_small\\.newc\\.cpio> #<marker at 605 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 489 in alphabet_small\\.newc\\.cpio> #<marker at 605 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"aaaaa\\.d\" \\.
-  [[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"aaaaa\\.d\"]
-   #<marker at 613 in alphabet_small\\.newc\\.cpio> #<marker at 733 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\\.d\"]
+\\s-+#<marker at 613 in alphabet_small\\.newc\\.cpio> #<marker at 733 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"b\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 733 in alphabet_small\\.newc\\.cpio> #<marker at 845 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 733 in alphabet_small\\.newc\\.cpio> #<marker at 845 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"bb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 849 in alphabet_small\\.newc\\.cpio> #<marker at 965 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 849 in alphabet_small\\.newc\\.cpio> #<marker at 965 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"bbb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 973 in alphabet_small\\.newc\\.cpio> #<marker at 1089 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 973 in alphabet_small\\.newc\\.cpio> #<marker at 1089 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"bbbb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"bbbb\"]
-   #<marker at 1097 in alphabet_small\\.newc\\.cpio> #<marker at 1213 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 1097 in alphabet_small\\.newc\\.cpio> #<marker at 1213 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"bbbbb\"]
-   #<marker at 1221 in alphabet_small\\.newc\\.cpio> #<marker at 1337 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 1221 in alphabet_small\\.newc\\.cpio> #<marker at 1337 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"bbbbb\\.d\" \\.
-  [[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"bbbbb\\.d\"]
-   #<marker at 1345 in alphabet_small\\.newc\\.cpio> #<marker at 1465 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\\.d\"]
+\\s-+#<marker at 1345 in alphabet_small\\.newc\\.cpio> #<marker at 1465 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"c\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1465 in alphabet_small\\.newc\\.cpio> #<marker at 1577 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1465 in alphabet_small\\.newc\\.cpio> #<marker at 1577 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"cc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1581 in alphabet_small\\.newc\\.cpio> #<marker at 1697 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1581 in alphabet_small\\.newc\\.cpio> #<marker at 1697 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"ccc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1705 in alphabet_small\\.newc\\.cpio> #<marker at 1821 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1705 in alphabet_small\\.newc\\.cpio> #<marker at 1821 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"cccc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 
\"cccc\"]
-   #<marker at 1829 in alphabet_small\\.newc\\.cpio> #<marker at 1945 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1829 in alphabet_small\\.newc\\.cpio> #<marker at 1945 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 
\"ccccc\"]
-   #<marker at 1953 in alphabet_small\\.newc\\.cpio> #<marker at 2069 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1953 in alphabet_small\\.newc\\.cpio> #<marker at 2069 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified])
  (\"ccccc\\.d\" \\.
-  [[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
-             ([[:digit:]]+ [[:digit:]]+)
-             0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 
\"ccccc\\.d\"]
-   #<marker at 2077 in alphabet_small\\.newc\\.cpio> #<marker at 2197 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified]))
+\\s-+[[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\\.d\"]
+\\s-+#<marker at 2077 in alphabet_small\\.newc\\.cpio> #<marker at 2197 in 
alphabet_small\\.newc\\.cpio> cpio-mode-entry-unmodified]))
 " cpio-catalog-contents-after)))
     
     (cdmt-test-save)))
diff --git a/cpio-newc.el b/cpio-newc.el
index d0dbda5..e3f62e9 100644
--- a/cpio-newc.el
+++ b/cpio-newc.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cpio-newc.el --- handle portable SVR4 cpio entry header formats.
-;      $Id: cpio-newc.el,v 1.7 2018/06/03 14:01:55 doug Exp $  
+;      $Id: cpio-newc.el,v 1.8 2018/06/09 05:20:12 doug Exp $  
 
 ;; COPYRIGHT
 ;; 
@@ -289,7 +289,7 @@ in a newc cpio archive.")
   (defconst *cpio-newc-name-field-offset*     (+ l (* *cpio-newc-field-width* 
i)))
   (setq *cpio-newc-name-field-offset*         (+ l (* *cpio-newc-field-width* 
(1- i)))))
 
-(defconst *cpio-newc-trailer 
"07070100000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000B00000000TRAILER!!!\0\0\0\0"
+(defconst *cpio-newc-trailer* 
"07070100000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000B00000000TRAILER!!!\0\0\0\0"
   "The TRAILER string for a newc archive.")
 
 (defcustom *cpio-newc-blocksize* 512
@@ -335,7 +335,7 @@ CAVEATS:
 ;; 
 
 (defun cpio-newc-parse-header (header-string)
-  "Return the internal entry header structure encoded in HEADER-STR.
+  "Return the internal entry header structure encoded in HEADER-STRING.
 The optional argument WHERE should be a buffer location
 at the beginning of a known cpio newc header.
 If WHERE is not given, then take point and hope.
@@ -573,8 +573,7 @@ Since we're writing a NEWC CPIO header it must be < 8 
digits.
 N.B. On my 64 bit machine most-positive-fixnum is 2305843009213693951.
 I likely won't need this, but someone might."
   (let ((fname "cpio-newc-big-inode-to-string")
-       (hex-digit-count (integer-hex-digits))
-       (formatter))
+       (hex-digit-count (integer-hex-digits)))
     (hex-format-pair ino)))
 
 (defun cpio-newc-make-mode (attrs)
diff --git a/cpio.el b/cpio.el
index d363838..cd17071 100644
--- a/cpio.el
+++ b/cpio.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cpio.el --- cpio-mode for emacs
-;      $Id: cpio.el,v 1.7 2018/06/03 14:01:56 doug Exp $       
+;      $Id: cpio.el,v 1.8 2018/06/09 05:20:12 doug Exp $       
 
 ;; COPYRIGHT 2015, 2017, 2018 Douglas Lewan, address@hidden
 
@@ -261,9 +261,6 @@ Takes the values 'bin, 'newc, 'odc etc.")
 
 ;; N.B. The format REs go here since they are what we use
 ;; to discern the type of the archive.
-(defvar *cpio-bin-header-re* "nOt yEt iMpLeMeNtEd"
-  "RE to match BIN format cpio archives.")
-(setq *cpio-bin-header-re* "nOt yEt iMpLeMeNtEd")
 
 (defvar *cpio-tar-header-re* "nOt yEt iMpLeMeNtEd"
   "RE to match tar format cpio archives.")
@@ -539,6 +536,9 @@ A parsed header is a vector of the following form:
 (defvar *cpio-padding-str* ()
   "A single character string of the character to be used for building padded 
strings.")
 
+(defvar *cpio-archive-syntax-table* ()
+  "Every character in a cpio archive has word syntax.")
+
 
 ;;
 ;; Customizations
@@ -563,6 +563,13 @@ and NIL if the current buffer does not begin with a cpio 
entry header."
   ;; Maybe each format needs a function.
   (let ((fname "cpio-discern-archive-type")
        (this-archive-type))
+    (unless *cpio-archive-syntax-table*
+      (setq *cpio-archive-syntax-table* (make-syntax-table))
+      (let ((i 0))
+       (while (< i #x100)
+         (modify-syntax-entry i "w" *cpio-archive-syntax-table*)
+         (setq i (1+ i)))))
+    (set-syntax-table *cpio-archive-syntax-table*)
     (save-excursion
       (widen)
       (goto-char (point-min))
@@ -1343,7 +1350,7 @@ Signal an error if it isn't."
 (define-derived-mode cpio-mode fundamental-mode "cpio-mode"
   "Treat cpio archives like file systems with a dired UI."
   (if (null (setq *cpio-format* (cpio-discern-archive-type)))
-      (error "You're not in a supported CPIO buffer."))
+      (error "You're not in a supported CPIO buffer. It begins [[%s]]." 
(buffer-substring-no-properties 1 8)))
   (message "You're in a cpio buffer of type [[%s]]." (symbol-name 
*cpio-format*)) ; (sit-for 1.0)
   (let ((archive-buffer (current-buffer))
        (cpio-dired-buffer))
@@ -1520,7 +1527,13 @@ See *cpio-local-funcs* for more information."
 
 (defun cpio-set-local-bin-vars ()
   "Set buffer local variables appropriate for a BIN format CPIO archive."
-  (let ((fname "cpio-set-local-bin-vars"))))
+  (let ((fname "cpio-set-local-bin-vars"))
+    (make-local-variable '*cpio-padding-modulus*)
+    (setq *cpio-padding-modulus* *cpio-bin-padding-modulus*)
+    (make-local-variable '*cpio-padding-char*)
+    (setq *cpio-padding-char* *cpio-bin-padding-char*)
+    (make-local-variable '*cpio-padding-str*)
+    (setq *cpio-padding-str* *cpio-bin-padding-str*)))
 
 (defun cpio-set-local-newc-vars ()
   "Set buffer local variables appropriate for a NEWC format CPIO archive."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]