diff options
| author | Pádraig Brady <P@draigBrady.com> | 2015-10-28 13:02:31 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-11-04 02:03:41 +0000 |
| commit | ab40a941a07d80326aaa051e3c94c88b800cbd7d (patch) | |
| tree | 382e656f126d0e63ca1158f8f43630e1dd10d18b /src/runcon.c | |
| parent | 00eb7af8ea30ccbefeb17213cd644b8f0ade1ef8 (diff) | |
| download | coreutils-ab40a941a07d80326aaa051e3c94c88b800cbd7d.tar.xz | |
all: replace most uses of quotearg_colon() with quote()
Related to commit v8.24-61-g6796698 this provides
more consistent quoting, as quotearg_colon() defaults
to "literal" quoting by default, while quote()
provides appropriate quoting for diagnostics by default.
* gl/modules/randread: Depend on quote module rather than quotearg.
* gl/lib/randread.c: Used quote() not quotearg_colon().
* src/: Likewise.
* src/shred.c: Likewise. Also avoid unnecessary quoting
introducing overhead when wiping names.
* cfg.mk: Relax the matching expression to allow
"qname" variables as used in shred.c to satisfy the check.
* tests/: Adjust accordingly.
Diffstat (limited to 'src/runcon.c')
| -rw-r--r-- | src/runcon.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/runcon.c b/src/runcon.c index ecb12985a..d5ec57958 100644 --- a/src/runcon.c +++ b/src/runcon.c @@ -49,7 +49,6 @@ #include "system.h" #include "error.h" #include "quote.h" -#include "quotearg.h" /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "runcon" @@ -231,7 +230,7 @@ main (int argc, char **argv) con = context_new (cur_context); if (!con) error (EXIT_FAILURE, errno, _("failed to create security context: %s"), - quotearg_colon (cur_context)); + quote (cur_context)); if (user && context_user_set (con, user)) error (EXIT_FAILURE, errno, _("failed to set new user: %s"), quote (user)); @@ -248,7 +247,7 @@ main (int argc, char **argv) if (security_check_context (context_str (con)) < 0) error (EXIT_FAILURE, errno, _("invalid context: %s"), - quotearg_colon (context_str (con))); + quote (context_str (con))); if (setexeccon (context_str (con)) != 0) error (EXIT_FAILURE, errno, _("unable to set security context %s"), |