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

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

[elpa] externals/cpio-mode 8047799 42/61: Version 0.07 -- fontification


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

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

    Version 0.07 -- fontification
---
 Makefile.in                 |   31 +-
 NEWS                        |   20 +-
 THANKS                      |    3 +-
 cab-test.el                 |   71 +-
 configure.ac                |    4 +-
 cpio-affiliated-buffers.el  |   11 +-
 cpio-crc.el                 |   14 +-
 cpio-dired-crc-test.el      | 2095 ++------------
 cpio-dired-odc-test.el      | 6740 ++++++++++++++++---------------------------
 cpio-dired-test.el          | 2339 ++-------------
 cpio-dired.el               |  334 ++-
 cpio-entry-contents-mode.el |   11 +-
 cpio-modes.el               |    9 +-
 cpio-newc.el                |   13 +-
 cpio-odc.el                 |   13 +-
 cpio.el                     |  137 +-
 16 files changed, 3347 insertions(+), 8498 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 23f3ae8..7503646 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: makefile; coding: utf-8 -*-
-#      $Id: Makefile.in,v 1.4 2018/05/12 16:35:59 doug Exp $   
+#      $Id: Makefile.in,v 1.5 2018/06/03 14:01:54 doug Exp $   
 
 # 
 # Copyright © 2013, 2014, 2015, 2016, 2017, 2018 
@@ -46,11 +46,14 @@ APP_FILES   =       cpio-bin.el                     \
                        cpio-tar.el                     \
                        cpio-ustar.el                   \
                        cpio-wanted.el
+
 TEST_FILES     =       cab-test.el                     \
-                       cpio-modes-test.el              \
-                       cpio-newc-tests.el              \
-                       cpio-tests.el                   \
-                       cpio-generic-tests.el
+                       cpio-dired-crc-test.el          \
+                       cpio-dired-odc-test.el          \
+                       cpio-dired-test.el              \
+                       cpio-modes-test.el
+
+
 SUPPORT_FILES  =       cpio-affiliated-buffers.el      \
                        cpio-generic.el                 \
                        cpio-modes.el
@@ -155,7 +158,23 @@ check_gnu:
 # Testing
 # 
 
-check: all
+.PHONY: check check_cab installcheck
+check:
+       for f in ${TEST_FILES} ; do                                             
                \
+               echo 
"################################################################" ;       \
+               echo "# "                                                       
        ;       \
+               echo "# Running tests in $${f}."                                
        ;       \
+               echo "# "                                                       
        ;       \
+               emacs -batch -Q -l ert -l $${f} -f ert-run-tests-batch-and-exit 
        ;       \
+               echo "# "                                                       
        ;       \
+               echo "# EO tests in $${f}."                                     
        ;       \
+               echo "# "                                                       
        ;       \
+               echo 
"################################################################" ;       \
+               echo ; echo ; echo                                              
        ;       \
+       done
+
+check_cab:
+       emacs -batch -Q -l ert -l cab-test.el -f ert-run-tests-batch-and-exit
 
 installcheck: check
 
diff --git a/NEWS b/NEWS
index 7da0d74..1462f84 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,16 @@
 # -*- outline -*-
-#      $Id: NEWS,v 1.4 2018/05/18 23:55:29 doug Exp $  
+#      $Id: NEWS,v 1.6 2018/06/03 14:01:54 doug Exp $  
+
+* Version 0.07
+** Fontification (from dired).
+** Dired-like commands:
+   + cpio-dired-flag-backup-entries ("~")
 
 * Version 0.06
 ** Support for the ODC archive format.
+   Note that hpodc = odc if the archive contains no devices,
+   and cpio-mode doesn't handle devices yes.
+   (And it may never.)
 
 * Version 0.05
 ** Support for the CRC archive format.
@@ -12,11 +20,11 @@
 
 * Version 0.03
 ** More dired-like commands:
-   + cpio-dired-flag-garbage-entries
-   + cpio-dired-goto-entry
-   + cpio-dired-mark-executables
-   + cpio-dired-marek-subdir-entries
-   + cpio-dired-mark-symlinks
+   + cpio-dired-flag-garbage-entries ("%&")
+   + cpio-dired-goto-entry ("j")
+   + cpio-dired-mark-executables ("**")
+   + cpio-dired-mark-subdir-entries ("*s")
+   + cpio-dired-mark-symlinks ("*@")
 ** Fixes to saving an archive.
 ** Fixes to cpio-dired-do-chgrp/own/mod.
 ** Automated test updates:
diff --git a/THANKS b/THANKS
index ad27027..9f70ae6 100644
--- a/THANKS
+++ b/THANKS
@@ -1,7 +1,8 @@
-#      $Id: THANKS,v 1.2 2018/05/12 16:36:00 doug Exp $        
+#      $Id: THANKS,v 1.3 2018/06/03 14:01:54 doug Exp $        
 
 Thanks to the following people for helping me
 get cpio-mode up and running.
 
 Michael Albinus <address@hidden>, for pointing out similar functions now 
available in TRAMP.
 Sergey Poznyakoff <address@hidden>, for consultation about the structure of 
cpio archives.
+Sebastrian Kremer <address@hidden> et al., for providing the dired code that 
has guided me on occasion and performed fontification for me outright.
diff --git a/cab-test.el b/cab-test.el
index 5bd4657..452cedc 100644
--- a/cab-test.el
+++ b/cab-test.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cab-text.el --- brief description
-;      $Id: cab-test.el,v 1.2 2018/05/12 16:36:00 doug Exp $   
+;      $Id: cab-test.el,v 1.3 2018/06/03 14:01:54 doug Exp $   
 
 ;; COPYRIGHT
 
@@ -193,19 +193,20 @@
 (ert-deftest cab-test-deregister-1 ()
   "Test deregistering the registry established in (cab-test-registry-1)."
   (let ((fname "cab-test-registry-1")
-       (parent (get-buffer-create "p1"))
-       (buffer (get-buffer-create "b2")))
+       (parent (find-file-noselect "p1"))
+       (buffer (find-file-noselect "b2")))
     (message "%s(): Entering." fname)
 
     (cab-register buffer parent)
     (cab-deregister buffer)
 
-    (should (progn (message "%s(): 203" fname)
-                  (equal (with-current-buffer parent
-                           *cab-subordinates*)
-                         ())))
+    (message "%s(): 203" fname)
+    (with-current-buffer parent 
+      (mapc (lambda (sb)
+             (should (null (buffer-live-p sb))))
+           *cab-subordinates*))
 
-    (setq buffer (get-buffer-create "b2"))
+    (setq buffer (find-file-noselect "b2"))
     (cab-register buffer parent)
     (cab-deregister parent)
     (should (progn (message "%s(): 211" fname)
@@ -217,9 +218,9 @@
 (ert-deftest cab-test-deregister-2 ()
   "Test deregistering the registry established in (cab-test-registry-2)."
   (let ((fname "cab-test-registry-2")
-       (parent (get-buffer-create "p2"))
-       (buffer-1 (get-buffer-create "b21"))
-       (buffer-2 (get-buffer-create "b22")))
+       (parent (find-file-noselect "p2"))
+       (buffer-1 (find-file-noselect "b21"))
+       (buffer-2 (find-file-noselect "b22")))
     (message "%s(): Entering." fname)
 
     (cab-register buffer-1 parent)
@@ -239,8 +240,8 @@
                        (length *cab-subordinates*))
                      0)))
 
-    (setq buffer-1 (get-buffer-create "b21"))
-    (setq buffer-2 (get-buffer-create "b22"))
+    (setq buffer-1 (find-file-noselect "b21"))
+    (setq buffer-2 (find-file-noselect "b22"))
     (cab-register buffer-1 parent)
     (cab-register buffer-2 parent)
     (cab-deregister parent)
@@ -253,14 +254,14 @@
 (ert-deftest cab-test-deregister-3 ()
   "Test deregistering the registry established in (cab-test-registry-3)."
   (let ((fname "cab-test-deregister-3")
-       (grandparent    (get-buffer-create "gp3"))
-       (parent-1       (get-buffer-create "p31"))
-       (parent-2       (get-buffer-create "p32"))
-       (grandchild-311 (get-buffer-create "b311"))
-       (grandchild-312 (get-buffer-create "b312"))
-       (grandchild-313 (get-buffer-create "b313"))
-       (grandchild-321 (get-buffer-create "b321"))
-       (grandchild-322 (get-buffer-create "b322")))
+       (grandparent    (find-file-noselect "gp3"))
+       (parent-1       (find-file-noselect "p31"))
+       (parent-2       (find-file-noselect "p32"))
+       (grandchild-311 (find-file-noselect "b311"))
+       (grandchild-312 (find-file-noselect "b312"))
+       (grandchild-313 (find-file-noselect "b313"))
+       (grandchild-321 (find-file-noselect "b321"))
+       (grandchild-322 (find-file-noselect "b322")))
     (message "%s(): Entering." fname)
 
     (cab-register parent-1       grandparent)
@@ -308,8 +309,8 @@
   "Tests killing in the hierarchy created in (cab-test-registry-1)."
 
   (let ((fname "cab-test-kill-1")
-       (parent (get-buffer-create "p1"))
-       (child (get-buffer-create "b2")))
+       (parent (find-file-noselect "p1"))
+       (child (find-file-noselect "b2")))
     (message "%s(): Entering." fname)
 
     (should (cond ((buffer-live-p parent)
@@ -342,7 +343,7 @@
                   (message "    Testing if killed child [[%s]] is still a 
member of parent [[%s]]." child parent)
                   (member child (with-current-buffer parent 
*cab-subordinates*))))
 
-    (setq child (get-buffer-create "b2"))
+    (setq child (find-file-noselect "b2"))
     (cab-register child parent)
 
     (should (progn (message "%s(): 349" fname)
@@ -362,9 +363,9 @@
 (ert-deftest cab-test-kill-2 ()
   "Tests killing in the hierarchy established in (cab-test-registry-2)."
   (let ((fname "cab-test-kill-2")
-       (parent (get-buffer-create "p2"))
-       (child-1 (get-buffer-create "b21"))
-       (child-2 (get-buffer-create "b22")))
+       (parent (find-file-noselect "p2"))
+       (child-1 (find-file-noselect "b21"))
+       (child-2 (find-file-noselect "b22")))
     (message "%s(): Entering." fname)
 
     (cab-register child-1 parent)
@@ -426,14 +427,14 @@
 (ert-deftest cab-test-kill-3 ()
   "Test killing a 3 level hierarchy."
   (let ((fname "cab-test-kill-3")
-       (grandparent    (get-buffer-create "gp3"))
-       (parent-1       (get-buffer-create "p31"))
-       (parent-2       (get-buffer-create "p32"))
-       (grandchild-311 (get-buffer-create "b311"))
-       (grandchild-312 (get-buffer-create "b312"))
-       (grandchild-313 (get-buffer-create "b313"))
-       (grandchild-321 (get-buffer-create "b321"))
-       (grandchild-322 (get-buffer-create "b322")))
+       (grandparent    (find-file-noselect "gp3"))
+       (parent-1       (find-file-noselect "p31"))
+       (parent-2       (find-file-noselect "p32"))
+       (grandchild-311 (find-file-noselect "b311"))
+       (grandchild-312 (find-file-noselect "b312"))
+       (grandchild-313 (find-file-noselect "b313"))
+       (grandchild-321 (find-file-noselect "b321"))
+       (grandchild-322 (find-file-noselect "b322")))
     (message "%s(): Entering." fname)
 
     (cab-register parent-1       grandparent)
diff --git a/configure.ac b/configure.ac
index 3fb660c..4b43f3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-dnl    $Id: configure.ac,v 1.4 2018/05/18 23:55:29 doug Exp $  
+dnl    $Id: configure.ac,v 1.6 2018/06/03 14:01:54 doug Exp $  
 
 # 
 # Copyright © 2015, 2017, 2018 Douglas Lewan, address@hidden
@@ -20,7 +20,7 @@ dnl   $Id: configure.ac,v 1.4 2018/05/18 23:55:29 doug Exp $
 # 
 
 dnl Autoconf requirements
-AC_INIT(cpio-mode, 0.06, address@hidden)
+AC_INIT(cpio-mode, 0.07, address@hidden)
 AC_PREFIX_DEFAULT(${HOME}/local)
 dnl information on the package
 dnl checks for programs
diff --git a/cpio-affiliated-buffers.el b/cpio-affiliated-buffers.el
index 0ddadc8..eb148c8 100644
--- a/cpio-affiliated-buffers.el
+++ b/cpio-affiliated-buffers.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cpio-affiliated-buffers.el --- Establish and manage buffers affiliated 
with each other.
-;      $Id: cpio-affiliated-buffers.el,v 1.2 2018/05/12 16:36:00 doug Exp $    
+;      $Id: cpio-affiliated-buffers.el,v 1.3 2018/06/03 14:01:55 doug Exp $    
 
 ;; COPYRIGHT
 
@@ -102,7 +102,7 @@
 CONTRACT: BUFFER and PARENT are buffers."
   (let ((fname "cab-registered-p"))
     (with-current-buffer parent
-      (not (member buffer *cab-subordinates*)))))
+      (member buffer *cab-subordinates*))))
 
 (defun cab-kill-buffer-hook ()
   "Deregister the current buffer when it is killed."
@@ -112,7 +112,6 @@ CONTRACT: BUFFER and PARENT are buffers."
           (mapc 'cab-deregister *cab-subordinates*))
          (t nil))))
 
-
 (defun cab-deregister (&optional buffer)
   "Deregister and kill BUFFER and all its subordinate buffers.
 Remove its entry in its parent buffer."
@@ -129,7 +128,11 @@ Remove its entry in its parent buffer."
           (message "    About to use parent: [[%s]]." parent)
           (if (and parent (bufferp parent) (buffer-live-p parent))
               (with-current-buffer parent
-                (setq *cab-subordinates* (delete buffer *cab-subordinates*))))
+                (setq *cab-subordinates* (delete buffer *cab-subordinates*))
+                (mapc (lambda (sb)
+                        (unless (buffer-live-p sb)
+                          (setq *cab-subordinates* (delete buffer 
*cab-subordinates*))))
+                      *cab-subordinates*)))
           (remove-hook 'kill-buffer-hook 'cab-simple-deregister)
           (kill-buffer buffer))
          (t t))))
diff --git a/cpio-crc.el b/cpio-crc.el
index fc102ed..df12d6d 100644
--- a/cpio-crc.el
+++ b/cpio-crc.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cpio-crc.el --- handle crc cpio entry header formats
-;      $Id: cpio-crc.el,v 1.6 2018/05/21 21:21:16 doug Exp $   
+;      $Id: cpio-crc.el,v 1.7 2018/06/03 14:01:55 doug Exp $   
 
 ;; COPYRIGHT
 ;; 
@@ -161,13 +161,13 @@ CAVEATS:
        (found nil))
     (save-match-data
       (cond ((looking-at *cpio-newc-header-re*)
-            (match-string 0))
+            (match-string-no-properties 0))
            (t
             (forward-char (length *cpio-newc-magic-re*))
             (while (and (re-search-backward *cpio-newc-magic-re* (point-min) t)
                         (not (setq found (looking-at *cpio-newc-header-re*)))))
             (if found 
-                (match-string 0)))))))
+                (match-string-no-properties 0)))))))
 (setq cpio-header-at-point-func 'cpio-newc-header-at-point)
 
 ;;;;;;;;;;;;;;;;
@@ -286,13 +286,11 @@ This function does NOT include the contents."
        (result 0)
        (contents (if (cpio-entry-exists-p entry-name-or-contents)
                      (cpio-contents entry-name-or-contents)
-                   entry-name-or-contents))
-       )
+                   entry-name-or-contents)))
     ;; According to the info this is only populated for crc archives.
     ;; It has always been 00000000 for my concrete newc examples.
     ;; And, indeed, it's only set in crc archives.
     ;; See copyout.c->writeout-defered-file() and nowhere else.
-    ;; (error "%s(): is not yet implemented." fname)))
     (mapc (lambda (c)
            (setq result (+ result c)))
          contents)
@@ -324,7 +322,7 @@ This sets match-data for the entire header and each field."
        (header-string))
     (cond ((re-search-forward *cpio-crc-header-re* (point-max) t)
           (setq header-start (goto-char (match-beginning 0)))
-          (setq header-string (match-string 0))
+          (setq header-string (match-string-no-properties 0))
           (cons (point-marker) header-string))
          (t nil))))
 
@@ -384,7 +382,7 @@ CAVEAT: This respects neither narrowing nor the point."
 
 (defun cpio-crc-adjust-trailer ()
   "Replace thed current trailer in the current cpio crc archive."
-  (let* ((fname "cpio-crc-adjust-trailer"))
+  (let ((fname "cpio-crc-adjust-trailer"))
     (cpio-crc-delete-trailer)
     (cpio-crc-insert-trailer)))
 
diff --git a/cpio-dired-crc-test.el b/cpio-dired-crc-test.el
index d071f21..a70f769 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.2 2018/05/18 23:55:30 doug Exp $        
+;      $Id: cpio-dired-crc-test.el,v 1.3 2018/06/03 14:01:55 doug Exp $        
 
 ;; COPYRIGHT
 
@@ -6520,7 +6520,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))
+           (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 +6540,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))
+    (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))
@@ -6569,22 +6569,22 @@ then the entry names will be incorrect."
   (let ((fname "cdmt-crc-reformat-crc-headers"))
     (while (string-match *cpio-crc-header-re* archive-contents)
       (setq archive-contents (concat (substring archive-contents 0 
(match-beginning 0))
-                                    (concat (match-string 
*cpio-crc-magic-re-idx*    archive-contents) "\t(( magic    ))\n")
+                                    (concat (match-string-no-properties 
*cpio-crc-magic-re-idx*    archive-contents) "\t(( magic    ))\n")
                                     (concat "DEADBEEF"                         
                         "\t(( ino      ))\n")
-                                    (concat (match-string 
*cpio-crc-mode-re-idx*     archive-contents) "\t(( mode     ))\n")
-                                    (concat (match-string 
*cpio-crc-uid-re-idx*      archive-contents) "\t(( uid      ))\n")
-                                    (concat (match-string 
*cpio-crc-gid-re-idx*      archive-contents) "\t(( gid      ))\n")
-                                    (concat (match-string 
*cpio-crc-nlink-re-idx*    archive-contents) "\t(( nlink    ))\n")
+                                    (concat (match-string-no-properties 
*cpio-crc-mode-re-idx*     archive-contents) "\t(( mode     ))\n")
+                                    (concat (match-string-no-properties 
*cpio-crc-uid-re-idx*      archive-contents) "\t(( uid      ))\n")
+                                    (concat (match-string-no-properties 
*cpio-crc-gid-re-idx*      archive-contents) "\t(( gid      ))\n")
+                                    (concat (match-string-no-properties 
*cpio-crc-nlink-re-idx*    archive-contents) "\t(( nlink    ))\n")
                                     ;; Note that the mod time can change.
                                     (concat "DEADBEEF"                         
                         "\t(( mtime    ))\n")
-                                    (concat (match-string 
*cpio-crc-filesize-re-idx* archive-contents) "\t(( filesize ))\n")
+                                    (concat (match-string-no-properties 
*cpio-crc-filesize-re-idx* archive-contents) "\t(( filesize ))\n")
                                     (concat "DEADBEEF"                         
                         "\t(( dev maj  ))\n")
                                     (concat "DEADBEEF"                         
                         "\t(( dev min  ))\n")
                                     (concat "DEADBEEF"                         
                         "\t(( rdev maj ))\n")
                                     (concat "DEADBEEF"                         
                         "\t(( rdev min ))\n")
-                                    (concat (match-string 
*cpio-crc-namesize-re-idx* archive-contents) "\t(( namesize ))\n")
-                                    (concat (match-string 
*cpio-crc-chksum-re-idx*   archive-contents) "\t(( chksum   ))\n")
-                                    (concat (match-string 
*cpio-crc-filename-re-idx* archive-contents) "\t(( filename ))\n")
+                                    (concat (match-string-no-properties 
*cpio-crc-namesize-re-idx* archive-contents) "\t(( namesize ))\n")
+                                    (concat (match-string-no-properties 
*cpio-crc-chksum-re-idx*   archive-contents) "\t(( chksum   ))\n")
+                                    (concat (match-string-no-properties 
*cpio-crc-filename-re-idx* archive-contents) "\t(( filename ))\n")
                                     (substring archive-contents (match-end 
0)))))
     (concat archive-contents "\n")))
 
@@ -6828,7 +6828,7 @@ to help make tests pass correctly."
     (search-forward "filename")
     (beginning-of-line)
     (looking-at "[[:graph:]]+")
-    (setq entry-name (match-string 0))
+    (setq entry-name (match-string-no-properties 0))
     (other-window 2)
     (insert (format "%s:\t%06o\n" entry-name (string-to-number mode-hex-string 
16)))
     (other-window 2)
@@ -6944,9 +6944,7 @@ to check that the saved archive seems sane."
                       (cons "ccc" 327)
                       (cons "cccc" 426)
                       (cons "ccccc" 525)
