Skip to content
Snippets Groups Projects
Commit e1699ef8 authored by Ludovico de Nittis's avatar Ludovico de Nittis
Browse files

Merge branch 'wip/let-filenames-be-filenames' into 'master'

Flag most G_OPTION_ARG_CALLBACK options with G_OPTION_FLAG_FILENAME

See merge request !354
parents 5c21d42d cb91d602
No related branches found
No related tags found
1 merge request!354Flag most G_OPTION_ARG_CALLBACK options with G_OPTION_FLAG_FILENAME
...@@ -788,18 +788,18 @@ static GOptionEntry options[] = ...@@ -788,18 +788,18 @@ static GOptionEntry options[] =
NULL }, NULL },
{ "ld-audit", '\0', { "ld-audit", '\0',
G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, &opt_ld_audit_cb, G_OPTION_FLAG_FILENAME, G_OPTION_ARG_CALLBACK, &opt_ld_audit_cb,
"Add MODULE to LD_AUDIT before executing COMMAND.", "Add MODULE to LD_AUDIT before executing COMMAND.",
"MODULE" }, "MODULE" },
{ "ld-preload", '\0', { "ld-preload", '\0',
G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, &opt_ld_preload_cb, G_OPTION_FLAG_FILENAME, G_OPTION_ARG_CALLBACK, &opt_ld_preload_cb,
"Add MODULE to LD_PRELOAD before executing COMMAND. Some adjustments " "Add MODULE to LD_PRELOAD before executing COMMAND. Some adjustments "
"may be performed, e.g. joining together multiple gameoverlayrenderer.so " "may be performed, e.g. joining together multiple gameoverlayrenderer.so "
"preloads into a single path by leveraging the dynamic linker token expansion", "preloads into a single path by leveraging the dynamic linker token expansion",
"MODULE" }, "MODULE" },
{ "lock-file", '\0', { "lock-file", '\0',
G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, opt_lock_file_cb, G_OPTION_FLAG_FILENAME, G_OPTION_ARG_CALLBACK, opt_lock_file_cb,
"Open the given file and lock it, affected by options appearing " "Open the given file and lock it, affected by options appearing "
"earlier on the command-line. May be repeated.", "earlier on the command-line. May be repeated.",
NULL }, NULL },
......
...@@ -1081,7 +1081,8 @@ static GOptionEntry options[] = ...@@ -1081,7 +1081,8 @@ static GOptionEntry options[] =
"Use HOME as home directory. Implies --unshare-home. " "Use HOME as home directory. Implies --unshare-home. "
"[Default: $PRESSURE_VESSEL_HOME if set]", "HOME" }, "[Default: $PRESSURE_VESSEL_HOME if set]", "HOME" },
{ "host-ld-preload", '\0', { "host-ld-preload", '\0',
G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, &opt_host_ld_preload_cb, G_OPTION_FLAG_FILENAME | G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK,
&opt_host_ld_preload_cb,
"Deprecated alias for --ld-preload=MODULE, which despite its name " "Deprecated alias for --ld-preload=MODULE, which despite its name "
"does not necessarily take the module from the host system", "does not necessarily take the module from the host system",
"MODULE" }, "MODULE" },
...@@ -1102,12 +1103,12 @@ static GOptionEntry options[] = ...@@ -1102,12 +1103,12 @@ static GOptionEntry options[] =
"container, or that needs to inherit the value from the host system, " "container, or that needs to inherit the value from the host system, "
"will be locked. This option implies --batch.", NULL }, "will be locked. This option implies --batch.", NULL },
{ "ld-audit", '\0', { "ld-audit", '\0',
G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, &opt_ld_audit_cb, G_OPTION_FLAG_FILENAME, G_OPTION_ARG_CALLBACK, &opt_ld_audit_cb,
"Add MODULE from current execution environment to LD_AUDIT when " "Add MODULE from current execution environment to LD_AUDIT when "
"executing COMMAND.", "executing COMMAND.",
"MODULE" }, "MODULE" },
{ "ld-preload", '\0', { "ld-preload", '\0',
G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, &opt_ld_preload_cb, G_OPTION_FLAG_FILENAME, G_OPTION_ARG_CALLBACK, &opt_ld_preload_cb,
"Add MODULE from current execution environment to LD_PRELOAD when " "Add MODULE from current execution environment to LD_PRELOAD when "
"executing COMMAND.", "executing COMMAND.",
"MODULE" }, "MODULE" },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment