jungerl/lib/x11/src xauth.erl,1.1,1.2 xcli.erl,1.1,1.2

[<no...@us...>]

Update of /cvsroot/jungerl/jungerl/lib/x11/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26463

Modified Files:
	xauth.erl xcli.erl 
Log Message:
Made XAUTHORITY lookup work for me.

Index: xauth.erl
===================================================================
RCS file: /cvsroot/jungerl/jungerl/lib/x11/src/xauth.erl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xauth.erl	6 Mar 2003 23:00:02 -0000	1.1
+++ xauth.erl	13 Jun 2003 16:25:15 -0000	1.2
@@ -10,6 +10,18 @@
 -include("x.hrl").
 -include_lib("kernel/include/inet.hrl").
 
+auth_file() ->
+    case os:getenv("XAUTHORITY") of
+	false ->
+	    case os:getenv("HOME") of
+		false ->
+		    false;
+		Home ->
+		    filename:join(Home, ".Xauthority")
+	    end;
+	File -> File
+    end.
+
 parse(Fname) ->
     case file:read_file(Fname) of
 	{ok,Bin} ->

Index: xcli.erl
===================================================================
RCS file: /cvsroot/jungerl/jungerl/lib/x11/src/xcli.erl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xcli.erl	6 Mar 2003 23:00:02 -0000	1.1
+++ xcli.erl	13 Jun 2003 16:25:15 -0000	1.2
@@ -32,16 +32,21 @@
 
 init(Creator, Host, DpyN, DefScr) ->
     ?DBG("init: ~p ~p ~p\n", [Host, DpyN, DefScr]),
-    Home = os:getenv("HOME"),
-    case xauth:parse(filename:join(Home,".Xauthority")) of
-	{error,Err} ->
-	    Creator ! {self(), {error,Err}};
-	Xauth ->
-	    case xauth:lookup(Host, Xauth) of
-		{value,Auth} ->
-		    auth(Creator,Host,Auth,DpyN,DefScr);
-		false ->
-		    Creator ! {self(), {error,bad_auth}}
+    case xauth:auth_file() of
+	false ->
+	    Creator ! {self(), {error, no_xauth_file}};
+	Filename ->
+	    case xauth:parse(Filename) of
+		{error,Err} ->
+		    Creator ! {self(), {error,Err}};
+		Xauth ->
+		    ?DBG("xauth parse: ~p ~p\n", [Host, Xauth]),
+		    case xauth:lookup(Host, Xauth) of
+			{value,Auth} ->
+			    auth(Creator,Host,Auth,DpyN,DefScr);
+			false ->
+			    Creator ! {self(), {error,bad_auth}}
+		    end
 	    end
     end.