Fix bug where paths took up twice as much space

For some reason, the code that calculated the width of a cell with a path in counted the width of the path twice: once from the ANSIStrings containing it, and once more added on afterwards. This meant that the grid view thought that columns were wider than they really were, meaning fewer could be fit into a grid.

Fix bug where paths took up twice as much space
For some reason, the code that calculated the width of a cell with a path in counted the width of the path twice: once from the ANSIStrings containing it, and once more added on afterwards. This meant that the grid view thought that columns were wider than they really were, meaning fewer could be fit into a grid.
ba1c8c65 · Benjamin Sago · 437ac0ea · ba1c8c65 · ba1c8c65 · ba1c8c65
9 changed file
--- a/src/output/details.rs
+++ b/src/output/details.rs
@@ -308,13 +308,7 @@ impl Details {
            let mut errors = egg.errors;

            let filename = FileName::new(&egg.file, &self.colours).paint(true, self.classify);
-            let mut width = filename.width();
-
-            if egg.file.dir.is_none() {
-                if let Some(parent) = egg.file.path.parent() {
-                    width = width + 1 + DisplayWidth::from(parent.to_string_lossy().as_ref());
-                }
-            }
+            let width = filename.width();

            let name = TextCell {
                contents: filename,
@@ -459,13 +453,7 @@ impl<'a, U: Users+Groups+'a> Table<'a, U> {

    pub fn filename_cell(&self, file: File, links: bool) -> TextCell {
        let filename = FileName::new(&file, &self.opts.colours).paint(links, self.opts.classify);
-        let mut width = filename.width();
-
-        if file.dir.is_none() {
-            if let Some(parent) = file.path.parent() {
-                width = width + 1 + DisplayWidth::from(parent.to_string_lossy().as_ref());
-            }
-        }
+        let width = filename.width();

        TextCell {
            contents: filename,

--- a/src/output/grid.rs
+++ b/src/output/grid.rs
@@ -30,13 +30,7 @@ impl Grid {

        for file in files.iter() {
            let filename = FileName::new(file, &self.colours).paint(false, self.classify);
-
-            let mut width = filename.width();
-            if file.dir.is_none() {
-                if let Some(parent) = file.path.parent() {
-                    width = width + 1 + DisplayWidth::from(parent.to_string_lossy().as_ref());
-                }
-            }
+            let width = filename.width();

            grid.add(grid::Cell {
                contents:  filename.strings().to_string(),

--- a/xtests/files_star_100
+++ b/xtests/files_star_100
+[36m/testcases/files/[0m10_bytes  [36m/testcases/files/[0m1_KiB    [36m/testcases/files/[0m5_MiB
+[36m/testcases/files/[0m10_KiB    [36m/testcases/files/[0m1_MiB    [36m/testcases/files/[0m6_bytes
+[36m/testcases/files/[0m10_MiB    [36m/testcases/files/[0m2_bytes  [36m/testcases/files/[0m6_KiB
+[36m/testcases/files/[0m11_bytes  [36m/testcases/files/[0m2_KiB    [36m/testcases/files/[0m6_MiB
+[36m/testcases/files/[0m11_KiB    [36m/testcases/files/[0m2_MiB    [36m/testcases/files/[0m7_bytes
+[36m/testcases/files/[0m11_MiB    [36m/testcases/files/[0m3_bytes  [36m/testcases/files/[0m7_KiB
+[36m/testcases/files/[0m12_bytes  [36m/testcases/files/[0m3_KiB    [36m/testcases/files/[0m7_MiB
+[36m/testcases/files/[0m12_KiB    [36m/testcases/files/[0m3_MiB    [36m/testcases/files/[0m8_bytes
+[36m/testcases/files/[0m12_MiB    [36m/testcases/files/[0m4_bytes  [36m/testcases/files/[0m8_KiB
+[36m/testcases/files/[0m13_bytes  [36m/testcases/files/[0m4_KiB    [36m/testcases/files/[0m8_MiB
+[36m/testcases/files/[0m13_KiB    [36m/testcases/files/[0m4_MiB    [36m/testcases/files/[0m9_bytes
+[36m/testcases/files/[0m13_MiB    [36m/testcases/files/[0m5_bytes  [36m/testcases/files/[0m9_KiB
+[36m/testcases/files/[0m1_bytes   [36m/testcases/files/[0m5_KiB    [36m/testcases/files/[0m9_MiB
--- a/xtests/files_star_150
+++ b/xtests/files_star_150
+[36m/testcases/files/[0m10_bytes  [36m/testcases/files/[0m12_MiB    [36m/testcases/files/[0m2_KiB    [36m/testcases/files/[0m5_bytes  [36m/testcases/files/[0m7_MiB
+[36m/testcases/files/[0m10_KiB    [36m/testcases/files/[0m13_bytes  [36m/testcases/files/[0m2_MiB    [36m/testcases/files/[0m5_KiB    [36m/testcases/files/[0m8_bytes
+[36m/testcases/files/[0m10_MiB    [36m/testcases/files/[0m13_KiB    [36m/testcases/files/[0m3_bytes  [36m/testcases/files/[0m5_MiB    [36m/testcases/files/[0m8_KiB
+[36m/testcases/files/[0m11_bytes  [36m/testcases/files/[0m13_MiB    [36m/testcases/files/[0m3_KiB    [36m/testcases/files/[0m6_bytes  [36m/testcases/files/[0m8_MiB
+[36m/testcases/files/[0m11_KiB    [36m/testcases/files/[0m1_bytes   [36m/testcases/files/[0m3_MiB    [36m/testcases/files/[0m6_KiB    [36m/testcases/files/[0m9_bytes
+[36m/testcases/files/[0m11_MiB    [36m/testcases/files/[0m1_KiB     [36m/testcases/files/[0m4_bytes  [36m/testcases/files/[0m6_MiB    [36m/testcases/files/[0m9_KiB
+[36m/testcases/files/[0m12_bytes  [36m/testcases/files/[0m1_MiB     [36m/testcases/files/[0m4_KiB    [36m/testcases/files/[0m7_bytes  [36m/testcases/files/[0m9_MiB
+[36m/testcases/files/[0m12_KiB    [36m/testcases/files/[0m2_bytes   [36m/testcases/files/[0m4_MiB    [36m/testcases/files/[0m7_KiB    
--- a/xtests/files_star_200
+++ b/xtests/files_star_200
+[36m/testcases/files/[0m10_bytes  [36m/testcases/files/[0m12_bytes  [36m/testcases/files/[0m1_bytes  [36m/testcases/files/[0m3_bytes  [36m/testcases/files/[0m5_bytes  [36m/testcases/files/[0m7_bytes  [36m/testcases/files/[0m9_bytes
+[36m/testcases/files/[0m10_KiB    [36m/testcases/files/[0m12_KiB    [36m/testcases/files/[0m1_KiB    [36m/testcases/files/[0m3_KiB    [36m/testcases/files/[0m5_KiB    [36m/testcases/files/[0m7_KiB    [36m/testcases/files/[0m9_KiB
+[36m/testcases/files/[0m10_MiB    [36m/testcases/files/[0m12_MiB    [36m/testcases/files/[0m1_MiB    [36m/testcases/files/[0m3_MiB    [36m/testcases/files/[0m5_MiB    [36m/testcases/files/[0m7_MiB    [36m/testcases/files/[0m9_MiB
+[36m/testcases/files/[0m11_bytes  [36m/testcases/files/[0m13_bytes  [36m/testcases/files/[0m2_bytes  [36m/testcases/files/[0m4_bytes  [36m/testcases/files/[0m6_bytes  [36m/testcases/files/[0m8_bytes  
+[36m/testcases/files/[0m11_KiB    [36m/testcases/files/[0m13_KiB    [36m/testcases/files/[0m2_KiB    [36m/testcases/files/[0m4_KiB    [36m/testcases/files/[0m6_KiB    [36m/testcases/files/[0m8_KiB    
+[36m/testcases/files/[0m11_MiB    [36m/testcases/files/[0m13_MiB    [36m/testcases/files/[0m2_MiB    [36m/testcases/files/[0m4_MiB    [36m/testcases/files/[0m6_MiB    [36m/testcases/files/[0m8_MiB    
--- a/xtests/files_star_lG_100
+++ b/xtests/files_star_lG_100
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m   [1;32m10[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m10_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m10[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m10_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m10[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m10_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m   [1;32m11[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m11_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m11[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m11_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m11[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m11_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m   [1;32m12[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m12_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m12[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m12_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m12[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m12_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m   [1;32m13[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m13_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m13[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m13_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m13[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m13_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m1[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m1_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m1.0[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m1_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m1.0[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m1_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m2[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m2_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m2.0[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m2_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m2.1[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m2_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m3[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m3_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m3.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m3_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m3.1[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m3_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m4[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m4_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m4.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m4_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m4.2[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m4_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m5[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m5_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m5.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m5_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m5.2[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m5_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m6[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m6_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m6.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m6_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m6.3[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m6_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m7[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m7_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m7.2[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m7_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m7.3[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m7_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m8[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m8_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m8.2[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m8_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m8.4[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m8_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m9[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m9_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m9.2[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m9_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m9.4[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m9_MiB
--- a/xtests/files_star_lG_150
+++ b/xtests/files_star_lG_150
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m   [1;32m10[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m10_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m3.1[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m3_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m10[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m10_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m4[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m4_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m10[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m10_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m4.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m4_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m   [1;32m11[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m11_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m4.2[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m4_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m11[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m11_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m5[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m5_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m11[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m11_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m5.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m5_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m   [1;32m12[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m12_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m5.2[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m5_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m12[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m12_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m6[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m6_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m12[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m12_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m6.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m6_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m   [1;32m13[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m13_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m6.3[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m6_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m13[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m13_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m7[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m7_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m13[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m13_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m7.2[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m7_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m1[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m1_bytes     .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m7.3[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m7_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m1.0[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m1_KiB       .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m8[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m8_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m1.0[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m1_MiB       .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m8.2[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m8_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m2[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m2_bytes     .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m8.4[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m8_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m2.0[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m2_KiB       .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m9[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m9_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m2.1[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m2_MiB       .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m9.2[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m9_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m3[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m3_bytes     .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m9.4[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m9_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m3.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m3_KiB       
--- a/xtests/files_star_lG_200
+++ b/xtests/files_star_lG_200
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m10[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m10_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m1.0[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m1_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m5.2[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m5_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m10[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m10_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m1.0[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m1_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m6[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m6_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m10[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m10_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m2[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m2_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m6.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m6_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m11[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m11_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m2.0[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m2_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m6.3[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m6_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m11[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m11_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m2.1[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m2_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m7[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m7_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m11[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m11_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m3[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m3_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m7.2[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m7_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m12[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m12_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m3.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m3_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m7.3[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m7_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m12[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m12_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m3.1[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m3_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m8[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m8_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m12[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m12_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m4[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m4_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m8.2[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m8_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m  [1;32m13[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m13_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m4.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m4_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m8.4[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m8_MiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m13[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m13_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m4.2[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m4_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m9[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m9_bytes
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m13[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m13_MiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m5[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m5_bytes    .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m9.2[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m9_KiB
+.[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m   [1;32m1[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m1_bytes     .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m5.1[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m5_KiB      .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m9.4[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [36m/testcases/files/[0m9_MiB
--- a/xtests/run.sh
+++ b/xtests/run.sh
@@ -33,6 +33,10 @@ COLUMNS=120 $exa $testcases/files | diff -q - $results/files_120  || exit 1
 COLUMNS=160 $exa $testcases/files | diff -q - $results/files_160  || exit 1
 COLUMNS=200 $exa $testcases/files | diff -q - $results/files_200  || exit 1

+COLUMNS=100 $exa $testcases/files/* | diff -q - $results/files_star_100   || exit 1
+COLUMNS=150 $exa $testcases/files/* | diff -q - $results/files_star_150  || exit 1
+COLUMNS=200 $exa $testcases/files/* | diff -q - $results/files_star_200  || exit 1
+

 # Long grid view tests
 COLUMNS=40  $exa $testcases/files -lG | diff -q - $results/files_lG_40   || exit 1
@@ -41,6 +45,10 @@ COLUMNS=120 $exa $testcases/files -lG | diff -q - $results/files_lG_120  || exit
 COLUMNS=160 $exa $testcases/files -lG | diff -q - $results/files_lG_160  || exit 1
 COLUMNS=200 $exa $testcases/files -lG | diff -q - $results/files_lG_200  || exit 1

+COLUMNS=100 $exa $testcases/files/* -lG | diff -q - $results/files_star_lG_100  || exit 1
+COLUMNS=150 $exa $testcases/files/* -lG | diff -q - $results/files_star_lG_150  || exit 1
+COLUMNS=200 $exa $testcases/files/* -lG | diff -q - $results/files_star_lG_200  || exit 1
+

 # Attributes
 $exa $testcases/attributes -l@T | diff -q - $results/attributes  || exit 1