Miroirs/awesome
1
0
Fork 0
mirror of https://github.com/awesomeWM/awesome synced 2024-09-28 03:20:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

modeline: Check the first XDG and fallback paths for modelines. (#3172)

Browse source 
This is not perfect. If the first config is invalid, then it wont use
the correct modeline. However there is no way to know if the config
is valid before attempting to execute it, so it's the best we can do.

Fix #3166
This commit is contained in:
Emmanuel Lepage Vallée 2020-09-14 11:02:09 -07:00 committed by GitHub
parent d5ce4d5d1c
commit 46a9a7b970
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
awesome.c
View file

@ -645,7 +645,7 @@ main(int argc, char **argv)
/* Parse `rc.lua` to see if it has an AwesomeWM modeline */
if (!(default_init_flags & INIT_FLAG_FORCE_CMD_ARGS))
options_init_config(awesome_argv[0], confpath, &default_init_flags, &searchpath);
options_init_config(&xdg, awesome_argv[0], confpath, &default_init_flags, &searchpath);
/* Setup pipe for SIGCHLD processing */
{

25
options.c
View file

@ -27,6 +27,7 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <getopt.h>
#include <basedir_fs.h>
#define KEY_VALUE_BUF_MAX 64
#define READ_BUF_MAX 127
@ -71,7 +72,7 @@ push_arg(string_array_t *args, char *value, size_t *len)
* Support both shebang and modeline modes.
*/
bool
options_init_config(char *execpath, char *configpath, int *init_flags, string_array_t *paths)
options_init_config(xdgHandle *xdg, char *execpath, char *configpath, int *init_flags, string_array_t *paths)
{
/* The different state the parser can have. */
enum {
@ -105,7 +106,27 @@ options_init_config(char *execpath, char *configpath, int *init_flags, string_ar
string_array_init(&argv);
string_array_append(&argv, a_strdup(execpath));
FILE *fp = fopen(configpath, "r");
FILE *fp = NULL;
/* It is too early to know which config works. So we assume
* the first one found is the one to use for the modeline. This
* may or may not end up being the config that works. However since
* knowing if the config works requires to load it, and loading must
* be done only after the modeline is parsed, this is the best we can
* do
*/
if (!configpath) {
const char *xdg_confpath = xdgConfigFind("awesome/rc.lua", xdg);
/* xdg_confpath is "string1\0string2\0string3\0\0" */
if (xdg_confpath && *xdg_confpath)
fp = fopen(xdg_confpath, "r");
else
fp = fopen(AWESOME_DEFAULT_CONF, "r");
p_delete(&xdg_confpath);
} else
fp = fopen(configpath, "r");
/* Share the error codepath with parsing errors */
if (!fp)

2
options.h
View file

@ -35,5 +35,5 @@ typedef enum {
} awesome_init_config_t;
char *options_detect_shebang(int argc, char **argv);
bool options_init_config(char *execpath, char *configpath, int *init_flags, string_array_t *paths);
bool options_init_config(xdgHandle *xdg, char *execpath, char *configpath, int *init_flags, string_array_t *paths);
char *options_check_args(int argc, char **argv, int *init_flags, string_array_t *paths);