From 5964b13f1e06ee0e2cf33431d59cb1a855fab61b Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Thu, 22 Aug 2024 13:13:54 +0100
Subject: [PATCH] Constify arrays of program arguments

These are passed to non-const-correct APIs which still need a cast, but
at least we can declare the array in a way that reduces mistakes.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 revokefs/demo.c                         | 8 ++++----
 session-helper/flatpak-session-helper.c | 5 +++--
 tests/can-use-fuse.c                    | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/revokefs/demo.c b/revokefs/demo.c
index 6685314f..12b298e9 100644
--- a/revokefs/demo.c
+++ b/revokefs/demo.c
@@ -30,7 +30,7 @@ main (int argc, char *argv[])
   socket_0 = g_strdup_printf ("--socket=%d", sockets[0]);
   socket_1 = g_strdup_printf ("--socket=%d", sockets[1]);
 
-  char *backend_argv[] =
+  const char * const backend_argv[] =
     {
      "./revokefs-fuse",
      "--backend",
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   /* Don't inherit fuse socket in backend */
   fcntl (sockets[1], F_SETFD, FD_CLOEXEC);
   if (!g_spawn_async (NULL,
-                      backend_argv,
+                      (char **) backend_argv,
                       NULL,
                       G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
                       NULL, NULL,
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
     }
   close (sockets[0]); /* Close backend side now so it doesn't get into the fuse child */
 
-  char *fuse_argv[] =
+  const char * const fuse_argv[] =
     {
      "./revokefs-fuse",
      socket_1,
@@ -63,7 +63,7 @@ main (int argc, char *argv[])
     };
 
   if (!g_spawn_async (NULL,
-                      fuse_argv,
+                      (char **) fuse_argv,
                       NULL,
                       G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
                       NULL, NULL,
diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c
index 38183b83..31e94384 100644
--- a/session-helper/flatpak-session-helper.c
+++ b/session-helper/flatpak-session-helper.c
@@ -697,7 +697,7 @@ start_p11_kit_server (const char *flatpak_dir)
   g_autoptr(GError) local_error = NULL;
   g_auto(GStrv) stdout_lines = NULL;
   int i;
-  char *p11_argv[] = {
+  const char * const p11_argv[] = {
     "p11-kit", "server",
     /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support
      * this flag. This is good, because those earlier versions did not properly daemonize and caused
@@ -713,7 +713,8 @@ start_p11_kit_server (const char *flatpak_dir)
   g_info ("starting p11-kit server");
 
   if (!g_spawn_sync (NULL,
-                     p11_argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
+                     (char **) p11_argv, NULL,
+                     G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
                      NULL, NULL,
                      &p11_kit_stdout, NULL,
                      &exit_status, &local_error))
diff --git a/tests/can-use-fuse.c b/tests/can-use-fuse.c
index ad9a7a35..33527105 100644
--- a/tests/can-use-fuse.c
+++ b/tests/can-use-fuse.c
@@ -33,8 +33,8 @@ check_fuse (void)
 {
   g_autofree gchar *fusermount = NULL;
   g_autofree gchar *path = NULL;
-  char *argv[] = { "flatpak-fuse-test", NULL };
-  struct fuse_args args = FUSE_ARGS_INIT (G_N_ELEMENTS (argv) - 1, argv);
+  static const char * const argv[] = { "flatpak-fuse-test", NULL };
+  struct fuse_args args = FUSE_ARGS_INIT (G_N_ELEMENTS (argv) - 1, (char **) argv);
   g_autoptr(GError) error = NULL;
 #if FUSE_USE_VERSION >= 31
   struct fuse *fuse = NULL;