For -R and after chdir, add the current directory to the path

This restores the behavior pre 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d, at
least when -R is given. For a normal invocation without -R we don't add the
current directory, because 1aecdff isn't totally wrong about whether that's a
good idea.

Fixes https://gitlab.freedesktop.org/xorg/app/xkbcomp/issues/3

1 files changed, 7 insertions, 4 deletions

diff --git a/xkbcomp.c b/xkbcomp.c
index 51eb224..37dc8f5 100644
--- a/xkbcomp.c
+++ b/xkbcomp.c
@@ -549,11 +549,14 @@ parseArgs(int argc, char *argv[])
                 {
                     WARN1("Changing root directory to \"%s\"\n", rootDir);
                 }
-                if ((chdir(rootDir) < 0) && (warningLevel > 0))
+                if (chdir(rootDir) == 0)
                 {
-                    WARN1("Couldn't change directory to \"%s\"\n", rootDir);
-                    ACTION("Root directory (-R) option ignored\n");
-                    rootDir = NULL;
+                    XkbAddDirectoryToPath(".");
+                } else if (warningLevel > 0)
+                {
+                       WARN1("Couldn't change directory to \"%s\"\n", rootDir);
+                       ACTION("Root directory (-R) option ignored\n");
+                       rootDir = NULL;
                 }
             }
         }