[PATCH app/setxkbmap 2/2] Remove ~/.xkb from search path

Peter Hutterer peter.hutterer at who-t.net
Tue Nov 22 02:47:12 UTC 2016


On Thu, Nov 17, 2016 at 10:43:10PM +0500, Mihail Konev wrote:
> Signed-off-by: Mihail Konev <k.mvc at ya.ru>

sorry, this is a bit confusing. This one relies on your other one that
you've withdrawn? Please send a v2 patch with just the ones on top of
current master.

Cheers,
   Peter

> ---
>  setxkbmap.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/setxkbmap.c b/setxkbmap.c
> index 7cac2ce5207c..5d8a0a47baa4 100644
> --- a/setxkbmap.c
> +++ b/setxkbmap.c
> @@ -397,15 +397,9 @@ parseArgs(int argc, char **argv)
>      {
>          const char *home = getenv("HOME");
>          const char *xdg = getenv("XDG_CONFIG_HOME");
> -        char *home_path, *xdg_path;
> +        char *xdg_path;
>          int rc;
>  
> -        rc = asprintf(&home_path, "%s/.xkb", home);
> -        if (rc >= 0) {
> -            addToList(&inclPath, home_path);
> -            free(home_path);
> -        }
> -
>          rc = 0;
>          if (xdg != NULL) {
>              rc = asprintf(&xdg_path, "%s/xkb", xdg);
> -- 
> 2.9.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
> 


More information about the xorg-devel mailing list