Commit d15339a9 authored by Adam Jackson's avatar Adam Jackson
Browse files

Bug #9725: Don't look in root's $HOME for config files, that's just confusing.

parent 748cfbc8
...@@ -93,7 +93,6 @@ extern DeviceAssocRec mouse_assoc; ...@@ -93,7 +93,6 @@ extern DeviceAssocRec mouse_assoc;
"/etc/X11/%R," "%P/etc/X11/%R," \ "/etc/X11/%R," "%P/etc/X11/%R," \
"%E," "%F," \ "%E," "%F," \
"/etc/X11/%F," "%P/etc/X11/%F," \ "/etc/X11/%F," "%P/etc/X11/%F," \
"%D/%X," \
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \ "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \ "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
"%P/etc/X11/%X," \ "%P/etc/X11/%X," \
......
...@@ -62,7 +62,7 @@ xrealloc (void *p, int size) ...@@ -62,7 +62,7 @@ xrealloc (void *p, int size)
#endif #endif
#define CONFPATH "%A,%R,/etc/X11/%R,%P/etc/X11/%R,%E,%F,/etc/X11/%F," \ #define CONFPATH "%A,%R,/etc/X11/%R,%P/etc/X11/%R,%E,%F,/etc/X11/%F," \
"%P/etc/X11/%F,%D/%X,/etc/X11/%X,/etc/%X,%P/etc/X11/%X.%H," \ "%P/etc/X11/%F,/etc/X11/%X,/etc/%X,%P/etc/X11/%X.%H," \
"%P/etc/X11/%X,%P/lib/X11/%X.%H,%P/lib/X11/%X" "%P/etc/X11/%X,%P/lib/X11/%X.%H,%P/lib/X11/%X"
int int
......
...@@ -558,7 +558,6 @@ xf86pathIsSafe(const char *path) ...@@ -558,7 +558,6 @@ xf86pathIsSafe(const char *path)
* %E config file environment ($XORGCONFIG) as an absolute path * %E config file environment ($XORGCONFIG) as an absolute path
* %F config file environment ($XORGCONFIG) as a relative path * %F config file environment ($XORGCONFIG) as a relative path
* %G config file environment ($XORGCONFIG) as a safe path * %G config file environment ($XORGCONFIG) as a safe path
* %D $HOME
* %P projroot * %P projroot
* %M major version number * %M major version number
* %% % * %% %
...@@ -703,14 +702,6 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot, ...@@ -703,14 +702,6 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot,
} else } else
BAIL_OUT; BAIL_OUT;
break; break;
case 'D':
if (!home)
home = getenv("HOME");
if (home && xf86pathIsAbsolute(home))
APPEND_STR(home);
else
BAIL_OUT;
break;
case 'P': case 'P':
if (projroot && xf86pathIsAbsolute(projroot)) if (projroot && xf86pathIsAbsolute(projroot))
APPEND_STR(projroot); APPEND_STR(projroot);
......
...@@ -101,7 +101,6 @@ extern int config_mode; ...@@ -101,7 +101,6 @@ extern int config_mode;
"/etc/X11/%R," "%P/etc/X11/%R," \ "/etc/X11/%R," "%P/etc/X11/%R," \
"%E," "%F," \ "%E," "%F," \
"/etc/X11/%F," "%P/etc/X11/%F," \ "/etc/X11/%F," "%P/etc/X11/%F," \
"%D/%X," \
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \ "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \ "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
"%P/etc/X11/%X," \ "%P/etc/X11/%X," \
......
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
"/etc/X11/%R," "%P/etc/X11/%R," \ "/etc/X11/%R," "%P/etc/X11/%R," \
"%E," "%F," \ "%E," "%F," \
"/etc/X11/%F," "%P/etc/X11/%F," \ "/etc/X11/%F," "%P/etc/X11/%F," \
"%D/%X," \
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \ "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \ "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
"%P/etc/X11/%X," \ "%P/etc/X11/%X," \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment