all: avoid quoting file names when possible

Quote file names using the "shell-escape" or "shell-escape-always"
methods, which quote as appropriate for most shells,
and better support copy and paste of presented names.
The "always" variant is used when the file name is
embedded in an error message with surrounding spaces.

* cfg.mk (sc_error_shell_quotes): A new syntax check rule
to suggest quotef() where appropriate.
(sc_error_shell_always_quotes): Likewise for quoteaf().
* src/system.h (quotef): A new define to apply shell quoting
when needed.  I.E. when shell character or ':' is present.
(quoteaf): Likewise, but always quote.
* src/*.c: Use quotef() and quoteaf() rather than quote()
where appropriate.
* tests/: Adjust accordingly.

1 files changed, 10 insertions, 9 deletions

diff --git a/src/chcon.c b/src/chcon.c
index 4f51d70d4..4c255d0c0 100644
--- a/src/chcon.c
+++ b/src/chcon.c
@@ -153,7 +153,7 @@ change_file_context (int fd, char const *file)
       if (status < 0 && errno != ENODATA)
         {
           error (0, errno, _("failed to get security context of %s"),
-                 quote (file));
+                 quoteaf (file));
           return 1;
         }
 
@@ -163,7 +163,7 @@ change_file_context (int fd, char const *file)
       if (file_context == NULL)
         {
           error (0, 0, _("can't apply partial context to unlabeled file %s"),
-                 quote (file));
+                 quoteaf (file));
           return 1;
         }
 
@@ -187,7 +187,7 @@ change_file_context (int fd, char const *file)
         {
           errors = 1;
           error (0, errno, _("failed to change context of %s to %s"),
-                 quote_n (0, file), quote_n (1, context_string));
+                 quoteaf_n (0, file), quote_n (1, context_string));
         }
     }
 
@@ -251,18 +251,19 @@ process_file (FTS *fts, FTSENT *ent)
           fts_set (fts, ent, FTS_AGAIN);
           return true;
         }
-      error (0, ent->fts_errno, _("cannot access %s"), quote (file_full_name));
+      error (0, ent->fts_errno, _("cannot access %s"),
+             quoteaf (file_full_name));
       ok = false;
       break;
 
     case FTS_ERR:
-      error (0, ent->fts_errno, "%s", quote (file_full_name));
+      error (0, ent->fts_errno, "%s", quotef (file_full_name));
       ok = false;
       break;
 
     case FTS_DNR:
       error (0, ent->fts_errno, _("cannot read directory %s"),
-             quote (file_full_name));
+             quoteaf (file_full_name));
       ok = false;
       break;
 
@@ -289,7 +290,7 @@ process_file (FTS *fts, FTSENT *ent)
     {
       if (verbose)
         printf (_("changing security context of %s\n"),
-                quote (file_full_name));
+                quoteaf (file_full_name));
 
       if (change_file_context (fts->fts_cwd_fd, file) != 0)
         ok = false;
@@ -543,7 +544,7 @@ main (int argc, char **argv)
 
       if (getfilecon (reference_file, &ref_context) < 0)
         error (EXIT_FAILURE, errno, _("failed to get security context of %s"),
-               quote (reference_file));
+               quoteaf (reference_file));
 
       specified_context = ref_context;
     }
@@ -572,7 +573,7 @@ main (int argc, char **argv)
       root_dev_ino = get_root_dev_ino (&dev_ino_buf);
       if (root_dev_ino == NULL)
         error (EXIT_FAILURE, errno, _("failed to get attributes of %s"),
-               quote ("/"));
+               quoteaf ("/"));
     }
   else
     {