-                      (cons "ccccc.d" 0)))
-       )
-    ;; (error "%s() is not yet implemented" fname)
+                      (cons "ccccc.d" 0))))
     (mapc (lambda (info)
            (let ((name   (car info))
                  (chksum (cdr info)))
@@ -7009,1799 +7007,6 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
   (should-error (cpio-dired-isearch-entry-names-regexp)
      :type 'error))
 
-;;;;;;;; This gets an end-of-buffer error under ERT.
-;;;;;;;; (ert-deftest cdmt-crc-cpio-dired-save-archive-0 () ;✓
-;;;;;;;;   "Test the function of M-x cpio-dired-save-archive."
-;;;;;;;;   (let ((test-name "cdmt-crc-cpio-dired-save-archive")
-;;;;;;;;         (cpio-archive-buffer)
-;;;;;;;;       (cpio-archive-buffer-contents-before)
-;;;;;;;;         (cpio-archive-buffer-contents)
-;;;;;;;;         (cpio-dired-buffer)
-;;;;;;;;         (cpio-dired-buffer-contents-before)
-;;;;;;;;         (cpio-dired-buffer-contents)
-;;;;;;;;         )
-;;;;;;;;     (cdmt-crc-reset 'make)
-
-;;;;;;;;     (progn (goto-char (point-min))
-;;;;;;;;          (re-search-forward " aa$" (point-max))
-;;;;;;;;          (cpio-dired-do-delete 1)
-;;;;;;;;          (setq cpio-archive-buffer-contents-before
-;;;;;;;;                (cdmt-crc-filter-archive-contents (with-current-buffer 
cpio-archive-buffer
-;;;;;;;;                                                
(buffer-substring-no-properties (point-min) (point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents-before (with-current-buffer 
cpio-dired-buffer
-;;;;;;;;                                                    
(buffer-substring-no-properties (point-min) (point-max)))))
-    
-;;;;;;;;     (should (and "Archive buffer should be modified."
-;;;;;;;;                (buffer-modified-p cpio-archive-buffer)))
-;;;;;;;;     (should (and "Archive buffer should be missing exactly the entry 
for aa."
-;;;;;;;;                (string-equal "070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaa  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; b     (( filename ))
-
-;;;;;;;; b
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bb    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070702       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbb   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070702       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 00000000      (( mode     ))
-;;;;;;;; 00000000      (( uid      ))
-;;;;;;;; 00000000      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000B      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-;;;;;;;;     (should (and "Checking dired-style buffer before saving."
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.crc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbbb
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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-before)))
-
-;;;;;;;;     (progn (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-crc-filter-archive-contents 
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-    
-;;;;;;;;     ;; (cdmt-crc-do-cpio-id (count-lines (point-min)(point)) 
(file-name-nondirectory *cdmt-crc-small-archive*))
-    
-;;;;;;;;     (should (and "Archive buffer should no longer be modified."
-;;;;;;;;                (not (buffer-modified-p cpio-archive-buffer))))
-;;;;;;;;     (should (and "Checking the archive buffer after saving."
-;;;;;;;;                (string-equal "070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaa  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; b     (( filename ))
-
-;;;;;;;; b
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bb    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070702       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbb   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070702       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 00000000      (( mode     ))
-;;;;;;;; 00000000      (( uid      ))
-;;;;;;;; 00000000      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000B      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     (should (and "Checking the dired-style buffer after saving."
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.crc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbbb
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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)))
-
-;;;;;;;;     ;; The archive strings should be identical up to the TRAILER!!! 
padding.
-;;;;;;;;     ;; NO! Padding after any added, deleted or changed entry will 
also change.
-;;;;;;;;     ;; (string-match "TRAILER!!!" cpio-archive-buffer-contents-before)
-;;;;;;;;     ;; (setq cpio-archive-buffer-contents-before (substring 
cpio-archive-buffer-contents-before 0 (match-end 0)))
-;;;;;;;;     ;; (string-match "TRAILER!!!" cpio-archive-buffer-contents)
-;;;;;;;;     ;; (setq cpio-archive-buffer-contents (substring 
cpio-archive-buffer-contents 0 (match-end 0)))
-;;;;;;;;     ;; (should (string-equal cpio-archive-buffer-contents-before 
cpio-archive-buffer-contents))
-
-;;;;;;;;     (should (and "The dired style buffer should not have changed."
-;;;;;;;;                (string-equal cpio-dired-buffer-contents-before 
cpio-dired-buffer-contents)))
-
-;;;;;;;;     (cdmt-crc-reset)
-
-;;;;;;;;     (progn (goto-char (point-min))
-;;;;;;;;          (re-search-forward " aaaa$" (point-max))
-;;;;;;;;          (setq unread-command-events (listify-key-sequence "dddd\n"))
-;;;;;;;;          (cpio-dired-do-rename 1)
-;;;;;;;;          (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-crc-filter-archive-contents
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-
-;;;;;;;;     ;; (cdmt-crc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-crc-small-archive*))
-    
-;;;;;;;;     (should (and "Expecting the standard archive with aaaa moved to 
ddddd."
-;;;;;;;;                (string-equal "070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; b     (( filename ))
-
-;;;;;;;; b
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bb    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070702       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbb   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070702       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; dddd  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 00000000      (( mode     ))
-;;;;;;;; 00000000      (( uid      ))
-;;;;;;;; 00000000      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000B      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     (should (and "Expecting a dired style buffer without aaaa."
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.crc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbbb
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} dddd
-;;;;;;;; " cpio-dired-buffer-contents)))
-    
-;;;;;;;;     (cdmt-crc-reset)
-    
-;;;;;;;;     (progn (goto-char (point-min))
-;;;;;;;;          (re-search-forward " b$" (point-max))
-;;;;;;;;          (cpio-dired-mark 4)
-;;;;;;;;          (setq unread-command-events (listify-key-sequence "d\n"))
-;;;;;;;;          (cpio-dired-do-rename 1)
-;;;;;;;;          (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-crc-filter-archive-contents
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-
-;;;;;;;;     ;; (cdmt-crc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-crc-small-archive*))
-
-;;;;;;;;     (should (and "Expecting a small archive with d/b, d/bb, d/bbb, 
d/bbbb."
-;;;;;;;;                (string-equal "070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070702       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; dddd  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000007      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; d/bbbb        (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; d/bbb (( filename ))
-
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; d/bb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070702       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; d/b   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; b
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 00000000      (( mode     ))
-;;;;;;;; 00000000      (( uid      ))
-;;;;;;;; 00000000      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000B      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     ;; (cdmt-crc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-crc-small-archive*))
-
-;;;;;;;;     (should (and "Looking for a small dired-style buffer with d/b, 
d/bb, d/bbb, d/bbbb"
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.crc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} dddd
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/bbbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/b
-;;;;;;;; " cpio-dired-buffer-contents)))
-
-;;;;;;;;     (cdmt-crc-reset)
-
-;;;;;;;;     (progn (cpio-dired-mark-entries-regexp "\\`...\\'")
-;;;;;;;;          (setq unread-command-events (listify-key-sequence 
"newDirectory\n"))
-;;;;;;;;          ;; HEREHERE This rename does something wrong.
-;;;;;;;;          (cpio-dired-do-rename 1)
-;;;;;;;;          (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-crc-filter-archive-contents
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-
-;;;;;;;;     ;; (cdmt-crc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-crc-small-archive*))
-
-;;;;;;;;     (should (string-equal "070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070702       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070702     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070702  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; dddd  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000012      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/bbbb     (( filename ))
-
-;;;;;;;; bbbb
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000011      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/bbb      (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbb
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000010      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/bb       (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bb
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000F      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/b        (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; b
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000011      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/ccc      (( filename ))
-;;;;;;;; \\0
-;;;;;;;; ccc
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000011      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/aaa      (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaa
-
-;;;;;;;; 070702        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 00000000      (( mode     ))
-;;;;;;;; 00000000      (( uid      ))
-;;;;;;;; 00000000      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000B      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     (should (= 0 1))
-
-;;;;;;;;     ;; (cdmt-crc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-crc-small-archive*))
-
-;;;;;;;;     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} dddd
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/bbbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/aaa
-;;;;;;;; " cpio-dired-buffer-contents))
-
-;;;;;;;;     (should (= 0 1))
-
-;;;;;;;;     ;; (cdmt-crc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-crc-small-archive*))
-
-;;;;;;;;     ))
 
 (ert-deftest cdmt-crc-cpio-describe-mode ()
   "Test cpio-describe-mode.
@@ -9027,7 +7232,8 @@ 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 (string-match "((\"a\" \.
+    (should (and "Expecting entry »a« to have group 9999 in the catalog."
+                (string-match "((\"a\" \.
   \[\[[[:digit:]]+ 33188 [[:digit:]]+ 9999 1
              ([[:digit:]]+ [[:digit:]]+)
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
@@ -9117,7 +7323,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
              ([[: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)
     
@@ -9157,7 +7363,8 @@ 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 (string-match"((\"a\" \.
+    (should (and "Expecting the first four catalog entries to have group 8888."
+                (string-match"((\"a\" \.
   \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
              ([[:digit:]]+ [[:digit:]]+)
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
@@ -9247,7 +7454,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
              ([[: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)
 
@@ -10776,7 +8983,8 @@ TRAILER!!!       (( filename ))
   -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 (string-match "((\"a\" \.
+    (should (and "Expecting 4 catalog entries with owner 8888."
+                (string-match "((\"a\" \.
   \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
              ([[:digit:]]+ [[:digit:]]+)
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
@@ -10866,7 +9074,7 @@ TRAILER!!!       (( filename ))
              ([[: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)
 
@@ -11025,7 +9233,8 @@ TRAILER!!!       (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
+    (should (and "Expect an untouched archive. (17974)"
+               (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
 
     (should (and "Expecting entry 'a' to have owner 9999 and group 1111."
                 (string-match "CPIO archive: alphabet_small.crc.cpio:
@@ -11794,7 +10003,7 @@ a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
 " cpio-dired-buffer-contents)))
     (should (and "Expecting to see an entry »d«."
                 (string-match "((\"a\" \.
@@ -12358,7 +10567,8 @@ aaa
 
 \\0\\0
 " cpio-archive-buffer-contents)))
-    (should (string-match "CPIO archive: alphabet_small.crc.cpio:
+    (should (and "Expecint a cpio-dired buffer with ... under newDirectory-1."
+                (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -12378,10 +10588,10 @@ aaa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/ccc
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/bbb
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/aaa
-" cpio-dired-buffer-contents))
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/ccc
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/bbb
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/aaa
+" cpio-dired-buffer-contents)))
     (should (and "Expecting to see ... entries in newDirectory-1."
                 (string-match "((\"a\" \.
   \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
@@ -13066,18 +11276,18 @@ aaa
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
 \\* -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
-  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\\} newDirectory-3/ccccc.d
-  -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\\} newDirectory-3/ccccc
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/cccc
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/ccc
-  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\\} newDirectory-3/bbbbb.d
-  -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\\} newDirectory-3/bbbbb
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbbb
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbb
-  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\\} newDirectory-3/aaaaa.d
-  -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\\} newDirectory-3/aaaaa
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaaa
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaa
+C 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\\} newDirectory-3/ccccc.d
+C -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\\} newDirectory-3/ccccc
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/cccc
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/ccc
+C 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\\} newDirectory-3/bbbbb.d
+C -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\\} newDirectory-3/bbbbb
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbbb
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbb
+C 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\\} newDirectory-3/aaaaa.d
+C -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\\} newDirectory-3/aaaaa
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaaa
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaa
 " cpio-dired-buffer-contents)))
     (should (and "Expecting all entries named with at least 3 letters to have 
copies in newDirectory-3."
                 (string-match "((\"a\" \.
@@ -13698,7 +11908,8 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal "070702      (( magic    ))
+    (should (and "Expecting sn archive with 4 entries deleted."
+                (string-equal "070702  (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
 000003E8       (( uid      ))
@@ -13942,8 +12153,9 @@ DEADBEEF        (( rdev min ))
 00000000       (( chksum   ))
 TRAILER!!!     (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-" cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.crc.cpio:
+" cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with 4 entries deleted."
+                (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
@@ -13958,7 +12170,7 @@ TRAILER!!!      (( filename ))
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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))
+" cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with entries"
                 "    »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted."
                 (string-match "((\"aa\" \.
@@ -14041,7 +12253,8 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal "070702      (( magic    ))
+    (should (and "Expecting an archive with ... deleted."
+                (string-equal "070702  (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
 000003E8       (( uid      ))
@@ -14231,8 +12444,10 @@ DEADBEEF       (( rdev min ))
 00000000       (( chksum   ))
 TRAILER!!!     (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-" cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.crc.cpio:
+" cpio-archive-buffer-contents)))
+    
+    (should (and "Expecting a cpio-dired buffer with ... deleted."
+                (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
@@ -14244,7 +12459,7 @@ TRAILER!!!      (( filename ))
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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))
+" cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with further entries \`...\' deleted."
                 (string-match "((\"aa\" \.
   \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
@@ -14840,13 +13055,15 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
 
 
     (with-current-buffer cpio-dired-buffer
-      (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
+      (should (and "Expect an untouched archive. (17975)"
+                 (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
       (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string (concat "\n" 
entry-name "\n\n")))
       (should (window-live-p cpio-contents-window))
-      (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
+      (should (and "Expecting an unchanged catalog. (17949)"
+                  (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
     (push entry-name past-entries)
     
@@ -14871,13 +13088,15 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
                     (buffer-substring-no-properties (point-min) 
(point-max))))))
 
     (with-current-buffer cpio-dired-buffer
-      (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
+      (should (and "Expect an untouched archive. (17976)"
+                 (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
       (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string "\nccc\n\n"))
       (should (window-live-p cpio-contents-window))
-      (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
+      (should (and "Expecting an unchanged catalog. (17950)"
+                  (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
     ;; Now make sure that any past entries are still there.
     (mapc (lambda (en)
@@ -15305,7 +13524,8 @@ c
 
 
 " cpio-archive-buffer-contents)))
-    (should (string-match "CPIO archive: alphabet_small.crc.cpio:
+    (should (and "Expecting a cpio-dired buffer with single character backup 
files."
+                (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -15328,8 +13548,9 @@ c
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #a
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #b
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #c
-" cpio-dired-buffer-contents))
-    (should (string-match "((\"a\" \.
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting a catalog with autosave entries for single 
character names."
+                (string-match "((\"a\" \.
   \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
              ([[:digit:]]+ [[:digit:]]+)
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 127 \"a\"]
@@ -15434,7 +13655,7 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
              ([[:digit:]]+ [[:digit:]]+)
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 129 
\"#c\"]
    #<marker at 2437 in alphabet_small\.crc\.cpio> #<marker at 2553 in 
alphabet_small\.crc\.cpio> cpio-mode-entry-unmodified\]))
-" cpio-catalog-contents-after))))
+" cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-crc-cpio-dired-flag-backup-entries ()
   "Test cpio-dired-flag-backup-entries.
@@ -15470,8 +13691,10 @@ cpio-dired-flag-entries-regexp is not yet implemented 
-- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.crc.cpio:
+    (should (and "Expect an untouched archive. (17977)"
+               (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with one entry flagged for 
deletion."
+                (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -15491,8 +13714,9 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17951)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 2)
@@ -15506,8 +13730,10 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.crc.cpio:
+    (should (and "Expect an untouched archive. (17978)"
+               (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with 4 entries flagged for 
deletion."
+                (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -15527,8 +13753,9 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17952)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-crc-cpio-dired-flag-garbage-entries ()
   "Test cpio-dired-flag-garbage-entries."
@@ -16210,8 +14437,10 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
     
-    (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.crc.cpio:
+    (should (and "Expect an untouched archive. (17979)"
+               (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with one entry marked."
+                (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -16231,8 +14460,9 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17953)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 2)
@@ -16246,8 +14476,10 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal cpio-archive-buffer-contents 
*cdmt-crc-untouched-small-archive*))
-    (should (string-match "CPIO archive: alphabet_small.crc.cpio:
+    (should (and "Expecting an unchanged archive. (17986)"
+                (string-equal cpio-archive-buffer-contents 
*cdmt-crc-untouched-small-archive*)))
+    (should (and "Expecting 4 more marks in a cpio-dired buffer."
+                (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -16267,8 +14499,9 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17954)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-crc-cpio-dired-mark-directories ()
   "Test cpio-dired-mark-directories.
@@ -16303,8 +14536,10 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.crc.cpio:
+    (should (and "Expect an untouched archive. (17980)"
+               (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with ... marked."
+            (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -16324,8 +14559,9 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17955)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-crc-cpio-dired-mark-executables ()
   "Test cpio-dired-mark-executables.
@@ -16513,9 +14749,12 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
     
     (should (string-equal "a" entry-name))
-    (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an untouched dired buffer. (17987)"
+                (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expect an untouched archive. (17981)"
+               (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17956)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 2)
@@ -16530,8 +14769,10 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
     (should (string-equal "aaa" entry-name))
-    (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
+    (should (and "Expecting an untouched dired buffer. (17988)"
+                (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expect an untouched archive. (17982)"
+               (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 4)
@@ -16546,9 +14787,12 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
     (should (string-equal "b" entry-name))
-    (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an untouched dired buffer. (17989)"
+                (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expect an untouched archive. (17983)"
+               (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17957)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 100)
@@ -16563,9 +14807,12 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
     (should (equal nil entry-name))
-    (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an untouched dired buffer. (17990)"
+                (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expect an untouched archive. (17984)"
+               (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17958)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-crc-cpio-dired-next-marked-entry ()
   "Test cpio-dired-next-marked-entry.
@@ -16627,8 +14874,10 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
 
     (should (= where 1155))
     (should (string-match *cdmt-crc-untouched-small-archive-buffer* 
cpio-archive-buffer-contents))
-    (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an untouched dired buffer. (17991)"
+                (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17959)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-previous-line 2)
@@ -16644,8 +14893,10 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
 
     (should (= where 1019))
     (should (string-match *cdmt-crc-untouched-small-archive-buffer* 
cpio-archive-buffer-contents))
-    (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an untouched dired buffer. (17992)"
+                (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17960)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-previous-line 4)
@@ -16661,8 +14912,10 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
 
     (should (= where 774))
     (should (string-match *cdmt-crc-untouched-small-archive-buffer* 
cpio-archive-buffer-contents))
-    (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an untouched dired buffer. (17993)"
+                (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17961)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-crc-cpio-dired-previous-line ()
   "Test cpio-dired-previous-line.
@@ -16784,7 +15037,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17962)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 2)
@@ -16822,7 +15076,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17963)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 4)
@@ -16860,7 +15115,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17964)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 4)
@@ -16898,7 +15154,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an unchanged catalog. (17965)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-crc-cpio-dired-unmark-all-entries ()
   "Test cpio-dired-unmark-all-entries."
@@ -16953,7 +15210,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17966)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-entries "" nil)
@@ -16990,7 +15248,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17967)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-mark-entries-regexp ".")
@@ -17035,7 +15294,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17968)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-entries "B" nil)
@@ -17073,7 +15333,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17969)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-entries "F" nil)
@@ -17110,7 +15371,8 @@ E -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an unchanged catalog. (17970)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-crc-cpio-dired-unmark-all-marks ()
   "Test cpio-dired-unmark-all-marks."
@@ -17165,7 +15427,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17971)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
   
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-marks)
@@ -17202,7 +15465,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an unchanged catalog. (17972)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-crc-cpio-dired-unmark-all-marks () ;✓
   "Test the function of M-x cpio-unmark-all-marks."
@@ -17235,9 +15499,12 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expect an untouched archive. (17985)"
+               (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an untouched dired buffer. (17994)"
+                (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17973)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-crc-cpio-dired-unmark-backward ()
   "Test cpio-dired-unmark-backward.
@@ -17406,32 +15673,6 @@ cpio-mouse-face is not yet implemented -- expect an 
error."
   (should-error (cpio-mouse-face)
      :type 'error))
 
-;;;;;;;; (ert-deftest cdmt-crc-cpio-quit-window () ;✓
-;;;;;;;;   "Test cpio-quit-window.
-;;;;;;;; cpio-quit-window is not yet implemented -- expect an error."
-;;;;;;;;   (let ((test-name "cdmt-crc-cpio-dired-quit-window")
-;;;;;;;;         (cpio-archive-buffer)
-;;;;;;;;         (cpio-archive-buffer-contents)
-;;;;;;;;         (cpio-dired-buffer)
-;;;;;;;;         (cpio-dired-buffer-contents)
-;;;;;;;;       (cpio-archive-window)
-;;;;;;;;       (cpio-dired-window)
-;;;;;;;;         )
-;;;;;;;;     (cdmt-crc-reset 'make)
-
-;;;;;;;;     (setq cpio-dired-window (get-buffer-window (get-buffer 
cpio-dired-buffer)))
-;;;;;;;;     (should (window-live-p cpio-dired-window))
-;;;;;;;;     (setq cpio-archive-window (get-buffer-window (get-buffer 
cpio-archive-buffer)))
-;;;;;;;;     ;; (should (not (window-live-p cpio-dired-window)))
-;;;;;;;;     (should (eq nil cpio-archive-window))
-
-;;;;;;;; This causes an error under ERT.
-;;;;;;;;     (cpio-quit-window)
-
-;;;;;;;;     (setq cpio-dired-window (get-buffer-window (get-buffer 
cpio-dired-buffer)))
-;;;;;;;;     (should (eq nil cpio-dired-window))
-;;;;;;;;     (setq cpio-archive-window (get-buffer-window (get-buffer 
cpio-archive-buffer)))
-;;;;;;;;     (should (eq nil cpio-archive-window))))
 
 (ert-deftest cdmt-crc-revert-buffer ()
   "Test revert-buffer.
diff --git a/cpio-dired-odc-test.el b/cpio-dired-odc-test.el
index 2414fcc..64be57c 100644
--- a/cpio-dired-odc-test.el
+++ b/cpio-dired-odc-test.el
@@ -1,7 +1,7 @@
-;      $Id: cpio-dired-odc-test.el,v 1.2 2018/05/21 21:21:16 doug Exp $        
+;      $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.2 2018/05/21 21:21:16 doug Exp $        
+;      $Id: cpio-dired-odc-test.el,v 1.3 2018/06/03 14:01:55 doug Exp $        
 
 ;; COPYRIGHT
 
@@ -6627,7 +6627,7 @@ If MAKE is non-nil, then run 'make odc' as part of the 
reset."
                             *cdmt-odc-large-archive*)))
     (cd run-dir)
     (mapc (lambda (an)
-           (setq cpio-archive-buffer (find-file-noselect an))
+           (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
@@ -6647,7 +6647,7 @@ If MAKE is non-nil, then run 'make odc' as part of the 
reset."
                         *cdmt-odc-small-archive*))
 
     (delete-other-windows)
-    (with-current-buffer (setq cpio-archive-buffer (find-file-noselect 
archive-name))
+    (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))
@@ -6676,22 +6676,22 @@ then the entry names will be incorrect."
   (let ((fname "cdmt-odc-reformat-odc-headers"))
     (while (string-match *cpio-odc-header-re* archive-contents)
       (setq archive-contents (concat (substring archive-contents 0 
(match-beginning 0))
-                                    (concat (match-string 
*cpio-odc-magic-re-idx*    archive-contents) "\t(( magic    ))\n")
+                                    (concat (match-string-no-properties 
*cpio-odc-magic-re-idx*    archive-contents) "\t(( magic    ))\n")
                                     (concat "DEADBE"                           
                        "\t(( ino      ))\n")
-                                    (concat (match-string 
*cpio-odc-mode-re-idx*     archive-contents) "\t(( mode     ))\n")
-                                    (concat (match-string 
*cpio-odc-uid-re-idx*      archive-contents) "\t(( uid      ))\n")
-                                    (concat (match-string 
*cpio-odc-gid-re-idx*      archive-contents) "\t(( gid      ))\n")
-                                    (concat (match-string 
*cpio-odc-nlink-re-idx*    archive-contents) "\t(( nlink    ))\n")
+                                    (concat (match-string-no-properties 
*cpio-odc-mode-re-idx*     archive-contents) "\t(( mode     ))\n")
+                                    (concat (match-string-no-properties 
*cpio-odc-uid-re-idx*      archive-contents) "\t(( uid      ))\n")
+                                    (concat (match-string-no-properties 
*cpio-odc-gid-re-idx*      archive-contents) "\t(( gid      ))\n")
+                                    (concat (match-string-no-properties 
*cpio-odc-nlink-re-idx*    archive-contents) "\t(( nlink    ))\n")
                                     ;; Note that the mod time can change.
                                     (concat "DEADBE"                           
                        "\t(( mtime    ))\n")
-                                    (concat (match-string 
*cpio-odc-filesize-re-idx* archive-contents) "\t(( filesize ))\n")
+                                    (concat (match-string-no-properties 
*cpio-odc-filesize-re-idx* archive-contents) "\t(( filesize ))\n")
                                     (concat "DEADBE"                           
                        "\t(( dev maj  ))\n")
                                     (concat "DEADBE"                           
                        "\t(( dev min  ))\n")
                                     (concat "DEADBE"                           
                        "\t(( rdev maj ))\n")
                                     (concat "DEADBE"                           
                        "\t(( rdev min ))\n")
-                                    (concat (match-string 
*cpio-odc-namesize-re-idx* archive-contents) "\t(( namesize ))\n")
+                                    (concat (match-string-no-properties 
*cpio-odc-namesize-re-idx* archive-contents) "\t(( namesize ))\n")
                                     (concat "000000"                           
                        "\t(( chksum   ))\n")
-                                    (concat (match-string 
*cpio-odc-filename-re-idx* archive-contents) "\t(( filename ))\n")
+                                    (concat (match-string-no-properties 
*cpio-odc-filename-re-idx* archive-contents) "\t(( filename ))\n")
                                     (substring archive-contents (match-end 
0)))))
     (concat archive-contents "\n")))
 
@@ -7032,16 +7032,13 @@ to check that the saved archive seems sane."
   (interactive)
   (let ((fname "cdmt-odc-sweep-hex")
        (value)
-       (replacement)
-       )
-    ;; (error "%s() is not yet implemented" fname)
+       (replacement))
     (save-excursion
       (goto-char (point-min))
       (while (re-search-forward "[[:xdigit:]]\\{8\\}" (point-max) t)
        (setq value (string-to-number (match-string 0) 16))
        (setq replacement (format "%06o" value))
-       (replace-match replacement)))
-    ))
+       (replace-match replacement)))))
 
 
 ;; 
@@ -7095,1799 +7092,6 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
   (should-error (cpio-dired-isearch-entry-names-regexp)
      :type 'error))
 
-;;;;;;;; This gets an end-of-buffer error under ERT.
-;;;;;;;; (ert-deftest cdmt-odc-cpio-dired-save-archive-0 () ;✓
-;;;;;;;;   "Test the function of M-x cpio-dired-save-archive."
-;;;;;;;;   (let ((test-name "cdmt-odc-cpio-dired-save-archive")
-;;;;;;;;         (cpio-archive-buffer)
-;;;;;;;;       (cpio-archive-buffer-contents-before)
-;;;;;;;;         (cpio-archive-buffer-contents)
-;;;;;;;;         (cpio-dired-buffer)
-;;;;;;;;         (cpio-dired-buffer-contents-before)
-;;;;;;;;         (cpio-dired-buffer-contents)
-;;;;;;;;         )
-;;;;;;;;     (cdmt-odc-reset 'make)
-
-;;;;;;;;     (progn (goto-char (point-min))
-;;;;;;;;          (re-search-forward " aa$" (point-max))
-;;;;;;;;          (cpio-dired-do-delete 1)
-;;;;;;;;          (setq cpio-archive-buffer-contents-before
-;;;;;;;;                (cdmt-odc-filter-archive-contents (with-current-buffer 
cpio-archive-buffer
-;;;;;;;;                                                
(buffer-substring-no-properties (point-min) (point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents-before (with-current-buffer 
cpio-dired-buffer
-;;;;;;;;                                                    
(buffer-substring-no-properties (point-min) (point-max)))))
-    
-;;;;;;;;     (should (and "Archive buffer should be modified."
-;;;;;;;;                (buffer-modified-p cpio-archive-buffer)))
-;;;;;;;;     (should (and "Archive buffer should be missing exactly the entry 
for aa."
-;;;;;;;;                (string-equal "070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaa  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-00000;;;;;;;; 000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-00000;;;;;;;; 000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-00000;;;;;;;; 000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; b     (( filename ))
-
-;;;;;;;; b
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-00000;;;;;;;; 000005   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000003        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bb    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070707       (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-00000;;;;;;;; 000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbb   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000005   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000003        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070707       (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 000000        (( mode     ))
-;;;;;;;; 000000        (( uid      ))
-;;;;;;;; 000000        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000013        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-;;;;;;;;     (should (and "Checking dired-style buffer before saving."
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.odc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbbb
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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-before)))
-
-;;;;;;;;     (progn (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-odc-filter-archive-contents 
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-    
-;;;;;;;;     ;; (cdmt-odc-do-cpio-id (count-lines (point-min)(point)) 
(file-name-nondirectory *cdmt-odc-small-archive*))
-    
-;;;;;;;;     (should (and "Archive buffer should no longer be modified."
-;;;;;;;;                (not (buffer-modified-p cpio-archive-buffer))))
-;;;;;;;;     (should (and "Checking the archive buffer after saving."
-;;;;;;;;                (string-equal "070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaa  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; b     (( filename ))
-
-;;;;;;;; b
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000005   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000003        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bb    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070707       (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbb   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000005   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000003        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070707       (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 000000        (( mode     ))
-;;;;;;;; 000000        (( uid      ))
-;;;;;;;; 000000        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000013        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     (should (and "Checking the dired-style buffer after saving."
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.odc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbbb
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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)))
-
-;;;;;;;;     ;; The archive strings should be identical up to the TRAILER!!! 
padding.
-;;;;;;;;     ;; NO! Padding after any added, deleted or changed entry will 
also change.
-;;;;;;;;     ;; (string-match "TRAILER!!!" cpio-archive-buffer-contents-before)
-;;;;;;;;     ;; (setq cpio-archive-buffer-contents-before (substring 
cpio-archive-buffer-contents-before 0 (match-end 0)))
-;;;;;;;;     ;; (string-match "TRAILER!!!" cpio-archive-buffer-contents)
-;;;;;;;;     ;; (setq cpio-archive-buffer-contents (substring 
cpio-archive-buffer-contents 0 (match-end 0)))
-;;;;;;;;     ;; (should (string-equal cpio-archive-buffer-contents-before 
cpio-archive-buffer-contents))
-
-;;;;;;;;     (should (and "The dired style buffer should not have changed."
-;;;;;;;;                (string-equal cpio-dired-buffer-contents-before 
cpio-dired-buffer-contents)))
-
-;;;;;;;;     (cdmt-odc-reset)
-
-;;;;;;;;     (progn (goto-char (point-min))
-;;;;;;;;          (re-search-forward " aaaa$" (point-max))
-;;;;;;;;          (setq unread-command-events (listify-key-sequence "dddd\n"))
-;;;;;;;;          (cpio-dired-do-rename 1)
-;;;;;;;;          (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-odc-filter-archive-contents
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-
-;;;;;;;;     ;; (cdmt-odc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-odc-small-archive*))
-    
-;;;;;;;;     (should (and "Expecting the standard archive with aaaa moved to 
ddddd."
-;;;;;;;;                (string-equal "070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; b     (( filename ))
-
-;;;;;;;; b
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000005   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000003        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bb    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070707       (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbb   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000005   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-
-;;;;;;;; 000003        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070707       (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; dddd  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 000000        (( mode     ))
-;;;;;;;; 000000        (( uid      ))
-;;;;;;;; 000000        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000013        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     (should (and "Expecting a dired style buffer without aaaa."
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.odc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbbb
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} dddd
-;;;;;;;; " cpio-dired-buffer-contents)))
-    
-;;;;;;;;     (cdmt-odc-reset)
-    
-;;;;;;;;     (progn (goto-char (point-min))
-;;;;;;;;          (re-search-forward " b$" (point-max))
-;;;;;;;;          (cpio-dired-mark 4)
-;;;;;;;;          (setq unread-command-events (listify-key-sequence "d\n"))
-;;;;;;;;          (cpio-dired-do-rename 1)
-;;;;;;;;          (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-odc-filter-archive-contents
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-
-;;;;;;;;     ;; (cdmt-odc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-odc-small-archive*))
-
-;;;;;;;;     (should (and "Expecting a small archive with d/b, d/bb, d/bbb, 
d/bbbb."
-;;;;;;;;                (string-equal "070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000005   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000003        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070707       (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; dddd  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000007        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; d/bbbb        (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; d/bbb (( filename ))
-
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000005   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; d/bb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070707       (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000004        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; d/b   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; b
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 000000        (( mode     ))
-;;;;;;;; 000000        (( uid      ))
-;;;;;;;; 000000        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000013        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     ;; (cdmt-odc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-odc-small-archive*))
-
-;;;;;;;;     (should (and "Looking for a small dired-style buffer with d/b, 
d/bb, d/bbb, d/bbbb"
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.odc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} dddd
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/bbbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/b
-;;;;;;;; " cpio-dired-buffer-contents)))
-
-;;;;;;;;     (cdmt-odc-reset)
-
-;;;;;;;;     (progn (cpio-dired-mark-entries-regexp "\\`...\\'")
-;;;;;;;;          (setq unread-command-events (listify-key-sequence 
"newDirectory\n"))
-;;;;;;;;          ;; HEREHERE This rename does something wrong.
-;;;;;;;;          (cpio-dired-do-rename 1)
-;;;;;;;;          (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-odc-filter-archive-contents
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-
-;;;;;;;;     ;; (cdmt-odc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-odc-small-archive*))
-
-;;;;;;;;     (should (string-equal "070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000002        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000005   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000003        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070707       (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070707     (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000010   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000006        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 040755        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000002        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000010        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070707  (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000005        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; dddd  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000007   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000022        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; newDirectory/bbbb     (( filename ))
-
-;;;;;;;; bbbb
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000021        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; newDirectory/bbb      (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbb
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000005   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000020        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; newDirectory/bb       (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bb
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000004   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000017        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; newDirectory/b        (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; b
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000021        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; newDirectory/ccc      (( filename ))
-;;;;;;;; \\0
-;;;;;;;; ccc
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 100644        (( mode     ))
-;;;;;;;; 001750        (( uid      ))
-;;;;;;;; 001750        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000006   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000021        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; newDirectory/aaa      (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaa
-
-;;;;;;;; 070707        (( magic    ))
-;;;;;;;; DEADBE        (( ino      ))
-;;;;;;;; 000000        (( mode     ))
-;;;;;;;; 000000        (( uid      ))
-;;;;;;;; 000000        (( gid      ))
-;;;;;;;; 000001        (( nlink    ))
-;;;;;;;; DEADBE        (( mtime    ))
-;;;;;;;; 00000000000   (( filesize ))
-;;;;;;;; DEADBE        (( dev maj  ))
-;;;;;;;; DEADBE        (( dev min  ))
-;;;;;;;; DEADBE        (( rdev maj ))
-;;;;;;;; DEADBE        (( rdev min ))
-;;;;;;;; 000013        (( namesize ))
-;;;;;;;; 000000        (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     (should (= 0 1))
-
-;;;;;;;;     ;; (cdmt-odc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-odc-small-archive*))
-
-;;;;;;;;     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} dddd
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/bbbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/aaa
-;;;;;;;; " cpio-dired-buffer-contents))
-
-;;;;;;;;     (should (= 0 1))
-
-;;;;;;;;     ;; (cdmt-odc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-odc-small-archive*))
-
-;;;;;;;;     ))
 
 (ert-deftest cdmt-odc-cpio-describe-mode ()
   "Test cpio-describe-mode.
@@ -9113,98 +7317,99 @@ 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 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 9999 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
+    (should (and "Expecting a catalog with the firwat entry having group 9999."
+                (string-match "((\"a\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 9999 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)
     
@@ -9244,97 +7449,98 @@ 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 (string-match"((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+    (should (and "Expecting an archive with 4 entries having group 8888."
+                (string-match"((\"a\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
+\\s-+#<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
 
     (cdmt-odc-reset)
 
@@ -9377,95 +7583,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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 7777 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
     
     (cdmt-odc-test-save)))
@@ -9852,95 +8058,95 @@ TRAILER!!!      (( filename ))
 
         (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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -9986,95 +8192,95 @@ TRAILER!!!      (( filename ))
     (should (and "Expecting aaa, aaaa, aaaaa to have mode 0100600 (33152)."
                 "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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
        
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -10118,95 +8324,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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -10581,103 +8787,103 @@ TRAILER!!!   (( filename ))
   -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 all the above mode changes in the catalog."
-;;              "• a has mode 33261."
-;;              "• aaa, aaaa, aaaaa have mode 33152."
-;;              "• aaaaa.d has mode 16768."
-;;              "• ... have mode 33200 for files."
-;;              "                16816 for directories."
-       (should  (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 431 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 945 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+    (should (and "Expecting all the above mode changes in the catalog."
+                "• a has mode 33261."
+                "• aaa, aaaa, aaaaa have mode 33152."
+                "• aaaaa.d has mode 16768."
+                "• ... have mode 33200 for files."
+                "                16816 for directories."
+                (string-match "((\"a\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33152 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16768 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33200 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
 
     (cdmt-odc-test-save)))
 
@@ -10732,95 +8938,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 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
     (cdmt-odc-reset)
     
@@ -10862,97 +9068,98 @@ TRAILER!!!     (( filename ))
   -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 (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 335 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+    (should (and "Expecting a catalog with 4 entries owned by 8888."
+                (string-match "((\"a\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 335 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 8888 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 8888 [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
 
     (cdmt-odc-reset)
 
@@ -10995,95 +9202,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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 7777 [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
 
     (cdmt-odc-test-save)))
@@ -11111,7 +9318,8 @@ TRAILER!!!       (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
+    (should (and "Expect an untouched archive. (18063)"
+               (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
 
     (should (and "Expecting entry 'a' to have owner 9999 and group 1111."
                 (string-match "CPIO archive: alphabet_small.odc.cpio:
@@ -11135,98 +9343,98 @@ TRAILER!!!     (( filename ))
   -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 entry 'a' to have owner 9999 and group 1111."
-    (should     (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 9999 1111 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+    (should (and "Expecting entry 'a' to have owner 9999 and group 1111."
+                (string-match "((\"a\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
 
     (cdmt-odc-reset)
     
@@ -11267,98 +9475,98 @@ TRAILER!!!     (( filename ))
   -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 4 entries with owner 8888 and group 2222."
-    (should     (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 2222 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 2222 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 335 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 8888 2222 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+    (should (and "Expecting 4 entries with owner 8888 and group 2222."
+                (string-match "((\"a\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 8888 2222 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 8888 2222 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 335 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 8888 2222 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 8888 2222 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
 
     (cdmt-odc-reset)
 
@@ -11399,98 +9607,98 @@ TRAILER!!!     (( filename ))
   -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 ... to have owner 7777 and group 3333."
-    (should     (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 7777 3333 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 7777 3333 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 7777 3333 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+    (should (and "Expecting ... to have owner 7777 and group 3333."
+                (string-match "((\"a\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 7777 3333 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 7777 3333 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 7777 3333 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
 
     (cdmt-odc-test-save)))
 
@@ -11880,105 +10088,105 @@ a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
 " cpio-dired-buffer-contents)))
-;;    (should (and "Expecting to see an entry »d«."
-       (should  (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
-   #<marker at 1543 in alphabet_small.odc.cpio> #<marker at 1621 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+    (should (and "Expecting to see an entry »d«."
+                (string-match "((\"a\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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])
+\\s-+(\"d\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
+\\s-+#<marker at 1543 in alphabet_small.odc.cpio> #<marker at 1621 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
+" cpio-catalog-contents-after)))
 
     (cdmt-odc-test-save)))
 
@@ -12444,7 +10652,8 @@ aaa
 
 
 " cpio-archive-buffer-contents)))
-    (should (string-match "CPIO archive: alphabet_small.odc.cpio:
+    (should (and "Expecting a cpio-dired bufffer with ... copied to 
newDirectory-1."
+                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -12464,117 +10673,117 @@ aaa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/ccc
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/bbb
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/aaa
-" cpio-dired-buffer-contents))
-;;    (should (and "Expecting to see ... entries in newDirectory-1."
-       (should  (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.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 1543 in alphabet_small.odc.cpio> #<marker at 1638 in 
alphabet_small.odc.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 1644 in alphabet_small.odc.cpio> #<marker at 1739 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"newDirectory-1/aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/aaa\"]
-   #<marker at 1745 in alphabet_small.odc.cpio> #<marker at 1840 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/ccc
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/bbb
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/aaa
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting to see ... entries in newDirectory-1."
+                (string-match "((\"a\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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])
+\\s-+(\"newDirectory-1/ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/ccc\"]
+\\s-+#<marker at 1543 in alphabet_small.odc.cpio> #<marker at 1638 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-1/bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/bbb\"]
+\\s-+#<marker at 1644 in alphabet_small.odc.cpio> #<marker at 1739 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-1/aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/aaa\"]
+\\s-+#<marker at 1745 in alphabet_small.odc.cpio> #<marker at 1840 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
+" cpio-catalog-contents-after)))
 
     (cdmt-odc-test-save)))
 
@@ -13150,171 +11359,171 @@ aaa
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
 \\* -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
-  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\\} newDirectory-3/ccccc.d
-  -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\\} newDirectory-3/ccccc
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/cccc
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/ccc
-  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\\} newDirectory-3/bbbbb.d
-  -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\\} newDirectory-3/bbbbb
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbbb
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbb
-  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\\} newDirectory-3/aaaaa.d
-  -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\\} newDirectory-3/aaaaa
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaaa
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaa
+C 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\\} newDirectory-3/ccccc.d
+C -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\\} newDirectory-3/ccccc
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/cccc
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/ccc
+C 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\\} newDirectory-3/bbbbb.d
+C -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\\} newDirectory-3/bbbbb
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbbb
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbb
+C 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\\} newDirectory-3/aaaaa.d
+C -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\\} newDirectory-3/aaaaa
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaaa
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaa
 " cpio-dired-buffer-contents)))
-;;    (should (and "Expecting all entries named with at least 3 letters to 
have copies in newDirectory-3."
-       (should  (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.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 1543 in alphabet_small.odc.cpio> #<marker at 1642 in 
alphabet_small.odc.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 1642 in alphabet_small.odc.cpio> #<marker at 1739 in 
alphabet_small.odc.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 1747 in alphabet_small.odc.cpio> #<marker at 1843 in 
alphabet_small.odc.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 1851 in alphabet_small.odc.cpio> #<marker at 1946 in 
alphabet_small.odc.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 1952 in alphabet_small.odc.cpio> #<marker at 2051 in 
alphabet_small.odc.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 2051 in alphabet_small.odc.cpio> #<marker at 2148 in 
alphabet_small.odc.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 2156 in alphabet_small.odc.cpio> #<marker at 2252 in 
alphabet_small.odc.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 2260 in alphabet_small.odc.cpio> #<marker at 2355 in 
alphabet_small.odc.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 2361 in alphabet_small.odc.cpio> #<marker at 2460 in 
alphabet_small.odc.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 2460 in alphabet_small.odc.cpio> #<marker at 2557 in 
alphabet_small.odc.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 2565 in alphabet_small.odc.cpio> #<marker at 2661 in 
alphabet_small.odc.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 2669 in alphabet_small.odc.cpio> #<marker at 2764 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+    (should (and "Expecting all entries named with at least 3 letters to have 
copies in newDirectory-3."
+                (string-match "((\"a\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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])
+\\s-+(\"newDirectory-3/ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/ccccc\.d\"]
+\\s-+#<marker at 1543 in alphabet_small.odc.cpio> #<marker at 1642 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-3/ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory-3/ccccc\"]
+\\s-+#<marker at 1642 in alphabet_small.odc.cpio> #<marker at 1739 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-3/cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 0 
\"newDirectory-3/cccc\"]
+\\s-+#<marker at 1747 in alphabet_small.odc.cpio> #<marker at 1843 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-3/ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-3/ccc\"]
+\\s-+#<marker at 1851 in alphabet_small.odc.cpio> #<marker at 1946 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-3/bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/bbbbb\.d\"]
+\\s-+#<marker at 1952 in alphabet_small.odc.cpio> #<marker at 2051 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-3/bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory-3/bbbbb\"]
+\\s-+#<marker at 2051 in alphabet_small.odc.cpio> #<marker at 2148 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-3/bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 0 
\"newDirectory-3/bbbb\"]
+\\s-+#<marker at 2156 in alphabet_small.odc.cpio> #<marker at 2252 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-3/bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-3/bbb\"]
+\\s-+#<marker at 2260 in alphabet_small.odc.cpio> #<marker at 2355 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-3/aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 23 0 
\"newDirectory-3/aaaaa\.d\"]
+\\s-+#<marker at 2361 in alphabet_small.odc.cpio> #<marker at 2460 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-3/aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory-3/aaaaa\"]
+\\s-+#<marker at 2460 in alphabet_small.odc.cpio> #<marker at 2557 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-3/aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 20 0 
\"newDirectory-3/aaaa\"]
+\\s-+#<marker at 2565 in alphabet_small.odc.cpio> #<marker at 2661 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-3/aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-3/aaa\"]
+\\s-+#<marker at 2669 in alphabet_small.odc.cpio> #<marker at 2764 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
+" cpio-catalog-contents-after)))
 
     (cdmt-odc-test-save)))
 
@@ -13685,90 +11894,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.odc.cpio> #<marker at 80 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 85 in alphabet_small.odc.cpio> #<marker at 165 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 171 in alphabet_small.odc.cpio> #<marker at 252 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 259 in alphabet_small.odc.cpio> #<marker at 341 in 
alphabet_small.odc.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 349 in alphabet_small.odc.cpio> #<marker at 433 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 433 in alphabet_small.odc.cpio> #<marker at 511 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 594 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 599 in alphabet_small.odc.cpio> #<marker at 679 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 685 in alphabet_small.odc.cpio> #<marker at 766 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 773 in alphabet_small.odc.cpio> #<marker at 855 in 
alphabet_small.odc.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 863 in alphabet_small.odc.cpio> #<marker at 947 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 947 in alphabet_small.odc.cpio> #<marker at 1025 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1108 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1113 in alphabet_small.odc.cpio> #<marker at 1193 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1199 in alphabet_small.odc.cpio> #<marker at 1280 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1287 in alphabet_small.odc.cpio> #<marker at 1369 in 
alphabet_small.odc.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 1377 in alphabet_small.odc.cpio> #<marker at 1461 in 
alphabet_small.odc.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.odc.cpio> #<marker at 80 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 85 in alphabet_small.odc.cpio> #<marker at 165 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 171 in alphabet_small.odc.cpio> #<marker at 252 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 259 in alphabet_small.odc.cpio> #<marker at 341 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 349 in alphabet_small.odc.cpio> #<marker at 433 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 433 in alphabet_small.odc.cpio> #<marker at 511 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 594 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 599 in alphabet_small.odc.cpio> #<marker at 679 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 685 in alphabet_small.odc.cpio> #<marker at 766 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 773 in alphabet_small.odc.cpio> #<marker at 855 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 863 in alphabet_small.odc.cpio> #<marker at 947 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 947 in alphabet_small.odc.cpio> #<marker at 1025 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1108 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1113 in alphabet_small.odc.cpio> #<marker at 1193 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1199 in alphabet_small.odc.cpio> #<marker at 1280 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1287 in alphabet_small.odc.cpio> #<marker at 1369 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 1377 in alphabet_small.odc.cpio> #<marker at 1461 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
 " cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
@@ -14029,7 +12238,8 @@ TRAILER!!!      (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (should (string-match "CPIO archive: alphabet_small.odc.cpio:
+    (should (and "Expecting a cpio-dired buffer with 4 entries deleted."
+                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
@@ -14044,76 +12254,76 @@ TRAILER!!!    (( filename ))
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 entries"
-;;              "    »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted."
-       (should  (string-match "((\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 80 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 85 in alphabet_small.odc.cpio> #<marker at 165 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 171 in alphabet_small.odc.cpio> #<marker at 250 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 255 in alphabet_small.odc.cpio> #<marker at 335 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 422 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 429 in alphabet_small.odc.cpio> #<marker at 511 in 
alphabet_small.odc.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 519 in alphabet_small.odc.cpio> #<marker at 603 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 603 in alphabet_small.odc.cpio> #<marker at 681 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 685 in alphabet_small.odc.cpio> #<marker at 764 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 769 in alphabet_small.odc.cpio> #<marker at 849 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 936 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 943 in alphabet_small.odc.cpio> #<marker at 1025 in 
alphabet_small.odc.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 1033 in alphabet_small.odc.cpio> #<marker at 1117 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting a catalog with entries"
+                "    »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted."
+                (string-match "((\"aa\" \.
+\\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.odc.cpio> #<marker at 80 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 85 in alphabet_small.odc.cpio> #<marker at 165 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 171 in alphabet_small.odc.cpio> #<marker at 250 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 255 in alphabet_small.odc.cpio> #<marker at 335 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 422 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 429 in alphabet_small.odc.cpio> #<marker at 511 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 519 in alphabet_small.odc.cpio> #<marker at 603 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 603 in alphabet_small.odc.cpio> #<marker at 681 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 685 in alphabet_small.odc.cpio> #<marker at 764 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 769 in alphabet_small.odc.cpio> #<marker at 849 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 936 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 943 in alphabet_small.odc.cpio> #<marker at 1025 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 1033 in alphabet_small.odc.cpio> #<marker at 1117 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
 "
-cpio-catalog-contents-after))
+cpio-catalog-contents-after)))
 
   (progn (setq cpio-catalog-contents-before (format "%s" (pp (cpio-catalog))))
           (cpio-dired-mark-entries-regexp "\\`...\\'")
@@ -14320,7 +12530,8 @@ TRAILER!!!      (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (should (string-match "CPIO archive: alphabet_small.odc.cpio:
+    (should (and "Expecting a cpio-dired buffer with 4 entries deleted."
+                 (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
@@ -14332,59 +12543,59 @@ TRAILER!!!    (( filename ))
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 further entries \`...\' deleted."
-       (should  (string-match "((\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 80 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 85 in alphabet_small.odc.cpio> #<marker at 164 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 169 in alphabet_small.odc.cpio> #<marker at 250 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 257 in alphabet_small.odc.cpio> #<marker at 339 in 
alphabet_small.odc.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 347 in alphabet_small.odc.cpio> #<marker at 431 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 431 in alphabet_small.odc.cpio> #<marker at 509 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 513 in alphabet_small.odc.cpio> #<marker at 592 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 678 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 685 in alphabet_small.odc.cpio> #<marker at 767 in 
alphabet_small.odc.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 775 in alphabet_small.odc.cpio> #<marker at 859 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting a catalog with further entries \`...\' deleted."
+                (string-match "((\"aa\" \.
+\\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.odc.cpio> #<marker at 80 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 85 in alphabet_small.odc.cpio> #<marker at 164 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 169 in alphabet_small.odc.cpio> #<marker at 250 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 257 in alphabet_small.odc.cpio> #<marker at 339 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 347 in alphabet_small.odc.cpio> #<marker at 431 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 509 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 513 in alphabet_small.odc.cpio> #<marker at 592 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 678 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 685 in alphabet_small.odc.cpio> #<marker at 767 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"ccccc\.d\"]
+\\s-+#<marker at 775 in alphabet_small.odc.cpio> #<marker at 859 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
+" cpio-catalog-contents-after)))
 
     (cdmt-odc-test-save)))
 
@@ -14480,99 +12691,98 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
   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 catalog with first entry »d«."
-    (should     (string-match "((\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-"
- cpio-catalog-contents-after))
+    (should (and "Expecting catalog with first entry »d«."
+                (string-match "((\"d\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 2)
@@ -14613,99 +12823,99 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
   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 above changes."
-    (should (string-match "((\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.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 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.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 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.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 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
-
+    (should (and "Expecting a catalog with the above changes."
+                (string-match "((\"d\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory/aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 17 0 
\"newDirectory/aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory/aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 18 0 
\"newDirectory/aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory/aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory/aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory/aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory/aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
+    
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-mark-entries-regexp "\\`...\\'")
           (setq unread-command-events (listify-key-sequence 
"newDirectory-1\n"))
@@ -14744,98 +12954,98 @@ cpio-dired-do-redisplay 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 \`...\' entries in 
newDirectory-1."
-                (should                 (string-match "((\"d\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"d\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.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 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.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 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.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 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.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 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.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 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+    (should (and "Expecting a catalog with \`...\' entries in newDirectory-1."
+                (string-match "((\"d\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory/aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 17 0 
\"newDirectory/aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory/aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 18 0 
\"newDirectory/aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory/aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory/aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory/aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 21 0 
\"newDirectory/aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-1/bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-1/ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
 
     (cdmt-odc-test-save)))
 
@@ -14929,13 +13139,15 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
 
 
     (with-current-buffer cpio-dired-buffer
-      (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
+      (should (and "Expect an untouched archive. (18064)"
+                 (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
       (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string (concat "\n" 
entry-name "\n\n")))
       (should (window-live-p cpio-contents-window))
-      (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
+      (should (and "Expecting an unchanged catalog. (18038)"
+                  (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
     (push entry-name past-entries)
     
@@ -14960,13 +13172,15 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
                     (buffer-substring-no-properties (point-min) 
(point-max))))))
 
     (with-current-buffer cpio-dired-buffer
-      (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
+      (should (and "Expect an untouched archive. (18065)"
+                 (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
       (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string "\nccc\n\n"))
       (should (window-live-p cpio-contents-window))
-      (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
+      (should (and "Expecting an unchanged catalog. (18039)"
+                  (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
     ;; Now make sure that any past entries are still there.
     (mapc (lambda (en)
@@ -15395,7 +13609,8 @@ c
 
 " cpio-archive-buffer-contents))
 
-    (should (string-match "CPIO archive: alphabet_small.odc.cpio:
+    (should (and "Expecting a cpio-dired-buffer with autosave files for single 
character entries."
+                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -15418,114 +13633,115 @@ c
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #a
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #b
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #c
-" cpio-dired-buffer-contents))
-
-    (should (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"#a\" .
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 64768 0 0 0 3 0 \"#a\"]
-   #<marker at 1543 in alphabet_small.odc.cpio> #<marker at 1622 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"#b\" .
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 64768 0 0 0 3 0 \"#b\"]
-   #<marker at 1626 in alphabet_small.odc.cpio> #<marker at 1705 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"#c\" .
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 64768 0 0 0 3 0 \"#c\"]
-   #<marker at 1709 in alphabet_small.odc.cpio> #<marker at 1788 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))))
+" cpio-dired-buffer-contents)))
+
+    (should (and "Expecting to seee catalog entries for auto-save files for 
single character entries."
+                (string-match "((\"a\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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])
+\\s-+(\"#a\" .
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 64768 0 0 0 3 0 \"#a\"]
+\\s-+#<marker at 1543 in alphabet_small.odc.cpio> #<marker at 1622 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"#b\" .
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 64768 0 0 0 3 0 \"#b\"]
+\\s-+#<marker at 1626 in alphabet_small.odc.cpio> #<marker at 1705 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"#c\" .
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 64768 0 0 0 3 0 \"#c\"]
+\\s-+#<marker at 1709 in alphabet_small.odc.cpio> #<marker at 1788 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
+" cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-odc-cpio-dired-flag-backup-entries ()
   "Test cpio-dired-flag-backup-entries.
@@ -15561,8 +13777,10 @@ cpio-dired-flag-entries-regexp is not yet implemented 
-- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.odc.cpio:
+    (should (and "Expect an untouched archive. (18066)"
+               (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with one entry flagged for 
deletion."
+                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -15582,8 +13800,9 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (18040)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 2)
@@ -15597,8 +13816,10 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.odc.cpio:
+    (should (and "Expect an untouched archive. (18067)"
+               (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with 4 more entries flagged 
for deletion."
+                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -15618,8 +13839,9 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (18041)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-odc-cpio-dired-flag-garbage-entries ()
   "Test cpio-dired-flag-garbage-entries."
@@ -16126,134 +14348,134 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        
5 \\(?:a\\(?:pr\\|ug\\)\\|de
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa.rej
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa.toc
 " cpio-dired-buffer-contents)))
-;;    (should (and "Expecting a catalog with entries with the suffixes"
-;;              "    aux bak dvi log orig reg toc."
-    (should     (string-match "((\"a\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
-   #<marker at 1 in alphabet_small.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.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 1543 in alphabet_small.odc.cpio> #<marker at 1626 in 
alphabet_small.odc.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 1632 in alphabet_small.odc.cpio> #<marker at 1715 in 
alphabet_small.odc.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 1721 in alphabet_small.odc.cpio> #<marker at 1804 in 
alphabet_small.odc.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 1810 in alphabet_small.odc.cpio> #<marker at 1893 in 
alphabet_small.odc.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 1899 in alphabet_small.odc.cpio> #<marker at 1983 in 
alphabet_small.odc.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 1989 in alphabet_small.odc.cpio> #<marker at 2072 in 
alphabet_small.odc.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 2078 in alphabet_small.odc.cpio> #<marker at 2161 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
-" cpio-catalog-contents-after))
+    (should (and "Expecting a catalog with entries with the suffixes"
+                "    aux bak dvi log orig reg toc."
+                (string-match "((\"a\" \.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\.d\" \.
+\\s-+\[\[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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])
+\\s-+(\"aa\.aux\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.aux\"]
+\\s-+#<marker at 1543 in alphabet_small.odc.cpio> #<marker at 1626 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\.bak\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.bak\"]
+\\s-+#<marker at 1632 in alphabet_small.odc.cpio> #<marker at 1715 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\.dvi\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.dvi\"]
+\\s-+#<marker at 1721 in alphabet_small.odc.cpio> #<marker at 1804 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\.log\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.log\"]
+\\s-+#<marker at 1810 in alphabet_small.odc.cpio> #<marker at 1893 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\.orig\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aa\.orig\"]
+\\s-+#<marker at 1899 in alphabet_small.odc.cpio> #<marker at 1983 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\.rej\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.rej\"]
+\\s-+#<marker at 1989 in alphabet_small.odc.cpio> #<marker at 2072 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\.toc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 7 0 \"aa\.toc\"]
+\\s-+#<marker at 2078 in alphabet_small.odc.cpio> #<marker at 2161 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified]))
+" cpio-catalog-contents-after)))
 
     (cdmt-odc-test-save)))
 
@@ -16303,8 +14525,10 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
     
-    (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.odc.cpio:
+    (should (and "Expect an untouched archive. (18068)"
+               (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with the first entry marked."
+                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -16324,8 +14548,9 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (18042)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 2)
@@ -16340,7 +14565,8 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
     (should (string-equal cpio-archive-buffer-contents 
*cdmt-odc-untouched-small-archive*))
-    (should (string-match "CPIO archive: alphabet_small.odc.cpio:
+    (should (and "Expecing a cpio-dired buffer with 4 more entries marked."
+                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -16360,8 +14586,9 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (18043)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-odc-cpio-dired-mark-directories ()
   "Test cpio-dired-mark-directories.
@@ -16396,8 +14623,10 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.odc.cpio:
+    (should (and "Expect an untouched archive. (18069)"
+               (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with ... marked."
+                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -16417,8 +14646,9 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (18044)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-odc-cpio-dired-mark-executables ()
   "Test cpio-dired-mark-executables.
@@ -16470,8 +14700,8 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
 
     (should (and "The current entry should be aaaaa.d"
                 (string-equal "aaaaa.d" entry-name)))
-    ;;(should (and "Expecting an untouched large archive buffer."
-       (should  (string-equal *cdmt-odc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
+    (should (and "Expecting an untouched large archive buffer."
+                (string-equal *cdmt-odc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents)))
     (should (and "The dired style buffer should be untouched."
                 (string-match *cdmt-odc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents)))
     (should (and "Expecting an unchanged catalog."
@@ -16607,8 +14837,10 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
     
     (should (string-equal "a" entry-name))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expect an untouched archive. (18070)"
+               (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (18045)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 2)
@@ -16624,7 +14856,8 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
 
     (should (string-equal "aaa" entry-name))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
+    (should (and "Expect an untouched archive. (18071)"
+               (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 4)
@@ -16640,8 +14873,10 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
 
     (should (string-equal "b" entry-name))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expect an untouched archive. (18072)"
+               (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (18046)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 100)
@@ -16657,8 +14892,10 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
 
     (should (equal nil entry-name))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expect an untouched archive. (18073)"
+               (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (18047)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-odc-cpio-dired-next-marked-entry ()
   "Test cpio-dired-next-marked-entry.
@@ -16721,7 +14958,8 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
     (should (= where 1155))
     (should (string-match *cdmt-odc-untouched-small-archive-buffer* 
cpio-archive-buffer-contents))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (18048)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-previous-line 2)
@@ -16738,7 +14976,8 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
     (should (= where 1019))
     (should (string-match *cdmt-odc-untouched-small-archive-buffer* 
cpio-archive-buffer-contents))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (18049)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-previous-line 4)
@@ -16755,7 +14994,8 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
     (should (= where 774))
     (should (string-match *cdmt-odc-untouched-small-archive-buffer* 
cpio-archive-buffer-contents))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an unchanged catalog. (18050)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-odc-cpio-dired-previous-line ()
   "Test cpio-dired-previous-line.
@@ -16877,7 +15117,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (18051)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 2)
@@ -16915,7 +15156,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (18052)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 4)
@@ -16953,7 +15195,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (18053)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 4)
@@ -16991,7 +15234,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an unchanged catalog. (18054)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-odc-cpio-dired-unmark-all-entries ()
   "Test cpio-dired-unmark-all-entries."
@@ -17046,7 +15290,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (18055)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-entries "" nil)
@@ -17083,7 +15328,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (18056)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-mark-entries-regexp ".")
@@ -17128,7 +15374,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (18057)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-entries "B" nil)
@@ -17166,7 +15413,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (18058)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-entries "F" nil)
@@ -17203,7 +15451,8 @@ E -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an unchanged catalog. (18059)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-odc-cpio-dired-unmark-all-marks ()
   "Test cpio-dired-unmark-all-marks."
@@ -17258,7 +15507,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (18060)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
   
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-marks)
@@ -17295,7 +15545,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an unchanged catalog. (18061)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-odc-cpio-dired-unmark-all-marks () ;✓
   "Test the function of M-x cpio-unmark-all-marks."
@@ -17328,9 +15579,11 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
+    (should (and "Expect an untouched archive. (18074)"
+               (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents)))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an unchanged catalog. (18062)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-odc-cpio-dired-unmark-backward ()
   "Test cpio-dired-unmark-backward.
@@ -17499,33 +15752,6 @@ cpio-mouse-face is not yet implemented -- expect an 
error."
   (should-error (cpio-mouse-face)
      :type 'error))
 
-;;;;;;;; (ert-deftest cdmt-odc-cpio-quit-window () ;✓
-;;;;;;;;   "Test cpio-quit-window.
-;;;;;;;; cpio-quit-window is not yet implemented -- expect an error."
-;;;;;;;;   (let ((test-name "cdmt-odc-cpio-dired-quit-window")
-;;;;;;;;         (cpio-archive-buffer)
-;;;;;;;;         (cpio-archive-buffer-contents)
-;;;;;;;;         (cpio-dired-buffer)
-;;;;;;;;         (cpio-dired-buffer-contents)
-;;;;;;;;       (cpio-archive-window)
-;;;;;;;;       (cpio-dired-window)
-;;;;;;;;         )
-;;;;;;;;     (cdmt-odc-reset 'make)
-
-;;;;;;;;     (setq cpio-dired-window (get-buffer-window (get-buffer 
cpio-dired-buffer)))
-;;;;;;;;     (should (window-live-p cpio-dired-window))
-;;;;;;;;     (setq cpio-archive-window (get-buffer-window (get-buffer 
cpio-archive-buffer)))
-;;;;;;;;     ;; (should (not (window-live-p cpio-dired-window)))
-;;;;;;;;     (should (eq nil cpio-archive-window))
-
-;;;;;;;; This causes an error under ERT.
-;;;;;;;;     (cpio-quit-window)
-
-;;;;;;;;     (setq cpio-dired-window (get-buffer-window (get-buffer 
cpio-dired-buffer)))
-;;;;;;;;     (should (eq nil cpio-dired-window))
-;;;;;;;;     (setq cpio-archive-window (get-buffer-window (get-buffer 
cpio-archive-buffer)))
-;;;;;;;;     (should (eq nil cpio-archive-window))))
-
 (ert-deftest cdmt-odc-revert-buffer ()
   "Test revert-buffer.
 revert-buffer is not yet implemented -- expect an error."
@@ -17915,100 +16141,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 1543 in alphabet_small.odc.cpio> #<marker at 1632 in 
alphabet_small.odc.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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
-   #<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
-   #<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
-   #<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"aaaaa\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
-   #<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.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 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"b\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
-   #<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
-   #<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
-   #<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
-   #<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"bbbbb\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
-   #<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.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 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"c\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
-   #<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
-   #<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
-   #<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"cccc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
-   #<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
- (\"ccccc\" \\.
-  [[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-        ([[:digit:]]+ [[:digit:]]+)
-        8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
-   #<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.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 1459 in alphabet_small.odc.cpio> #<marker at 1543 in 
alphabet_small.odc.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 1543 in alphabet_small.odc.cpio> #<marker at 1632 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"a\" \\.
+\\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.odc.cpio> #<marker at 79 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aa\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"aa\"]
+\\s-+#<marker at 83 in alphabet_small.odc.cpio> #<marker at 162 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaa\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"aaa\"]
+\\s-+#<marker at 167 in alphabet_small.odc.cpio> #<marker at 247 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaa\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"aaaa\"]
+\\s-+#<marker at 253 in alphabet_small.odc.cpio> #<marker at 334 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"aaaaa\"]
+\\s-+#<marker at 341 in alphabet_small.odc.cpio> #<marker at 423 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"aaaaa\\.d\" \\.
+\\s-+[[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"aaaaa\\.d\"]
+\\s-+#<marker at 431 in alphabet_small.odc.cpio> #<marker at 515 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"b\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"b\"]
+\\s-+#<marker at 515 in alphabet_small.odc.cpio> #<marker at 593 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bb\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"bb\"]
+\\s-+#<marker at 597 in alphabet_small.odc.cpio> #<marker at 676 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbb\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"bbb\"]
+\\s-+#<marker at 681 in alphabet_small.odc.cpio> #<marker at 761 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbb\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"bbbb\"]
+\\s-+#<marker at 767 in alphabet_small.odc.cpio> #<marker at 848 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"bbbbb\"]
+\\s-+#<marker at 855 in alphabet_small.odc.cpio> #<marker at 937 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"bbbbb\\.d\" \\.
+\\s-+[[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+0 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 8 0 \"bbbbb\\.d\"]
+\\s-+#<marker at 945 in alphabet_small.odc.cpio> #<marker at 1029 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"c\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"c\"]
+\\s-+#<marker at 1029 in alphabet_small.odc.cpio> #<marker at 1107 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cc\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+5 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 3 0 \"cc\"]
+\\s-+#<marker at 1111 in alphabet_small.odc.cpio> #<marker at 1190 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccc\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 4 0 \"ccc\"]
+\\s-+#<marker at 1195 in alphabet_small.odc.cpio> #<marker at 1275 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"cccc\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+7 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 5 0 \"cccc\"]
+\\s-+#<marker at 1281 in alphabet_small.odc.cpio> #<marker at 1362 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\" \\.
+\\s-+[[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+8 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 6 0 \"ccccc\"]
+\\s-+#<marker at 1369 in alphabet_small.odc.cpio> #<marker at 1451 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"ccccc\\.d\" \\.
+\\s-+[[[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 2
+\\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)))
     
     (cdmt-odc-test-save)))
diff --git a/cpio-dired-test.el b/cpio-dired-test.el
index 4e198c0..30cc014 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.3 2018/05/18 23:55:30 doug Exp $    
+;      $Id: cpio-dired-test.el,v 1.4 2018/06/03 14:01:55 doug Exp $    
 
 ;; COPYRIGHT
 
@@ -6537,7 +6537,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))
+           (setq cpio-archive-buffer (find-file-noselect an 'nowarn))
            (if (and (file-exists-p an)
                     (buffer-live-p (get-buffer cpio-archive-buffer)))
                (with-current-buffer cpio-archive-buffer
@@ -6557,7 +6557,7 @@ If MAKE is non-nil, then run 'make newc' as part of the 
reset."
                         *cdmt-small-archive*))
 
     (delete-other-windows)
-    (with-current-buffer (setq cpio-archive-buffer (find-file-noselect 
archive-name))
+    (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))
@@ -6586,22 +6586,22 @@ then the entry names will be incorrect."
   (let ((fname "cdmt-reformat-newc-headers"))
     (while (string-match *cpio-newc-header-re* archive-contents)
       (setq archive-contents (concat (substring archive-contents 0 
(match-beginning 0))
-                                    (concat (match-string 
*cpio-newc-magic-re-idx*    archive-contents) "\t(( magic    ))\n")
+                                    (concat (match-string-no-properties 
*cpio-newc-magic-re-idx*    archive-contents) "\t(( magic    ))\n")
                                     (concat "DEADBEEF"                         
                         "\t(( ino      ))\n")
-                                    (concat (match-string 
*cpio-newc-mode-re-idx*     archive-contents) "\t(( mode     ))\n")
-                                    (concat (match-string 
*cpio-newc-uid-re-idx*      archive-contents) "\t(( uid      ))\n")
-                                    (concat (match-string 
*cpio-newc-gid-re-idx*      archive-contents) "\t(( gid      ))\n")
-                                    (concat (match-string 
*cpio-newc-nlink-re-idx*    archive-contents) "\t(( nlink    ))\n")
+                                    (concat (match-string-no-properties 
*cpio-newc-mode-re-idx*     archive-contents) "\t(( mode     ))\n")
+                                    (concat (match-string-no-properties 
*cpio-newc-uid-re-idx*      archive-contents) "\t(( uid      ))\n")
+                                    (concat (match-string-no-properties 
*cpio-newc-gid-re-idx*      archive-contents) "\t(( gid      ))\n")
+                                    (concat (match-string-no-properties 
*cpio-newc-nlink-re-idx*    archive-contents) "\t(( nlink    ))\n")
                                     ;; Note that the mod time can change.
                                     (concat "DEADBEEF"                         
                         "\t(( mtime    ))\n")
-                                    (concat (match-string 
*cpio-newc-filesize-re-idx* archive-contents) "\t(( filesize ))\n")
+                                    (concat (match-string-no-properties 
*cpio-newc-filesize-re-idx* archive-contents) "\t(( filesize ))\n")
                                     (concat "DEADBEEF"                         
                         "\t(( dev maj  ))\n")
                                     (concat "DEADBEEF"                         
                         "\t(( dev min  ))\n")
                                     (concat "DEADBEEF"                         
                         "\t(( rdev maj ))\n")
                                     (concat "DEADBEEF"                         
                         "\t(( rdev min ))\n")
-                                    (concat (match-string 
*cpio-newc-namesize-re-idx* archive-contents) "\t(( namesize ))\n")
-                                    (concat (match-string 
*cpio-newc-chksum-re-idx*   archive-contents) "\t(( chksum   ))\n")
-                                    (concat (match-string 
*cpio-newc-filename-re-idx* archive-contents) "\t(( filename ))\n")
+                                    (concat (match-string-no-properties 
*cpio-newc-namesize-re-idx* archive-contents) "\t(( namesize ))\n")
+                                    (concat (match-string-no-properties 
*cpio-newc-chksum-re-idx*   archive-contents) "\t(( chksum   ))\n")
+                                    (concat (match-string-no-properties 
*cpio-newc-filename-re-idx* archive-contents) "\t(( filename ))\n")
                                     (substring archive-contents (match-end 
0)))))
     (concat archive-contents "\n")))
 
@@ -6845,7 +6845,7 @@ to help make tests pass correctly."
     (search-forward "filename")
     (beginning-of-line)
     (looking-at "[[:graph:]]+")
-    (setq entry-name (match-string 0))
+    (setq entry-name (match-string-no-properties 0))
     (other-window 2)
     (insert (format "%s:\t%06o\n" entry-name (string-to-number mode-hex-string 
16)))
     (other-window 2)
@@ -6988,1799 +6988,6 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
   (should-error (cpio-dired-isearch-entry-names-regexp)
      :type 'error))
 
-;;;;;;;; This gets an end-of-buffer error under ERT.
-;;;;;;;; (ert-deftest cdmt-cpio-dired-save-archive-0 () ;✓
-;;;;;;;;   "Test the function of M-x cpio-dired-save-archive."
-;;;;;;;;   (let ((test-name "cdmt-cpio-dired-save-archive")
-;;;;;;;;         (cpio-archive-buffer)
-;;;;;;;;       (cpio-archive-buffer-contents-before)
-;;;;;;;;         (cpio-archive-buffer-contents)
-;;;;;;;;         (cpio-dired-buffer)
-;;;;;;;;         (cpio-dired-buffer-contents-before)
-;;;;;;;;         (cpio-dired-buffer-contents)
-;;;;;;;;         )
-;;;;;;;;     (cdmt-reset 'make)
-
-;;;;;;;;     (progn (goto-char (point-min))
-;;;;;;;;          (re-search-forward " aa$" (point-max))
-;;;;;;;;          (cpio-dired-do-delete 1)
-;;;;;;;;          (setq cpio-archive-buffer-contents-before
-;;;;;;;;                (cdmt-filter-archive-contents (with-current-buffer 
cpio-archive-buffer
-;;;;;;;;                                                
(buffer-substring-no-properties (point-min) (point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents-before (with-current-buffer 
cpio-dired-buffer
-;;;;;;;;                                                    
(buffer-substring-no-properties (point-min) (point-max)))))
-    
-;;;;;;;;     (should (and "Archive buffer should be modified."
-;;;;;;;;                (buffer-modified-p cpio-archive-buffer)))
-;;;;;;;;     (should (and "Archive buffer should be missing exactly the entry 
for aa."
-;;;;;;;;                (string-equal "070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaa  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; b     (( filename ))
-
-;;;;;;;; b
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bb    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070701       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbb   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070701       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 00000000      (( mode     ))
-;;;;;;;; 00000000      (( uid      ))
-;;;;;;;; 00000000      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000B      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-;;;;;;;;     (should (and "Checking dired-style buffer before saving."
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.newc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbbb
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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-before)))
-
-;;;;;;;;     (progn (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-filter-archive-contents 
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-    
-;;;;;;;;     ;; (cdmt-do-cpio-id (count-lines (point-min)(point)) 
(file-name-nondirectory *cdmt-small-archive*))
-    
-;;;;;;;;     (should (and "Archive buffer should no longer be modified."
-;;;;;;;;                (not (buffer-modified-p cpio-archive-buffer))))
-;;;;;;;;     (should (and "Checking the archive buffer after saving."
-;;;;;;;;                (string-equal "070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaa  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; b     (( filename ))
-
-;;;;;;;; b
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bb    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070701       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbb   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070701       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 00000000      (( mode     ))
-;;;;;;;; 00000000      (( uid      ))
-;;;;;;;; 00000000      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000B      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     (should (and "Checking the dired-style buffer after saving."
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.newc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbbb
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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)))
-
-;;;;;;;;     ;; The archive strings should be identical up to the TRAILER!!! 
padding.
-;;;;;;;;     ;; NO! Padding after any added, deleted or changed entry will 
also change.
-;;;;;;;;     ;; (string-match "TRAILER!!!" cpio-archive-buffer-contents-before)
-;;;;;;;;     ;; (setq cpio-archive-buffer-contents-before (substring 
cpio-archive-buffer-contents-before 0 (match-end 0)))
-;;;;;;;;     ;; (string-match "TRAILER!!!" cpio-archive-buffer-contents)
-;;;;;;;;     ;; (setq cpio-archive-buffer-contents (substring 
cpio-archive-buffer-contents 0 (match-end 0)))
-;;;;;;;;     ;; (should (string-equal cpio-archive-buffer-contents-before 
cpio-archive-buffer-contents))
-
-;;;;;;;;     (should (and "The dired style buffer should not have changed."
-;;;;;;;;                (string-equal cpio-dired-buffer-contents-before 
cpio-dired-buffer-contents)))
-
-;;;;;;;;     (cdmt-reset)
-
-;;;;;;;;     (progn (goto-char (point-min))
-;;;;;;;;          (re-search-forward " aaaa$" (point-max))
-;;;;;;;;          (setq unread-command-events (listify-key-sequence "dddd\n"))
-;;;;;;;;          (cpio-dired-do-rename 1)
-;;;;;;;;          (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-filter-archive-contents
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-
-;;;;;;;;     ;; (cdmt-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-small-archive*))
-    
-;;;;;;;;     (should (and "Expecting the standard archive with aaaa moved to 
ddddd."
-;;;;;;;;                (string-equal "070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; b     (( filename ))
-
-;;;;;;;; b
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bb    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070701       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbb   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070701       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; dddd  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 00000000      (( mode     ))
-;;;;;;;; 00000000      (( uid      ))
-;;;;;;;; 00000000      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000B      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     (should (and "Expecting a dired style buffer without aaaa."
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.newc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bbbb
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} dddd
-;;;;;;;; " cpio-dired-buffer-contents)))
-    
-;;;;;;;;     (cdmt-reset)
-    
-;;;;;;;;     (progn (goto-char (point-min))
-;;;;;;;;          (re-search-forward " b$" (point-max))
-;;;;;;;;          (cpio-dired-mark 4)
-;;;;;;;;          (setq unread-command-events (listify-key-sequence "d\n"))
-;;;;;;;;          (cpio-dired-do-rename 1)
-;;;;;;;;          (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-filter-archive-contents
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-
-;;;;;;;;     ;; (cdmt-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-small-archive*))
-
-;;;;;;;;     (should (and "Expecting a small archive with d/b, d/bb, d/bbb, 
d/bbbb."
-;;;;;;;;                (string-equal "070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaa   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; aaa
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070701       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccc   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; ccc
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; dddd  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000007      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; d/bbbb        (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; bbbb
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; d/bbb (( filename ))
-
-;;;;;;;; bbb
-
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; d/bb  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bb
-
-;;;;;;;; \\0\\0\\0070701       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000004      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; d/b   (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; b
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 00000000      (( mode     ))
-;;;;;;;; 00000000      (( uid      ))
-;;;;;;;; 00000000      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000B      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     ;; (cdmt-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-small-archive*))
-
-;;;;;;;;     (should (and "Looking for a small dired-style buffer with d/b, 
d/bb, d/bbb, d/bbbb"
-;;;;;;;;                (string-match "CPIO archive: alphabet_small.newc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} dddd
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/bbbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d/b
-;;;;;;;; " cpio-dired-buffer-contents)))
-
-;;;;;;;;     (cdmt-reset)
-
-;;;;;;;;     (progn (cpio-dired-mark-entries-regexp "\\`...\\'")
-;;;;;;;;          (setq unread-command-events (listify-key-sequence 
"newDirectory\n"))
-;;;;;;;;          ;; HEREHERE This rename does something wrong.
-;;;;;;;;          (cpio-dired-do-rename 1)
-;;;;;;;;          (cpio-dired-save-archive)
-;;;;;;;;          (setq cpio-archive-buffer-contents
-;;;;;;;;                (cdmt-filter-archive-contents
-;;;;;;;;                 (with-current-buffer cpio-archive-buffer
-;;;;;;;;                   (buffer-substring-no-properties (point-min) 
(point-max)))))
-;;;;;;;;          (setq cpio-dired-buffer-contents
-;;;;;;;;                (with-current-buffer cpio-dired-buffer
-;;;;;;;;                  (buffer-substring-no-properties (point-min) 
(point-max)))))
-
-;;;;;;;;     ;; (cdmt-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-small-archive*))
-
-;;;;;;;;     (should (string-equal "070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; a     (( filename ))
-
-;;;;;;;; a
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa (( filename ))
-
-;;;;;;;; aaaaa
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; aaaaa.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb (( filename ))
-
-;;;;;;;; bbbbb
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; bbbbb.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000002      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; c     (( filename ))
-
-;;;;;;;; c
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000003      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cc    (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; cc
-
-;;;;;;;; \\0\\0\\0070701       (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; cccc  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; cccc
-
-;;;;;;;; \\0070701     (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000008      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000006      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc (( filename ))
-
-;;;;;;;; ccccc
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000041ED      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000002      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000008      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; ccccc.d       (( filename ))
-;;;;;;;; \\0\\0070701  (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000005      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; dddd  (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaaa
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000007      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000012      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/bbbb     (( filename ))
-
-;;;;;;;; bbbb
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000011      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/bbb      (( filename ))
-;;;;;;;; \\0
-;;;;;;;; bbb
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000005      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000010      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/bb       (( filename ))
-;;;;;;;; \\0\\0
-;;;;;;;; bb
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000004      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000F      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/b        (( filename ))
-;;;;;;;; \\0\\0\\0
-;;;;;;;; b
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000011      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/ccc      (( filename ))
-;;;;;;;; \\0
-;;;;;;;; ccc
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 000081A4      (( mode     ))
-;;;;;;;; 000003E8      (( uid      ))
-;;;;;;;; 000003E8      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000006      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 00000011      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; newDirectory/aaa      (( filename ))
-;;;;;;;; \\0
-;;;;;;;; aaa
-
-;;;;;;;; 070701        (( magic    ))
-;;;;;;;; DEADBEEF      (( ino      ))
-;;;;;;;; 00000000      (( mode     ))
-;;;;;;;; 00000000      (( uid      ))
-;;;;;;;; 00000000      (( gid      ))
-;;;;;;;; 00000001      (( nlink    ))
-;;;;;;;; DEADBEEF      (( mtime    ))
-;;;;;;;; 00000000      (( filesize ))
-;;;;;;;; DEADBEEF      (( dev maj  ))
-;;;;;;;; DEADBEEF      (( dev min  ))
-;;;;;;;; DEADBEEF      (( rdev maj ))
-;;;;;;;; DEADBEEF      (( rdev min ))
-;;;;;;;; 0000000B      (( namesize ))
-;;;;;;;; 00000000      (( chksum   ))
-;;;;;;;; TRAILER!!!    (( filename ))
-;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-
-;;;;;;;;     (should (= 0 1))
-
-;;;;;;;;     ;; (cdmt-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-small-archive*))
-
-;;;;;;;;     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
-
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
-;;;;;;;;   -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\\} aaaaa
-;;;;;;;;   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\\} aaaaa.d
-;;;;;;;;   -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\\} bbbbb
-;;;;;;;;   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\\} bbbbb.d
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} c
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
-;;;;;;;;   -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
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} dddd
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/bbbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/bbb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/bb
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/b
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/ccc
-;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory/aaa
-;;;;;;;; " cpio-dired-buffer-contents))
-
-;;;;;;;;     (should (= 0 1))
-
-;;;;;;;;     ;; (cdmt-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-small-archive*))
-
-;;;;;;;;     ))
 
 (ert-deftest cdmt-cpio-describe-mode ()
   "Test cpio-describe-mode.
@@ -9006,7 +7213,8 @@ 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 (string-match "((\"a\" \.
+    (should (and "Expecting a catalog with  the first entry having group 9999."
+                (string-match "((\"a\" \.
   \[\[[[:digit:]]+ 33188 [[:digit:]]+ 9999 1
              ([[:digit:]]+ [[:digit:]]+)
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
@@ -9096,7 +7304,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
              ([[: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))
+" cpio-catalog-contents-after)))
 
     (cdmt-reset)
     
@@ -9136,7 +7344,8 @@ 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 (string-match"((\"a\" \.
+    (should (and "Expecting a catalog with the first 3 entries having group 
8888."
+                (string-match"((\"a\" \.
   \[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
              ([[:digit:]]+ [[:digit:]]+)
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
@@ -9226,7 +7435,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
              ([[: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))
+" cpio-catalog-contents-after)))
 
     (cdmt-reset)
 
@@ -10755,7 +8964,8 @@ TRAILER!!!       (( filename ))
   -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 (string-match "((\"a\" \.
+    (should (and "Expecting  a catalog with 4 entries owned by 8888."
+                (string-match "((\"a\" \.
   \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
              ([[:digit:]]+ [[:digit:]]+)
              4 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 2 0 \"a\"]
@@ -10845,7 +9055,7 @@ TRAILER!!!       (( filename ))
              ([[: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))
+" cpio-catalog-contents-after)))
 
     (cdmt-reset)
 
@@ -11004,7 +9214,8 @@ TRAILER!!!       (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
+    (should (and "Expecting an untouched archive. (11010)"
+                (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
 
     (should (and "Expecting entry 'a' to have owner 9999 and group 1111."
                 (string-match "CPIO archive: alphabet_small.newc.cpio:
@@ -11752,8 +9963,8 @@ a
 
 
 " cpio-archive-buffer-contents)))
-    (should (and "Checking that there is an entry »d« in the dired style 
buffer."
-                (string-match "CPIO archive: alphabet_small.newc.cpio:
+  (should (and "Checking that there is an entry »d« in the dired style buffer."
+              (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -11773,7 +9984,7 @@ a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
 " cpio-dired-buffer-contents)))
     (should (and "Expecting to see an entry »d«."
                 (string-match "((\"a\" \.
@@ -11942,7 +10153,7 @@ a
     (cdmt-test-save)))
 
 (ert-deftest cdmt-cpio-dired-do-copy-2 () ;✓
-  "Test the function of M-x cpio-do-copy."
+  "Test the function of M-x cpio-do-copy operating on multiple entries."
   (let ((test-name "cdmt-cpio-dired-do-copy")
         (cpio-archive-buffer)
         (cpio-archive-buffer-contents)
@@ -12337,7 +10548,8 @@ aaa
 
 \\0\\0
 " cpio-archive-buffer-contents)))
-    (should (string-match "CPIO archive: alphabet_small.newc.cpio:
+    (should (and (message "Expecting a dired-style buffer with 3 entries in 
newDirectory-1")
+                (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -12357,117 +10569,118 @@ aaa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/ccc
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/bbb
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/aaa
-" cpio-dired-buffer-contents))
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/ccc
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/bbb
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/aaa
+" 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 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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"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])
- (\"newDirectory-1/ccc\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/ccc\"]
-   #<marker at 2197 in alphabet_small\.newc\.cpio> #<marker at 2329 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 2337 in alphabet_small\.newc\.cpio> #<marker at 2469 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
- (\"newDirectory-1/aaa\" \.
-  \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
-             ([[:digit:]]+ [[:digit:]]+)
-             6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/aaa\"]
-   #<marker at 2477 in alphabet_small\.newc\.cpio> #<marker at 2609 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified\]))
-" cpio-catalog-contents-after)))
+\\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])
+\\s-+(\"aa\" \.
+\\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])
+\\s-+(\"aaa\" \.
+\\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])
+\\s-+(\"aaaa\" \.
+\\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])
+\\s-+(\"aaaaa\" \.
+\\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])
+\\s-+(\"aaaaa\.d\" \.
+\\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])
+\\s-+(\"b\" \.
+\\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])
+\\s-+(\"bb\" \.
+\\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])
+\\s-+(\"bbb\" \.
+\\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])
+\\s-+(\"bbbb\" \.
+\\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])
+\\s-+(\"bbbbb\" \.
+\\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])
+\\s-+(\"bbbbb\.d\" \.
+\\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])
+\\s-+(\"c\" \.
+\\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])
+\\s-+(\"cc\" \.
+\\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])
+\\s-+(\"ccc\" \.
+\\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])
+\\s-+(\"cccc\" \.
+\\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])
+\\s-+(\"ccccc\" \.
+\\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])
+\\s-+(\"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])
+\\s-+(\"newDirectory-1/ccc\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/ccc\"]
+\\s-+#<marker at 2197 in alphabet_small\.newc\.cpio> #<marker at 2329 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-1/bbb\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\s-+([[:digit:]]+ [[:digit:]]+)
+\\s-+6 [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ [[:digit:]]+ 19 0 
\"newDirectory-1/bbb\"]
+\\s-+#<marker at 2337 in alphabet_small\.newc\.cpio> #<marker at 2469 in 
alphabet_small\.newc\.cpio> cpio-mode-entry-unmodified])
+\\s-+(\"newDirectory-1/aaa\" \.
+\\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
+\\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)))
 
     (cdmt-test-save)))
 
@@ -13045,18 +11258,18 @@ aaa
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
 \\* -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
-  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\\} newDirectory-3/ccccc.d
-  -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\\} newDirectory-3/ccccc
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/cccc
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/ccc
-  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\\} newDirectory-3/bbbbb.d
-  -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\\} newDirectory-3/bbbbb
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbbb
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbb
-  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\\} newDirectory-3/aaaaa.d
-  -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\\} newDirectory-3/aaaaa
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaaa
-  -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaa
+C 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\\} newDirectory-3/ccccc.d
+C -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\\} newDirectory-3/ccccc
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/cccc
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/ccc
+C 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\\} newDirectory-3/bbbbb.d
+C -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\\} newDirectory-3/bbbbb
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbbb
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/bbb
+C 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\\} newDirectory-3/aaaaa.d
+C -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\\} newDirectory-3/aaaaa
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaaa
+C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaa
 " cpio-dired-buffer-contents)))
     (should (and "Expecting all entries named with at least 3 letters to have 
copies in newDirectory-3."
                 (string-match "((\"a\" \.
@@ -13677,7 +11890,8 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal "070701      (( magic    ))
+    (should (and "$xpecting an archive with one archive deleted but otherwise 
unchanged."
+                (string-equal "070701  (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
 000003E8       (( uid      ))
@@ -13921,8 +12135,9 @@ DEADBEEF        (( rdev min ))
 00000000       (( chksum   ))
 TRAILER!!!     (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-" cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.newc.cpio:
+" cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with 4 more entries deleted."
+                (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
@@ -13937,7 +12152,7 @@ TRAILER!!!      (( filename ))
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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))
+" cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with entries"
                 "    »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted."
                 (string-match "((\"aa\" \.
@@ -14020,7 +12235,8 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal "070701      (( magic    ))
+    (should (and "Expecting an archive with ... deleted."
+                (string-equal "070701  (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
 000003E8       (( uid      ))
@@ -14210,8 +12426,9 @@ DEADBEEF        (( rdev min ))
 00000000       (( chksum   ))
 TRAILER!!!     (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-" cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.newc.cpio:
+" cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with ... all deleted."
+                (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} bb
@@ -14223,7 +12440,7 @@ TRAILER!!!      (( filename ))
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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))
+" cpio-dired-buffer-contents)))
     (should (and "Expecting a catalog with further entries \`...\' deleted."
                 (string-match "((\"aa\" \.
   \[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
@@ -14817,15 +13034,21 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
                     (buffer-substring-no-properties (point-min) (point-max))))
             (setq cpio-catalog-contents-after (format "%s" (pp 
(cpio-catalog))))))
 
-
     (with-current-buffer cpio-dired-buffer
-      (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
-      (should (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-      (should (not (null cpio-contents-buffer)))
-      (should (buffer-live-p cpio-contents-buffer))
-      (should (string-equal cpio-contents-buffer-string (concat "\n" 
entry-name "\n\n")))
-      (should (window-live-p cpio-contents-window))
-      (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
+      (should (and "Expecting an untouched small archive. (14832)"
+                  (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
+      (should (and  "Expecting an untouched small dired buffer (14834)"
+                   (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+      (should (and "Expecting a real entry contents buffer. (14836)"
+                  (not (null cpio-contents-buffer))))
+      (should (and "...and expecting the entry contents buffer to be live. 
(14838)"
+                  (buffer-live-p cpio-contents-buffer)))
+      (should (and (format "Expecting that buffer to contain the contents of 
[[%s]]. (14840)" entry-name)
+                  (string-equal cpio-contents-buffer-string (concat "\n" 
entry-name "\n\n"))))
+      (should (and "Expecting a live entry contents window. (14842)"
+                  (window-live-p cpio-contents-window)))
+      (should (and "Expecting an unchanged entry contents buffer. (14844)"
+                  (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
     (push entry-name past-entries)
     
@@ -14850,13 +13073,16 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
                     (buffer-substring-no-properties (point-min) 
(point-max))))))
 
     (with-current-buffer cpio-dired-buffer
-      (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
-      (should (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
+      (should (and "Expecting an unchanged small archive. (14870)."
+                  (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
+      (should (and "Expecting an untouched cpio-dired buffer (14872)"
+                  (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string "\nccc\n\n"))
       (should (window-live-p cpio-contents-window))
-      (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
+      (should (and "Expecting an unchanged catalog. (17957)"
+                  (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
     ;; Now make sure that any past entries are still there.
     (mapc (lambda (en)
@@ -15284,7 +13510,8 @@ c
 
 
 " cpio-archive-buffer-contents)))
-    (should (string-match "CPIO archive: alphabet_small.newc.cpio:
+     (should (and "Expecting a cpio-dired buffer with an autosave entry for 
each onecharacter entry."
+                 (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -15307,8 +13534,9 @@ c
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #a
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #b
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #c
-" cpio-dired-buffer-contents))
-    (should (string-match "((\"a\" \.
+" 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\"]
@@ -15413,7 +13641,7 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
              ([[: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\]))
-" cpio-catalog-contents-after))))
+" cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-cpio-dired-flag-backup-entries ()
   "Test cpio-dired-flag-backup-entries.
@@ -15449,8 +13677,10 @@ cpio-dired-flag-entries-regexp is not yet implemented 
-- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.newc.cpio:
+    (should (and "Expecting and unchanged small archive. (15472)"
+                (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with one entry flagged for 
deletion."
+                (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -15470,8 +13700,9 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17958)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 2)
@@ -15485,8 +13716,10 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.newc.cpio:
+    (should (and "Expecting and unchanged small archive. (15510)"
+                (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with another 4 entries flagged 
for deletion."
+                (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -15506,8 +13739,9 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17959)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-cpio-dired-flag-garbage-entries ()
   "Test cpio-dired-flag-garbage-entries."
@@ -16189,8 +14423,10 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
     
-    (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.newc.cpio:
+    (should (and "Expecting and unchanged small archive. (16216)"
+                (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with the first entry marked."
+                (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -16210,8 +14446,9 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17960)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 2)
@@ -16225,8 +14462,10 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal cpio-archive-buffer-contents 
*cdmt-untouched-small-archive*))
-    (should (string-match "CPIO archive: alphabet_small.newc.cpio:
+    (should (and "Expecting and unchanged small archive. (16254)"
+                (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with 4 more entries marked."
+                (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -16246,8 +14485,9 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17961)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-cpio-dired-mark-directories ()
   "Test cpio-dired-mark-directories.
@@ -16282,8 +14522,10 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match "CPIO archive: alphabet_small.newc.cpio:
+    (should (and "Expecting and unchanged small archive. (16313)"
+                (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting a cpio-dired buffer with ... marked."
+                 (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -16303,8 +14545,9 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} cccc
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+" cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17962)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-cpio-dired-mark-executables ()
   "Test cpio-dired-mark-executables.
@@ -16492,9 +14735,12 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
     
     (should (string-equal "a" entry-name))
-    (should (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an untouched cpio-dired buffer. (16526)"
+                (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting and unchanged small archive. (16526)"
+                (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17963)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 2)
@@ -16509,8 +14755,10 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
     (should (string-equal "aaa" entry-name))
-    (should (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
+    (should (and "Expecting an untouched cpio-dired buffer. (16545)"
+                (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting and unchanged small archive. (16544)"
+                (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 4)
@@ -16525,9 +14773,12 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
     (should (string-equal "b" entry-name))
-    (should (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an untouched cpio-dired buffer. (16563)"
+                (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting and unchanged small archive. (16561)"
+                (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17964)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 100)
@@ -16542,9 +14793,12 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
     (should (equal nil entry-name))
-    (should (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an untouched cpio-dired buffer. (16582)"
+                (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting and unchanged small archive. (16579)"
+                (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17965)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-cpio-dired-next-marked-entry ()
   "Test cpio-dired-next-marked-entry.
@@ -16605,9 +14859,12 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
     (should (= where 1155))
-    (should (string-match *cdmt-untouched-small-archive-buffer* 
cpio-archive-buffer-contents))
-    (should (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting and unchanged small archive. (16642)"
+                (string-equal *cdmt-untouched-small-archive-buffer* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an untouched cpio-dired buffer. (16649)"
+                (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17966)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-previous-line 2)
@@ -16623,8 +14880,10 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
 
     (should (= where 1019))
     (should (string-match *cdmt-untouched-small-archive-buffer* 
cpio-archive-buffer-contents))
-    (should (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an untouched cpio-dired buffer. (16667)"
+                (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17967)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-previous-line 4)
@@ -16639,9 +14898,12 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
     (should (= where 774))
-    (should (string-match *cdmt-untouched-small-archive-buffer* 
cpio-archive-buffer-contents))
-    (should (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting and unchanged small archive. (16677)"
+                (string-equal *cdmt-untouched-small-archive-buffer* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an untouched cpio-dired buffer. (16686)"
+                (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17968)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-cpio-dired-previous-line ()
   "Test cpio-dired-previous-line.
@@ -16763,7 +15025,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17969)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-next-line 2)
@@ -16801,7 +15064,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17970)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 4)
@@ -16839,7 +15103,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17971)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (dired-next-line 4)
@@ -16877,7 +15142,8 @@ cpio-dired-undo 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an unchanged catalog. (17972)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-cpio-dired-unmark-all-entries ()
   "Test cpio-dired-unmark-all-entries."
@@ -16932,7 +15198,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17973)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-entries "" nil)
@@ -16969,7 +15236,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17974)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-mark-entries-regexp ".")
@@ -17014,7 +15282,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17975)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-entries "B" nil)
@@ -17052,7 +15321,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* 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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17976)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-entries "F" nil)
@@ -17089,7 +15359,8 @@ E -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an unchanged catalog. (17977)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-cpio-dired-unmark-all-marks ()
   "Test cpio-dired-unmark-all-marks."
@@ -17144,7 +15415,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
+    (should (and "Expecting an unchanged catalog. (17978)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
   
     (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
           (cpio-dired-unmark-all-marks)
@@ -17181,7 +15453,8 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   -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 (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting an unchanged catalog. (17979)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-cpio-dired-unmark-all-marks () ;✓
   "Test the function of M-x cpio-unmark-all-marks."
@@ -17214,9 +15487,12 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
 
-    (should (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (should (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
+    (should (and "Expecting and unchanged small archive. (17253)"
+                (string-equal *cdmt-untouched-small-archive* 
cpio-archive-buffer-contents)))
+    (should (and "Expecting an untouched cpio-dired buffer. (17263)"
+                (string-match *cdmt-untouched-small-dired-buffer* 
cpio-dired-buffer-contents)))
+    (should (and "Expecting an unchanged catalog. (17980)"
+                (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-cpio-dired-unmark-backward ()
   "Test cpio-dired-unmark-backward.
@@ -17385,33 +15661,6 @@ cpio-mouse-face is not yet implemented -- expect an 
error."
   (should-error (cpio-mouse-face)
      :type 'error))
 
-;;;;;;;; (ert-deftest cdmt-cpio-quit-window () ;✓
-;;;;;;;;   "Test cpio-quit-window.
-;;;;;;;; cpio-quit-window is not yet implemented -- expect an error."
-;;;;;;;;   (let ((test-name "cdmt-cpio-dired-quit-window")
-;;;;;;;;         (cpio-archive-buffer)
-;;;;;;;;         (cpio-archive-buffer-contents)
-;;;;;;;;         (cpio-dired-buffer)
-;;;;;;;;         (cpio-dired-buffer-contents)
-;;;;;;;;       (cpio-archive-window)
-;;;;;;;;       (cpio-dired-window)
-;;;;;;;;         )
-;;;;;;;;     (cdmt-reset 'make)
-
-;;;;;;;;     (setq cpio-dired-window (get-buffer-window (get-buffer 
cpio-dired-buffer)))
-;;;;;;;;     (should (window-live-p cpio-dired-window))
-;;;;;;;;     (setq cpio-archive-window (get-buffer-window (get-buffer 
cpio-archive-buffer)))
-;;;;;;;;     ;; (should (not (window-live-p cpio-dired-window)))
-;;;;;;;;     (should (eq nil cpio-archive-window))
-
-;;;;;;;; This causes an error under ERT.
-;;;;;;;;     (cpio-quit-window)
-
-;;;;;;;;     (setq cpio-dired-window (get-buffer-window (get-buffer 
cpio-dired-buffer)))
-;;;;;;;;     (should (eq nil cpio-dired-window))
-;;;;;;;;     (setq cpio-archive-window (get-buffer-window (get-buffer 
cpio-archive-buffer)))
-;;;;;;;;     (should (eq nil cpio-archive-window))))
-
 (ert-deftest cdmt-revert-buffer ()
   "Test revert-buffer.
 revert-buffer is not yet implemented -- expect an error."
@@ -17799,8 +16048,8 @@ newDirectory    (( filename ))
   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
   drwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory
 " cpio-dired-buffer-contents)))
-    ;; (should (and "Expecting a catalog with a new directory called 
»newDirectory«."
-       (should  (string-match "((\"newDirectory\" \\.
+    (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\"]
@@ -17895,7 +16144,7 @@ newDirectory    (( filename ))
              ([[: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))
+" cpio-catalog-contents-after)))
     
     (cdmt-test-save)))
 
diff --git a/cpio-dired.el b/cpio-dired.el
index aa6e1f1..527d7af 100644
--- a/cpio-dired.el
+++ b/cpio-dired.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cpio-dired.el --- UI definition à la dired.
-;      $Id: cpio-dired.el,v 1.3 2018/05/18 23:55:30 doug Exp $ 
+;      $Id: cpio-dired.el,v 1.4 2018/06/03 14:01:55 doug Exp $ 
 
 ;; COPYRIGHT
 
@@ -45,6 +45,7 @@
 ;;
 ;; Hacks
 ;;
+
 (defun snarf-defuns ()
   "Return a list of the defuns in the visible porition of the buffer.
 Keep any preceding comments." 
@@ -76,7 +77,7 @@ Keep any preceding comments."
          (mapcar (lambda (d)
                    (let ((defun-name (save-match-data
                                        (and (string-match "(defun 
\\([[:graph:]]+\\) " d)
-                                            (match-string 1 d)))))
+                                            (match-string-no-properties 1 
d)))))
                      (cons defun-name d)))
                  defuns))
     (setq sorted-list (sort sortable-list (lambda (l r)
@@ -144,6 +145,57 @@ Keep any preceding comments."
                                             "\\|"
                                             "[[:digit:]]\\{4\\}"
                                             "\\)"))
+
+(defvar *cpio-dired-inner-entry-regexp* (concat "\\("
+                                               "[-dpstrwx]\\{10\\}"
+                                               "\\)"
+                                               "\\s-+"
+                                               "[[:digit:]]+" ;nlinks
+                                               "\\s-+"
+                                               "\\("
+                                               "[[:alnum:]]+" ;user
+                                               "\\)"
+                                               "\\s-+"
+                                               "\\("
+                                               "[[:alnum:]]+" ;group
+                                               "\\)"
+                                               
+                                               "\\s-+"
+                                               "[[:digit:]]+" ;filesize
+                                               "\\s-+"
+                                               "\\("
+                                               *cpio-dired-date-time-regexp*
+                                               "\\)"
+                                               "\\s-+"
+                                               "\\("
+                                               "[[:graph:]]+"
+                                               "\\)")
+  "Regular expression to match the \"ls -l\" portion of an entry's line.")
+(setq *cpio-dired-inner-entry-regexp* (concat "\\("
+                                             "[-dpstrwx]\\{10\\}"
+                                             "\\)"
+                                             "\\s-+"
+                                             "[[:digit:]]+" ;nlinks
+                                             "\\s-+"
+                                             "\\("
+                                             "[[:alnum:]]+" ;user
+                                             "\\)"
+                                             "\\s-+"
+                                             "\\("
+                                             "[[:alnum:]]+" ;group
+                                             "\\)"
+                                             
+                                             "\\s-+"
+                                             "[[:digit:]]+" ;filesize
+                                             "\\s-+"
+                                             "\\("
+                                             *cpio-dired-date-time-regexp*
+                                             "\\)"
+                                             "\\s-+"
+                                             "\\("
+                                             "[[:graph:]]+"
+                                             "\\)"))
+
 (defvar *cpio-dired-entry-regexp* (concat ".."
                                          "\\("
                                              
*cpio-dired-permission-flags-regexp*
@@ -170,30 +222,7 @@ Keep any preceding comments."
                                          "\\)")
   "Regular expression to match an entry's line in cpio-dired-mode")
 (setq *cpio-dired-entry-regexp* (concat ".."
-                                         "\\("
-                                             "[-dpstrwx]\\{10\\}"
-                                         "\\)"
-                                         "\\s-+"
-                                         "[[:digit:]]+" ;nlinks
-                                         "\\s-+"
-                                         "\\("
-                                             "[[:alnum:]]+" ;user
-                                         "\\)"
-                                         "\\s-+"
-                                         "\\("
-                                             "[[:alnum:]]+" ;group
-                                         "\\)"
-
-                                         "\\s-+"
-                                         "[[:digit:]]+" ;filesize
-                                         "\\s-+"
-                                         "\\("
-                                             *cpio-dired-date-time-regexp*
-                                         "\\)"
-                                         "\\s-+"
-                                         "\\("
-                                             "[[:graph:]]+"
-                                         "\\)"))
+                                       *cpio-dired-inner-entry-regexp*))
 
 (defvar *cpio-dired-mode-idx*      1
   "Index of the mode match in *cpio-dired-entry-regexp*.")
@@ -266,7 +295,8 @@ Important: the match ends just after the marker.")
 (defvar cpio-dired-re-exe;; match ls permission string of an executable file
   (mapconcat (function
              (lambda (x)
-               (concat cpio-dired-re-maybe-mark cpio-dired-re-inode-size x)))
+               ;; (concat cpio-dired-re-maybe-mark cpio-dired-re-inode-size 
x)))
+               (concat cpio-dired-re-maybe-mark " " x)))
             '("-[-r][-w][xs][-r][-w].[-r][-w]."
               "-[-r][-w].[-r][-w][xs][-r][-w]."
               "-[-r][-w].[-r][-w].[-r][-w][xst]")
@@ -274,6 +304,83 @@ Important: the match ends just after the marker.")
 (defvar cpio-dired-re-perms "[-bcdlps][-r][-w].[-r][-w].[-r][-w].")
 (defvar cpio-dired-re-dot "^.* \\.\\.?/?$")
 (defvar cpio-dired-font-lock-keywords
+  ;; cpio-dired-font-lock-keywords is adapted from dired.
+  (list
+   ;;
+   ;; Dired marks.
+   (list cpio-dired-re-mark '(0 cpio-dired-mark-face))
+   ;;
+   ;; We make heavy use of MATCH-ANCHORED, since the regexps don't identify the
+   ;; entry name itself.  We search for Dired defined regexps, and then use the
+   ;; cpio-dired defined function `cpio-dired-move-to-entry-name' before 
searching for the
+   ;; simple regexp ".+".  It is that regexp which matches the entry name.
+   ;;
+   ;; Marked entries.
+   (list (concat "^[" (char-to-string cpio-dired-marker-char) "]")
+         '(".+" (cpio-dired-move-to-entry-name) nil (0 
cpio-dired-marked-face)))
+   ;;
+   ;; Flagged entries.
+   (list (concat "^[" (char-to-string cpio-dired-del-marker) "]")
+         '(".+" (cpio-dired-move-to-entry-name) nil (0 
cpio-dired-flagged-face)))
+   ;; People who are paranoid about security would consider this more
+   ;; important than other things such as whether it is a directory.
+   ;; But we don't want to encourage paranoia, so our default
+   ;; should be what's most useful for non-paranoids. -- rms.
+   ;; 
+   ;; However, we don't need to highlight the entry name, only the
+   ;; permissions, to win generally.  -- fx.
+   ;; Fixme: we could also put text properties on the permission
+   ;; fields with keymaps to frob the permissions, somewhat a la XEmacs.
+;;DL   (list (concat cpio-dired-re-maybe-mark cpio-dired-re-inode-size
+;;DL            "[-d]....\\(w\\)....") ; group writable
+;;DL    '(1 cpio-dired-perm-write-face))
+;;DL   (list (concat cpio-dired-re-maybe-mark cpio-dired-re-inode-size
+;;DL            "[-d].......\\(w\\).") ; world writable
+;;DL    '(1 cpio-dired-perm-write-face))
+   ;;
+   ;; Subdirectories.
+   (list cpio-dired-re-dir
+        '(".+" (cpio-dired-move-to-entry-name) nil (0 
cpio-dired-directory-face)))
+   ;;
+   ;; Symbolic links.
+   (list cpio-dired-re-sym
+        '(".+" (cpio-dired-move-to-entry-name) nil (0 
cpio-dired-symlink-face)))
+   ;;
+   ;; Entrys suffixed with `completion-ignored-extensions'.
+   '(eval .
+     ;; It is quicker to first find just an extension, then go back to the
+     ;; start of that entry name.  So we do this complex MATCH-ANCHORED form.
+     (list (concat "\\(" (regexp-opt completion-ignored-extensions) "\\|#\\)$")
+          '(".+" (cpio-dired-move-to-entry-name) nil (0 
cpio-dired-ignored-face))))
+   ;;
+   ;; Entrys suffixed with `completion-ignored-extensions'
+   ;; plus a character put in by -F.
+   '(eval .
+     (list (concat "\\(" (regexp-opt completion-ignored-extensions)
+                  "\\|#\\)[*=|]$")
+          '(".+" (progn
+                   (end-of-line)
+                   ;; If the last character is not part of the entry-name,
+                   ;; move back to the start of the entry-name
+                   ;; so it can be fontified.
+                   ;; Otherwise, leave point at the end of the line;
+                   ;; that way, nothing is fontified.
+                   (unless (get-text-property (1- (point)) 'mouse-face)
+                     (cpio-dired-move-to-entry-name)))
+            nil (0 cpio-dired-ignored-face))))
+   ;;
+   ;; Explicitly put the default face on entry names ending in a colon to
+   ;; avoid fontifying them as directory header.
+   (list (concat cpio-dired-re-maybe-mark " " cpio-dired-re-perms ".*:$")
+        '(".+" (cpio-dired-move-to-entry-name) nil (0 'default)))
+   ;;
+   ;; Directory headers.
+   ;;;; (list cpio-dired-subdir-regexp '(1 cpio-dired-header-face))
+   
+   )
+  "Additional expressions to highlight in cpio-dired mode.")
+(setq cpio-dired-font-lock-keywords 
+  ;; cpio-dired-font-lock-keywords is adapted from dired.
   (list
    ;;
    ;; Dired marks.
@@ -281,7 +388,7 @@ Important: the match ends just after the marker.")
    ;;
    ;; We make heavy use of MATCH-ANCHORED, since the regexps don't identify the
    ;; entry name itself.  We search for Dired defined regexps, and then use the
-   ;; Dired defined function `cpio-dired-move-to-entry-name' before searching 
for the
+   ;; cpio-dired defined function `cpio-dired-move-to-entry-name' before 
searching for the
    ;; simple regexp ".+".  It is that regexp which matches the entry name.
    ;;
    ;; Marked entries.
@@ -340,14 +447,13 @@ Important: the match ends just after the marker.")
    ;;
    ;; Explicitly put the default face on entry names ending in a colon to
    ;; avoid fontifying them as directory header.
-   (list (concat cpio-dired-re-maybe-mark cpio-dired-re-inode-size 
cpio-dired-re-perms ".*:$")
+   (list (concat cpio-dired-re-maybe-mark " " cpio-dired-re-perms ".*:$")
         '(".+" (cpio-dired-move-to-entry-name) nil (0 'default)))
    ;;
    ;; Directory headers.
    ;;;; (list cpio-dired-subdir-regexp '(1 cpio-dired-header-face))
    
-   )
-  "Additional expressions to highlight in cpio-dired mode.")
+   ))
 
 (defvar cpio-entry-name ()
   "Name of the entry whose contents are being edited.")
@@ -370,6 +476,12 @@ Important: the match ends just after the marker.")
 (defvar *cpio-dired-head-offset* 2
   "The number of lines in the cpio-dired buffer devoted to the dired-style 
header.")
 
+(defvar *cpio-dired-buffer* ()
+  "The [subordinate] buffer used to present the curent catalog
+à la dired.")
+(setq *cpio-dired-buffer* ())
+(make-variable-buffer-local '*cpio-dired-buffer*)
+
 
 ;;
 ;; Customizations
@@ -475,6 +587,12 @@ Important: the match ends just after the marker.")
   :group 'cpio-dired
   :type 'boolean)
 
+;; N.B. This is here because this file is where the cpio-dired lines are 
created.
+(defcustom cpio-try-names t
+  "Non-nil means that GIDs and UIDs are displayed as integers."
+  :group 'cpio
+  :type 'boolean)
+
 
 ;; 
 ;; Library
@@ -487,7 +605,7 @@ Important: the match ends just after the marker.")
       (beginning-of-line)
       (save-match-data
        (if (looking-at *cpio-dired-entry-regexp*)
-           (match-string *cpio-dired-name-idx*))))))
+           (match-string-no-properties *cpio-dired-name-idx*))))))
 
 (defun cpio-contents-buffer-name (name)
   "Return the name of the buffer that would/does hold the contents of entry 
NAME.
@@ -544,11 +662,11 @@ Run more than one instance of emacs to avoid such 
collisions."
 (defun cpio-internal-do-deletion (entry-name)
   "Remove the entry with name ENTRY-NAME from a cpio-archive.
 CONTRACT: You're in that archive's buffer."
-  (let* ((fname "cpio-internal-do-deletion")
-        (entry-info)
-        (start-marker)
-        (end-marker)
-        (entry-attrs))
+  (let ((fname "cpio-internal-do-deletion")
+       (entry-info)
+       (start-marker)
+       (end-marker)
+       (entry-attrs))
     (if *cab-parent*
        (with-current-buffer *cab-parent*
          (cpio-internal-do-deletion entry-name))
@@ -580,11 +698,16 @@ if none are so marked, then the next ARG entries."
          (setq i (1+ i)))))
     files))
 
-(defun cpio-dired-add-contents (attrs contents &optional cpio-dired-buffer)
+(defun cpio-dired-add-contents (attrs contents &optional cpio-dired-buffer 
mark)
   "Add an entry to a cpio archive using the given ATTRS with the given 
CONTENTS.
+
 CONTRACT: The archive buffer has no trailer.
+
 The optional argument CPIO-DIRED-BUFFER is just there
-to make the recursive call this function inside the archive buffer sensible."
+to make the recursive call this function inside the archive buffer sensible.
+
+If the optional argument MARK, a character, is not NIL,
+then use that to mark the new entry."
   ;; CAUTION: There's lots of code duplicated with M-x cpio-dired-add-entry.
   (unless cpio-dired-buffer (setq cpio-dired-buffer (current-buffer)))
   (let ((fname "cpio-dired-add-contents")
@@ -595,7 +718,7 @@ to make the recursive call this function inside the archive 
buffer sensible."
        (contents-start-marker))
     (if *cab-parent*
        (with-current-buffer *cab-parent*
-         (cpio-dired-add-contents attrs contents cpio-dired-buffer))
+         (cpio-dired-add-contents attrs contents cpio-dired-buffer mark))
       (setq new-catalog-entry (make-vector *cpio-catalog-entry-length* nil))
 
       (cpio-delete-trailer)
@@ -626,7 +749,7 @@ to make the recursive call this function inside the archive 
buffer sensible."
        (save-excursion
          (goto-char (point-max))
          (setq buffer-read-only nil)
-         (insert (cpio-dired-format-entry attrs) "\n")
+         (insert (cpio-dired-format-entry attrs mark) "\n")
          (setq buffer-read-only t))))))
 
 (defun cpio-dired-get-marked-entries (&optional arg) ;✓
@@ -662,7 +785,7 @@ CONTRACT: TARGET is the actual TARGET name, not an implied 
directory entry."
        (attrs (copy-sequence (cpio-entry-attrs entry)))
        (contents (cpio-contents entry)))
     (cpio-set-entry-name attrs target)
-    (cpio-dired-add-contents attrs contents)))
+    (cpio-dired-add-contents attrs contents nil cpio-dired-keep-marker-copy)))
 
 (defun cpio-dired-internal-do-rename (entry-name target)
   "Rename ENTRY-NAME to the TARGET entry.
@@ -688,11 +811,11 @@ CONTRACT:
 
 (defun cpio-dired-mark-read-regexp (operation)
   "Read a regular expression to match entries for the given OPERATION."
-    (let* ((fname "cpio-dired-mark-read-regexp")
-          (regexp (read-regexp
-                   (format "%s on entries matching regexp: " operation)
-                   nil
-                   'dired-regexp-history))
+    (let ((fname "cpio-dired-mark-read-regexp")
+         (regexp (read-regexp
+                  (format "%s on entries matching regexp: " operation)
+                  nil
+                  'dired-regexp-history))
           (mark-char (cond ((string-equal operation "Copy")
                             cpio-dired-keep-marker-copy)
                            ((string-equal operation "Rename")
@@ -735,6 +858,73 @@ CONTRACT: You're on the line to be replaced."
     (setq buffer-read-only nil)
     (delete-region (line-beginning-position) (line-end-position))
     (setq buffer-read-only t)))
+
+(defun cpio-dired-buffer-name (archive-name)
+  "Return the name of the dired-style buffer for ARCHIVE-NAME."
+  (let ((fname "cpio-dired-buffer-name"))
+    (concat "CPIO archive: " (file-name-nondirectory archive-name))))
+
+(defun cpio-present-ala-dired (archive-buffer)
+  "Create a buffer with a ls -l format reflecting the contents of the current 
cpio archive.
+This returns the buffer created."
+  (let* ((fname "cpio-present-ala-dired")
+        (archive-name (with-current-buffer archive-buffer
+                        (file-name-nondirectory (buffer-file-name))))
+        (buffer-name (cpio-dired-buffer-name archive-name))
+        (buffer (get-buffer-create buffer-name)) ;Is this not archive-buffer?
+        (entry-string)
+        (catalog (cpio-catalog)))
+    (with-current-buffer buffer
+      (setq *cpio-catalog* catalog)
+      (setq buffer-read-only nil)
+      (erase-buffer)
+      (insert "CPIO archive: " archive-name ":\n\n")
+      (mapc (lambda (e)
+             (let ((line (cpio-dired-format-entry (aref (cdr e) 0))))
+               (insert (concat line "\n"))))
+           (cpio-sort-catalog))
+      (setq buffer-read-only t)
+      (cpio-dired-mode))
+    ;; No, I do not yet understand why this must be done
+    ;; every time the presentation is updated.
+    (cab-register buffer archive-buffer)
+    buffer))
+
+(defun cpio-dired-move-to-first-entry ()
+  "Move the point to the first entry in a cpio-dired style buffer."
+  (let ((fname "cpio-dired-move-to-first-entry"))
+    (unless (eq major-mode 'cpio-dired-mode)
+      (error "%s(): You're not in a cpio-dired buffer." fname))
+    (goto-char (point-min))
+    (cpio-dired-next-line *cpio-dired-head-offset*)))
+
+(defun cpio-dired-format-entry (attrs &optional mark)
+  "Create a dired-style line for ATTRS.
+If the optional MARK is given,
+then it is a character and used as the mark on the generated line.
+The line does not include a trailing <new line>."
+  (let* ((fname "cpio-dired-format-entry")
+        (mode-string       (cpio-int-mode-to-mode-string         
(cpio-mode-value attrs)))
+        (uid-string        (cpio-uid-to-uid-string               (cpio-uid     
   attrs)))
+        (gid-string        (cpio-gid-to-gid-string               (cpio-gid     
   attrs)))
+        (nlink-string      (cpio-nlink-to-nlink-string           (cpio-nlink   
   attrs)))
+        (mtime-string      (cpio-mtime-to-mtime-string           (cpio-mtime   
   attrs)))
+        (filesize-string   (cpio-filesize-to-filesize-string     
(cpio-entry-size attrs)))
+        (dev-maj-string    (cpio-dev-maj-to-dev-maj-string       (cpio-dev-maj 
   attrs)))
+        (dev-min-string    (cpio-dev-min-to-dev-min-string       (cpio-dev-min 
   attrs)))
+        (entry-name-string (cpio-entry-name-to-entry-name-string 
(cpio-entry-name attrs)))
+        (fmt (if entry-name-string
+                 (if cpio-try-names
+                     (format "%%c %%s %%3s %%8s %%8s %%8s %%7s %%s")
+                   (format   "%%c %%s %%3s %%5s %%5s %%8s %%7s %%s"))
+               nil)))
+    (unless mark (setq mark ?\s))
+    (unless (characterp mark)
+      (signal 'wrong-type-error (list 'characterp mark)))
+    (if fmt
+       (format fmt mark 
+               mode-string nlink-string uid-string gid-string 
+               filesize-string mtime-string entry-name-string))))
 
 ;;
 ;; Commands
@@ -763,12 +953,12 @@ if CPIO-DIRED-BUFFER is NIL (i.e. you're /in/ the 
cpio-dired buffer),
 then use the current buffer."
   ;; CAUTION: There's lots of code duplicated with M-x cpio-dired-add-contents.
   (interactive "fFile: ")
-  (let* ((fname "cpio-dired-add-entry")
-        (entry-attrs)
-        (header-start-marker)
-        (contents-start-marker)
-        (header-string)
-        (cpio-dired-buffer (or cpio-dired-buffer (current-buffer))))
+  (let ((fname "cpio-dired-add-entry")
+       (entry-attrs)
+       (header-start-marker)
+       (contents-start-marker)
+       (header-string)
+       (cpio-dired-buffer (or cpio-dired-buffer (current-buffer))))
     (if (string-match-p "^~/" filename)
        (setq filename (expand-file-name filename)))
     (cond (*cab-parent*
@@ -1109,9 +1299,9 @@ into the minibuffer."
                (replace-regexp-in-string
                 "-" ""
                 (format "u=%s,g=%s,o=%s"
-                        (match-string 1 mode-string)
-                        (match-string 2 mode-string)
-                        (match-string 3 mode-string)))))
+                        (match-string-no-properties 1 mode-string)
+                        (match-string-no-properties 2 mode-string)
+                        (match-string-no-properties 3 mode-string)))))
         (modes (dired-mark-read-string
                 "Change mode of %s to: "
                 nil 'chmod arg entries default)))
@@ -1630,8 +1820,8 @@ See function `dired-do-rename-regexp' for more info."
 Type M-n to pull the entry attributes of the entry at point
 into the minibuffer."
   (interactive "p")
-  (let* ((fname "cpio-dired-do-touch")
-        (names (cpio-dired-get-marked-entries arg)))
+  (let ((fname "cpio-dired-do-touch")
+       (names (cpio-dired-get-marked-entries arg)))
     (error "%s() is not yet implemented" fname)
     (cpio-dired-set-modified)))
 
@@ -1683,9 +1873,9 @@ into the minibuffer."
   "In a cpio UI buffer, visit the contents of the entry named on this line.
 Return the buffer containing those contents."
   (interactive)
-  (let* ((fname "cpio-dired-find-entry")
-        (find-file-run-dired t)
-        (local-entry-name (cpio-dired-get-entry-name)))
+  (let ((fname "cpio-dired-find-entry")
+       (find-file-run-dired t)
+       (local-entry-name (cpio-dired-get-entry-name)))
     (cond ((null local-entry-name)
           (message "%s(): Could not get entry name." fname))
          (t (cpio-find-entry local-entry-name)))))
@@ -1716,12 +1906,20 @@ A prefix argument says to unmark or unflag those files 
instead."
          (cpio-dired-next-line 1))))))
 
 ;; ~           dired-flag-backup-entries
-(defun cpio-dired-flag-backup-entries (arg) ;×
+(defun cpio-dired-flag-backup-entries (unflag-p) ;✓✓✓✓
+  ;; Modeled very closely on the corresponding dired function
   "Flag all backup entries (names ending with `~') for deletion.
 With prefix argument, unmark or unflag these entries."
-  (interactive "p")
-  (let ((fname "cpio-dired-flag-backup-entries"))
-    (error "%s() is not yet implemented" fname)))
+  (interactive "P")
+  (let ((fname "cpio-dired-flag-backup-entries")
+       (dired-marker-char (if unflag-p ?\s dired-del-marker)))
+    (dired-mark-if
+     (and (save-excursion (end-of-line)
+                         (eq (preceding-char) ?~))
+         (not (looking-at-p dired-re-dir))
+         (let ((entry-name (cpio-dired-get-entry-name))) ;The main 
modification for cpio-dired-mode.
+           (if entry-name (backup-file-name-p entry-name))))
+     "backup file")))
 
 ;; % d         dired-flag-entries-regexp
 (defun cpio-dired-flag-entries-regexp (regexp) ;×
@@ -1959,7 +2157,7 @@ With prefix argument, unmark or unflag all those entries."
       (cpio-dired-move-to-first-entry)
       (while (< (point) (point-max))
        (setq this-mode (cpio-mode-value (cpio-entry-attrs 
(cpio-dired-get-entry-name))))
-       (if (/= 0 (logand s-iflnk this-mode))
+       (if (= s-iflnk (logand s-iflnk this-mode))
            (cpio-dired-mark-this-entry)
          (cpio-dired-next-line 1))))))
 
@@ -2646,7 +2844,9 @@ If ARG is the atom `-', scroll upward by nearly full 
screen."
         (cpio-dired-move-to-entry-name)
         (make-local-variable 'revert-buffer-function)
         (setq revert-buffer-function 'cpio-revert-buffer)
-        (set-buffer-modified-p nil))
+        (set-buffer-modified-p nil)
+        (setq-local font-lock-defaults
+              '(dired-font-lock-keywords t nil nil beginning-of-line)))
        (t t)))
 
 (defun cpio-dired-make-keymap ()
diff --git a/cpio-entry-contents-mode.el b/cpio-entry-contents-mode.el
index 1492016..61b886f 100644
--- a/cpio-entry-contents-mode.el
+++ b/cpio-entry-contents-mode.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cpio-entry-contents-mode.el --- minor mode for editing a cpio-entry's 
contents.
-;      $Id: cpio-entry-contents-mode.el,v 1.3 2018/05/18 23:55:30 doug Exp $   
+;      $Id: cpio-entry-contents-mode.el,v 1.4 2018/06/03 14:01:55 doug Exp $   
 ;; COPYRIGHT
 ;; 
 ;; Copyright © 2017, 2018 Douglas Lewan, address@hidden
@@ -55,8 +55,7 @@ If NAME is not given, then use 'aa'."
         (cpio-archive-buffer)
         (cpio-dired-buffer)
         (cpio-entry-contents-buffer)
-        (cpio-dired-contents-mode-buffer)
-        )
+        (cpio-dired-contents-mode-buffer))
     ;; Make sure we have a clean copy of the archive.
     (with-current-buffer (find-file-noselect archive-name)
       (shell-command "make crc" nil nil)
@@ -88,8 +87,7 @@ If NAME is not given, then use 'aa'."
     (switch-to-buffer cpio-entry-contents-buffer)
     (other-window 1)
     (setq cpio-dired-contents-mode-buffer (switch-to-buffer 
"cpio-entry-contents-mode.el"))
-    (other-window 2)
-    ))
+    (other-window 2)))
 
 
 ;;
@@ -141,8 +139,7 @@ If NAME is not given, then use 'aa'."
       (setq buffer-read-only nil)
       (insert header-string)
       (setq buffer-read-only t)
-      (aset entry *cpio-catalog-entry-contents-start-idx* (point-marker))
-      )
+      (aset entry *cpio-catalog-entry-contents-start-idx* (point-marker)))
     ;; 6. Mark the contents buffer as unmodified.
     (set-buffer-modified-p nil)
     ;; 6a. But mark the entry in the archive modified.
diff --git a/cpio-modes.el b/cpio-modes.el
index 16cdd30..92940f2 100644
--- a/cpio-modes.el
+++ b/cpio-modes.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cpio-modes.el --- handle modes.
-;      $Id: cpio-modes.el,v 1.3 2018/05/18 23:55:30 doug Exp $ 
+;      $Id: cpio-modes.el,v 1.4 2018/06/03 14:01:55 doug Exp $ 
 
 ;; COPYRIGHT
 ;; 
@@ -101,17 +101,14 @@
   "Return non-NIL if the mode in ATTRS is as special file:
 fmt, sock, link, block, character, fifo."
   (let ((fname "cpio-special-file")
-       (mode (cpio-mode-value attrs))
-       )
-    ;; (error "%s() is not yet implemented" fname)
+       (mode (cpio-mode-value attrs)))
     (or (= s-ifmt   (logand s-ifmt   mode))
        (= s-ifsock (logand s-ifsock mode))
        (= s-iflnk  (logand s-iflnk  mode))     ;Does this really belong here? 
I'm writing this to support (cpio-crc-make-checksum). Do links' checksums get 
calculated?
        (= s-ifblk  (logand s-ifblk  mode))
        (= s-ifdir  (logand s-ifdir  mode)) ;Is a directory a special file? 
Again, this has to do with calculating a check sum.
        (= s-ifchr  (logand s-ifchr  mode))
-       (= s-ififo  (logand s-ififo  mode)))
-    ))
+       (= s-ififo  (logand s-ififo  mode)))))
 
 (defun cpio-int-mode-to-mode-string (int-mode)
   "Convert an integer mode value to the corresponding ls -l version."
diff --git a/cpio-newc.el b/cpio-newc.el
index 679d566..d0dbda5 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.6 2018/05/21 21:21:16 doug Exp $  
+;      $Id: cpio-newc.el,v 1.7 2018/06/03 14:01:55 doug Exp $  
 
 ;; COPYRIGHT
 ;; 
@@ -321,13 +321,13 @@ CAVEATS:
        (found nil))
     (save-match-data
       (cond ((looking-at *cpio-newc-header-re*)
-            (match-string 0))
+            (match-string-no-properties 0))
            (t
             (forward-char (length *cpio-newc-magic-re*))
             (while (and (re-search-backward *cpio-newc-magic-re* (point-min) t)
                         (not (setq found (looking-at *cpio-newc-header-re*)))))
             (if found 
-                (match-string 0)))))))
+                (match-string-no-properties 0)))))))
 
 ;;;;;;;;;;;;;;;;
 ;; 
@@ -368,8 +368,7 @@ This function does NOT get the contents."
                    (setq namesize (cpio-newc-parse-namesize header-string))
 
                    (cpio-newc-parse-chksum   header-string)
-                   (cpio-newc-parse-name     header-string namesize)
-                   )))
+                   (cpio-newc-parse-name     header-string namesize))))
       ;; (cpio-newc-header-size    header-string namesize))))
     (if (cpio-entry-name result)
        result
@@ -706,7 +705,7 @@ This sets match-data for the entire header and each field."
        (header-string))
     (cond ((re-search-forward *cpio-newc-header-re* (point-max) t)
           (setq header-start (goto-char (match-beginning 0)))
-          (setq header-string (match-string 0))
+          (setq header-string (match-string-no-properties 0))
           (cons (point-marker) header-string))
          (t nil))))
 
@@ -777,7 +776,7 @@ once the TRAILER is written and padded."
 
 (defun cpio-newc-adjust-trailer ()
   "Replace thed current trailer in the current cpio newc archive."
-  (let* ((fname "cpio-newc-adjust-trailer"))
+  (let ((fname "cpio-newc-adjust-trailer"))
     (cpio-newc-delete-trailer)
     (cpio-newc-insert-trailer)))
 
diff --git a/cpio-odc.el b/cpio-odc.el
index 64a644f..8964f65 100644
--- a/cpio-odc.el
+++ b/cpio-odc.el
@@ -1,6 +1,6 @@
 ;; -*- coding: utf-8 -*-
 ;;; cpio-odc.el --- handle old portable cpio entry header format
-;      $Id: cpio-odc.el,v 1.5 2018/05/21 21:21:16 doug Exp $   
+;      $Id: cpio-odc.el,v 1.6 2018/06/03 14:01:55 doug Exp $   
 
 ;; COPYRIGHT
 ;; 
@@ -175,8 +175,7 @@
 
   (defconst *cpio-odc-filename-re-idx* 0
     "Index of the sub RE from *cpio-odc-header-re* to parse the filename.")
-  (setq *cpio-odc-filename-re-idx* (setq i (1+ i)))
-  )
+  (setq *cpio-odc-filename-re-idx* (setq i (1+ i))))
 ;; 
 ;; EO odc header variables.
 ;; 
@@ -278,13 +277,13 @@ CAVEATS:
        (found nil))
     (save-match-data
       (cond ((looking-at *cpio-odc-header-re*)
-            (match-string 0))
+            (match-string-no-properties 0))
            (t
             (forward-char (length *cpio-odc-magic-re*))
             (while (and (re-search-backward *cpio-odc-magic-re* (point-min) t)
                         (not (setq found (looking-at *cpio-odc-header-re*)))))
             (if found 
-                (match-string 0)))))))
+                (match-string-no-properties 0)))))))
 
 ;;;;;;;;;;;;;;;;
 ;; 
@@ -590,7 +589,7 @@ This sets match-data for the entire header and each field."
        (header-string))
     (cond ((re-search-forward *cpio-odc-header-re* (point-max) t)
           (setq header-start (goto-char (match-beginning 0)))
-          (setq header-string (match-string 0))
+          (setq header-string (match-string-no-properties 0))
           (cons (point-marker) header-string))
          (t nil))))
 
@@ -661,7 +660,7 @@ once the TRAILER is written and padded."
 
 (defun cpio-odc-adjust-trailer ()
   "Replace thed current trailer in the current cpio odc archive."
-  (let* ((fname "cpio-odc-adjust-trailer"))
+  (let ((fname "cpio-odc-adjust-trailer"))
     (cpio-odc-delete-trailer)
     (cpio-odc-insert-trailer)))
 
diff --git a/cpio.el b/cpio.el
index 05053b1..d363838 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.5 2018/05/21 21:21:16 doug Exp $       
+;      $Id: cpio.el,v 1.7 2018/06/03 14:01:56 doug Exp $       
 
 ;; COPYRIGHT 2015, 2017, 2018 Douglas Lewan, address@hidden
 
@@ -281,6 +281,7 @@ Takes the values 'bin, 'newc, 'odc etc.")
   "RE to match hpodc format cpio archives.")
 (setq *cpio-hpodc-header-re* "nOt yEt iMpLeMeNtEd")
 
+;; MAINTENTANCE Order matters; hpodc must precede odc.
 (defvar *cpio-re-type-alist* (list
                              (cons *cpio-bin-header-re*   'bin)
                              (cons *cpio-crc-header-re*   'crc)
@@ -464,12 +465,6 @@ A parsed header is a vector of the following form:
   (defvar *cpio-catalog-entry-length* i)
   (setq *cpio-catalog-entry-length* i))
 
-(defvar *cpio-dired-buffer* ()
-  "The [subordinate] buffer used to present the curent catalog
-à la dired.")
-(setq *cpio-dired-buffer* ())
-(make-variable-buffer-local '*cpio-dired-buffer*)
-
 (defvar *cpio-archive-name* ()
   "The name of the cpio archive being processed.")
 (setq *cpio-archive-name* ())
@@ -556,12 +551,6 @@ A parsed header is a vector of the following form:
   :type 'string
   :group 'cpio)
 
-;; N.B. This is here because this file is where the cpio-dired lines are 
created.
-(defcustom cpio-try-names t
-  "Non-nil means that GIDs and UIDs are displayed as integers."
-  :group 'cpio
-  :type 'boolean)
-
 
 ;; 
 ;; Library
@@ -689,8 +678,8 @@ CAVEAT: See `cpio-magic'."
 
 (defun cpio-contents-start (entry-name)
   "Return the contents start for ENTRY-NAME."
-  (let* ((fname "cpio-contents-start")
-        (catalog-entry (cpio-entry entry-name)))
+  (let ((fname "cpio-contents-start")
+       (catalog-entry (cpio-entry entry-name)))
     (aref catalog-entry *cpio-catalog-entry-contents-start-idx*)))
 
 (defun cpio-entry-attrs (entry-name)
@@ -720,7 +709,6 @@ CAVEAT: See `cpio-magic'."
                             where)
                            (t
                             (signal 'wrong-type-error (list where))))))
-    ;; (error "%s() is not yet implemented" fname)
     (aset entry *cpio-catalog-entry-header-start-idx* where-marker)))
 
 (defun cpio-set-contents-start (entry where)
@@ -825,7 +813,7 @@ MTIME is an emacs time."
        (with-current-buffer *cab-parent*
          (cpio-extract-all))
       (mapc (lambda (e)
-             (let* ((entry-name (car e)))
+             (let ((entry-name (car e)))
                (cpio-extract-entry entry-name)))
            *cpio-catalog*))))
 
@@ -875,9 +863,9 @@ will create a conflict.
 CONTRACT: This can only be invoked in a cpio archive under cpio-mode
 or a buffer affiliated with such a buffer."
   (interactive "sName: \nP")
-  (let* ((fname "cpio-extract-entry")
-        (attrs (cpio-entry-attrs entry-name))
-        (entry-type (cpio-entry-type entry-name)))
+  (let ((fname "cpio-extract-entry")
+       (attrs (cpio-entry-attrs entry-name))
+       (entry-type (cpio-entry-type entry-name)))
     (cond ((string-equal entry-type *cpio-modes-link*)
           (warn "%s(): Link extraction is not yet implemented." fname))
          ((string-equal entry-type *cpio-modes-reg*)
@@ -942,9 +930,9 @@ in the initial mode slot of 'ls -l'.
 That is, 'l' is a link, '-' is a regular file, etc.
 See (cpio-int-mode-to-file-type) in cpio-modes.el for more detail.
 If ENTRY-NAME is not in the current archive, then return NIL."
-  (let* ((fname "cpio-entry-type")
-        (entry-attrs)
-        (entry-mode))
+  (let ((fname "cpio-entry-type")
+       (entry-attrs)
+       (entry-mode))
     (cond ((and entry-name
                (setq entry-attrs (cpio-entry-attrs entry-name))
                (setq entry-mode (cpio-mode-value entry-attrs)))
@@ -1013,7 +1001,7 @@ Touch understands times of the form YYYYMMDDhhmm.ss."
 (defun cpio-adjust-trailer ()
   "Replace the trailer in the current buffer
 with one with the correct size fot its contents."
-  (let* ((fname "cpio-adjust-trailer"))
+  (let ((fname "cpio-adjust-trailer"))
     (if *cab-parent*
        (with-current-buffer *cab-parent*
          (funcall cpio-adjust-trailer-func))
@@ -1078,45 +1066,6 @@ CONTRACT: Point is at the point of insertion."
       (setq buffer-read-only t))))
 
 
-(defun cpio-dired-buffer-name (archive-name)
-  "Return the name of the dired-style buffer for ARCHIVE-NAME."
-  (let ((fname "cpio-dired-buffer-name"))
-    (concat "CPIO archive: " (file-name-nondirectory archive-name))))
-
-(defun cpio-present-ala-dired (archive-buffer)
-  "Create a buffer with a ls -l format reflecting the contents of the current 
cpio archive.
-This returns the buffer created."
-  (let* ((fname "cpio-present-ala-dired")
-        (archive-name (with-current-buffer archive-buffer
-                        (file-name-nondirectory (buffer-file-name))))
-        (buffer-name (cpio-dired-buffer-name archive-name))
-        (buffer (get-buffer-create buffer-name)) ;Is this not archive-buffer?
-        (entry-string)
-        (catalog (cpio-catalog)))
-    (with-current-buffer buffer
-      (setq *cpio-catalog* catalog)
-      (setq buffer-read-only nil)
-      (erase-buffer)
-      (insert "CPIO archive: " archive-name ":\n\n")
-      (mapc (lambda (e)
-             (let ((line (cpio-dired-format-entry (aref (cdr e) 0))))
-               (insert (concat line "\n"))))
-           (cpio-sort-catalog))
-      (setq buffer-read-only t)
-      (cpio-dired-mode))
-    ;; No, I do not yet understand why this must be done
-    ;; every time the presentation is updated.
-    (cab-register buffer archive-buffer)
-    buffer))
-
-(defun cpio-dired-move-to-first-entry ()
-  "Move the point to the first entry in a cpio-dired style buffer."
-  (let ((fname "cpio-dired-move-to-first-entry"))
-    (unless (eq major-mode 'cpio-dired-mode)
-      (error "%s(): You're not in a cpio-dired buffer." fname))
-    (goto-char (point-min))
-    (cpio-dired-next-line *cpio-dired-head-offset*)))
-
 (defun cpio-sort-catalog ()
   "Return a copy of the catalog sorted by entry name (car cpio-catalog-entry)."
   (let ((fname "cpio-sort-catalog"))
@@ -1129,34 +1078,6 @@ CONTRACT: L and R should be entries:
   (let ((fname "cpio-entry-less-p"))
     (string-lessp (car l) (car r))))
 
-(defun cpio-dired-format-entry (attrs &optional mark)
-  "Create a dired-style line for ATTRS.
-If the optional MARK is given,
-then it is a character and used as the mark on the generated line.
-The line does not include a trailing <new line>."
-  (let* ((fname "cpio-dired-format-entry")
-        (mode-string       (cpio-int-mode-to-mode-string         
(cpio-mode-value attrs)))
-        (uid-string        (cpio-uid-to-uid-string               (cpio-uid     
   attrs)))
-        (gid-string        (cpio-gid-to-gid-string               (cpio-gid     
   attrs)))
-        (nlink-string      (cpio-nlink-to-nlink-string           (cpio-nlink   
   attrs)))
-        (mtime-string      (cpio-mtime-to-mtime-string           (cpio-mtime   
   attrs)))
-        (filesize-string   (cpio-filesize-to-filesize-string     
(cpio-entry-size attrs)))
-        (dev-maj-string    (cpio-dev-maj-to-dev-maj-string       (cpio-dev-maj 
   attrs)))
-        (dev-min-string    (cpio-dev-min-to-dev-min-string       (cpio-dev-min 
   attrs)))
-        (entry-name-string (cpio-entry-name-to-entry-name-string 
(cpio-entry-name attrs)))
-        (fmt (if entry-name-string
-                 (if cpio-try-names
-                     (format "%%c %%s %%3s %%8s %%8s %%8s %%7s %%s")
-                   (format   "%%c %%s %%3s %%5s %%5s %%8s %%7s %%s"))
-               nil)))
-    (unless mark (setq mark ?\s))
-    (unless (characterp mark)
-      (signal 'wrong-type-error (list 'characterp mark)))
-    (if fmt
-       (format fmt mark 
-               mode-string nlink-string uid-string gid-string 
-               filesize-string mtime-string entry-name-string))))
-
 (defun cpio-uid-to-uid-string (uid)
   "Convert the given UID, an integer, to a string."
   (let ((fname "cpio-uid-to-uid-string"))
@@ -1215,7 +1136,7 @@ a UNIX/GNU/Linux time as an integer."
 
 (defun cpio-find-entry (entry-name)
   "Find the given ENTRY-NAME and return the buffer holding its contents."
-  (let ((fname "cpio-dired--find-entry")
+  (let ((fname "cpio-find-entry")
        (target-buffer))
     (if (null (setq target-buffer (get-buffer-create 
(cpio-contents-buffer-name entry-name))))
        (error "%s(): Could not get a buffer for entry [[%s]]." fname))
@@ -1350,26 +1271,20 @@ in the current archive."
 ;; 
 (defun cpio-set-entry-unmodified (catalog-entry)
   "Mark the given CATALOG-ENTRY as not modified."
-  (let ((fname "cpio-set-entry-unmodified")
-       )
-    ;; (error "%s() is not yet implemented" fname)
+  (let ((fname "cpio-set-entry-unmodified"))
     (cpio-validate-catalog-entry catalog-entry)
     (aset catalog-entry *cpio-catalog-entry-modified-flag-idx* 
'cpio-mode-entry-unmodified)))
 
 (defun cpio-set-entry-modified (catalog-entry)
   "Mark the given CATALOG-ENTRY as modified."
-  (let ((fname "cpio-set-entry-modified")
-       )
-    ;; (error "%s() is not yet implemented" fname)
+  (let ((fname "cpio-set-entry-modified"))
     (cpio-validate-catalog-entry catalog-entry)
     (aset catalog-entry *cpio-catalog-entry-modified-flag-idx* 
'cpio-mode-entry-modified)))
 
 (defun cpio-entry-modified-p (catalog-entry)
   "Return non-NIL if CATALOG-ENTRY is marked as modified."
   (let ((fname "cpio-entry-modified-p")
-       (modified-flag)
-       )
-    ;; (error "%s() is not yet implemented" fname)
+       (modified-flag))
     (cpio-validate-catalog-entry catalog-entry)
     (cond ((eq 'cpio-mode-modified 
               (setq modified-flag (aref catalog-entry 
*cpio-catalog-entry-modified-flag-idx*)))
@@ -1383,9 +1298,7 @@ in the current archive."
   "Verify that the given CATALOG-ENTRY is (could be) a valid catalog entry.
 Signal an error if it isn't."
   (let ((fname "validate-catalog-entry")
-       (modified-flag)
-       )
-    ;; (error "%s() is not yet implemented" fname)
+       (modified-flag))
     (unless (vectorp catalog-entry)
       (signal 'wrong-type-error (list catalog-entry)))
     (unless (= *cpio-catalog-entry-length* (length catalog-entry))
@@ -1589,19 +1502,19 @@ See *cpio-local-funcs* for more information."
     ;; Now for the format-specific variables.
     (cond ((eq archive-type 'bin)
           (cpio-set-local-bin-vars))
-         ((eq archive-type'newc)
+         ((eq archive-type 'newc)
           (cpio-set-local-newc-vars))
-         ((eq archive-type'odc)
+         ((eq archive-type 'odc)
           (cpio-set-local-odc-vars))
-         ((eq archive-type'crc)
+         ((eq archive-type 'crc)
           (cpio-set-local-crc-vars))
-         ((eq archive-type'tar)
+         ((eq archive-type 'tar)
           (cpio-set-local-tar-vars))
-         ((eq archive-type'ustar)
+         ((eq archive-type 'ustar)
           (cpio-set-local-ustar-vars))
-         ((eq archive-type'hpbin)
+         ((eq archive-type 'hpbin)
           (cpio-set-local-hpbin-vars))
-         ((eq archive-type'hpodc)
+         ((eq archive-type 'hpodc)
           (cpio-set-local-hpodc-vars))
          (t (error "%s(): Unknown archive type [[%s]]" fname archive-type)))))
 
@@ -1619,7 +1532,6 @@ See *cpio-local-funcs* for more information."
     (make-local-variable '*cpio-padding-str*)
     (setq *cpio-padding-str* *cpio-newc-padding-str*)))
 
-
 (defun cpio-set-local-odc-vars ()
   "Set buffer local variables appropriate for a ODC format CPIO archive."
   (let ((fname "cpio-set-local-odc-vars"))
@@ -1630,7 +1542,6 @@ See *cpio-local-funcs* for more information."
     (make-local-variable '*cpio-padding-str*)
     (setq *cpio-padding-str* *cpio-odc-padding-str*)))
 
-
 (defun cpio-set-local-crc-vars ()
   "Set buffer local variables appropriate for a CRC format CPIO archive."
   (let ((fname "cpio-set-local-crc-vars"))



reply via email to

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