From b7b183fe4e6691836fff1abd994b91a3b3a01ce4 Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Sun, 14 Apr 2024 11:58:15 +0100 Subject: [PATCH] Option --cache-maintenance is not GNU compliant https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html The option requires an equals sign as a separator. --- doc/docbook/CommandLineOptions.xml | 6 +++--- geeqie.1 | 6 +++--- src/cache-maint.cc | 2 +- src/main.cc | 13 ++++++++----- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/doc/docbook/CommandLineOptions.xml b/doc/docbook/CommandLineOptions.xml index 527779d5..ecf88906 100644 --- a/doc/docbook/CommandLineOptions.xml +++ b/doc/docbook/CommandLineOptions.xml @@ -8,7 +8,7 @@ GEEQIE 1 April 2024 -Geeqie 2.4+git20240413-2a5c2a89 GTK3 +Geeqie 2.4+git20240413-fc816858 GTK3 Geeqie @@ -30,7 +30,7 @@ zooming, panning, thumbnails and sorting images into collections. Generated for version: -Geeqie 2.4+git20240413-2a5c2a89 +Geeqie 2.4+git20240413-fc816858 Valid options: @@ -41,7 +41,7 @@ zooming, panning, thumbnails and sorting images into collections. - --cache-maintenance <path> + --cache-maintenance=<path> run cache maintenance in non-GUI mode diff --git a/geeqie.1 b/geeqie.1 index def25f6e..45d716bf 100644 --- a/geeqie.1 +++ b/geeqie.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH GEEQIE "1" "April 2024" "Geeqie 2.4+git20240413-2a5c2a89 GTK3" "User Commands" +.TH GEEQIE "1" "April 2024" "Geeqie 2.4+git20240413-fc816858 GTK3" "User Commands" .SH NAME Geeqie - GTK based multiformat image viewer .SH SYNOPSIS @@ -11,13 +11,13 @@ zooming, panning, thumbnails and sorting images into collections. Generated for version: .PP -Geeqie 2.4+git20240413\-2a5c2a89 +Geeqie 2.4+git20240413\-fc816858 .SS "Valid options:" .TP \fB\-\-blank\fR start with blank file list .TP -\fB\-\-cache\-maintenance\fR +\fB\-\-cache\-maintenance=\fR run cache maintenance in non\-GUI mode .TP \fB\-\-disable\-clutter\fR diff --git a/src/cache-maint.cc b/src/cache-maint.cc index b6f68c5c..3d28d731 100644 --- a/src/cache-maint.cc +++ b/src/cache-maint.cc @@ -1639,7 +1639,7 @@ static void cache_manager_cache_maintenance_start_cb(GenericDialog *, gpointer d } else { - cmd_line = g_strdup_printf("%s --cache-maintenance \"%s\"", gq_executable_path, path); + cmd_line = g_strdup_printf("%s --cache-maintenance=\"%s\"", gq_executable_path, path); g_spawn_command_line_async(cmd_line, nullptr); diff --git a/src/main.cc b/src/main.cc index 7e4b86a0..d9336302 100644 --- a/src/main.cc +++ b/src/main.cc @@ -484,7 +484,7 @@ static void parse_command_line(gint argc, gchar *argv[]) printf_term(FALSE, _("Usage: %s [options] [path]\n\n"), GQ_APPNAME_LC); print_term(FALSE, _("Valid options:\n")); print_term(FALSE, _(" --blank start with blank file list\n")); - print_term(FALSE, _(" --cache-maintenance run cache maintenance in non-GUI mode\n")); + print_term(FALSE, _(" --cache-maintenance= run cache maintenance in non-GUI mode\n")); print_term(FALSE, _(" --disable-clutter disable use of Clutter library (i.e. GPU accel.)\n")); print_term(FALSE, _(" -f, --fullscreen start in full screen mode\n")); print_term(FALSE, _(" --geometry=WxH+XOFF+YOFF set main window location\n")); @@ -696,7 +696,7 @@ static gboolean parse_command_line_for_clutter_option(gint argc, gchar *argv[]) static gboolean parse_command_line_for_cache_maintenance_option(gint argc, gchar *argv[]) { - const gchar *cache_maintenance_option = "--cache-maintenance"; + const gchar *cache_maintenance_option = "--cache-maintenance="; gint len = strlen(cache_maintenance_option); gboolean ret = FALSE; @@ -721,9 +721,12 @@ static void process_command_line_for_cache_maintenance_option(gint argc, gchar * gchar *buf_config_file; gint diff_count; - if (argc >= 3) + const gchar *cache_maintenance_option = "--cache-maintenance="; + gint len = strlen(cache_maintenance_option); + + if (argc >= 2) { - folder_path = expand_tilde(argv[2]); + folder_path = expand_tilde(argv[1] + len); if (isdir(folder_path)) { @@ -771,7 +774,7 @@ static void process_command_line_for_cache_maintenance_option(gint argc, gchar * } else { - print_term(TRUE, g_strconcat(argv[2], _(" is not a folder\n"), NULL)); + print_term(TRUE, g_strconcat(argv[1] + len, _(" is not a folder\n"), NULL)); exit(EXIT_FAILURE); } g_free(folder_path); -- 2.20.1