search for: 2cb4e74

...tput the field for checksum even for non-regular files, as empty, in CSV output mode. This ensures each line has the same number of fields, regardless of the file type. --- cat/ls.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cat/ls.c b/cat/ls.c index de8248e..2cb4e74 100644 --- a/cat/ls.c +++ b/cat/ls.c @@ -524,12 +524,15 @@ show_file (const char *dir, const char *name, path = full_path (dir, name); - if (checksum && is_reg (stat->st_mode)) { - csum = guestfs_checksum (g, checksum, path); - if (!csum) - exit (EXIT_FAILURE); + if (...

...-options")) + display_short_options (options); else if (STREQ (long_options[option_index].name, "keys-from-stdin")) { keys_from_stdin = 1; } else if (STREQ (long_options[option_index].name, "echo-keys")) { diff --git a/cat/ls.c b/cat/ls.c index 2cb4e74..b979928 100644 --- a/cat/ls.c +++ b/cat/ls.c @@ -151,6 +151,7 @@ main (int argc, char *argv[]) { "long-options", 0, 0, 0 }, { "mount", 1, 0, 'm' }, { "recursive", 0, 0, 'R' }, + { "short-options", 0, 0, 0 }, { "tim...