[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r1180 - in trunk/debian: . patches



Author: branden
Date: 2004-03-25 16:35:30 -0500 (Thu, 25 Mar 2004)
New Revision: 1180

Modified:
   trunk/debian/changelog
   trunk/debian/patches/078_xdm_log_sourcing_better.diff
Log:
Use _SysErrorMsg() instead of strerror() to report errors.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-03-25 19:26:07 UTC (rev 1179)
+++ trunk/debian/changelog	2004-03-25 21:35:30 UTC (rev 1180)
@@ -23,8 +23,8 @@
       LogInfo()), not a Debug() message.
     + Ensure that source()d scripts (Xreset, Xsetup, Xstartup) can be
       fopen()ed before invoking runAndWait() on them.  If they can, LogInfo()
-      the fact.  If they cannot, LogInfo() that, too, and use strerror() to
-      report why fopen() failed.  (Closes: #219311)
+      the fact.  If they cannot, LogInfo() that, too, and use _SysErrorMsg()
+      to report why fopen() failed.  (Closes: #219311)
     + Make source() complain using Debug() when it is given a null pointer in
       its file argument.
     + For clarity, make source() return from only one location.
@@ -36,7 +36,7 @@
       should speed up builds on the s390 architecture.
     + Drop now-unused NOT_BUILDING_X_SERVER variable entirely.
 
- -- Branden Robinson <branden@debian.org>  Thu, 25 Mar 2004 13:11:07 -0500
+ -- Branden Robinson <branden@debian.org>  Thu, 25 Mar 2004 16:34:56 -0500
 
 xfree86 (4.3.0-7) unstable; urgency=medium
 

Modified: trunk/debian/patches/078_xdm_log_sourcing_better.diff
===================================================================
--- trunk/debian/patches/078_xdm_log_sourcing_better.diff	2004-03-25 19:26:07 UTC (rev 1179)
+++ trunk/debian/patches/078_xdm_log_sourcing_better.diff	2004-03-25 21:35:30 UTC (rev 1180)
@@ -6,7 +6,7 @@
   LogInfo()), not a Debug() message.
 * Ensure that source()d scripts (Xreset, Xsetup, Xstartup) can be
   fopen()ed before invoking runAndWait() on them.  If they can, LogInfo()
-  the fact.  If they cannot, LogInfo() that, too, and use strerror() to
+  the fact.  If they cannot, LogInfo() that, too, and use _SysErrorMsg() to
   report why fopen() failed.
 * Make source() complain using Debug() when it is given a null pointer in
   its file argument.
@@ -16,17 +16,9 @@
 
 This patch by Branden Robinson.
 
---- xc/programs/xdm/session.c~	2004-03-25 12:11:27.000000000 -0500
-+++ xc/programs/xdm/session.c	2004-03-25 12:43:56.000000000 -0500
-@@ -46,6 +46,7 @@
- #include <X11/Xmu/Error.h>
- #include <errno.h>
- #include <stdio.h>
-+#include <string.h>
- #include <ctype.h>
- #include <grp.h>	/* for initgroups */
- #ifdef AIXV3
-@@ -734,7 +735,7 @@
+--- xc/programs/xdm/session.c~	2004-03-25 16:33:40.000000000 -0500
++++ xc/programs/xdm/session.c	2004-03-25 16:33:06.000000000 -0500
+@@ -734,7 +734,7 @@
  		verify->userEnviron = setEnv (verify->userEnviron, "HOME", "/");
  	    }
  	if (verify->argv) {
@@ -35,7 +27,7 @@
  		execute (verify->argv, verify->userEnviron);
  		LogError ("session \"%s\" execution failed (err %d)\n", verify->argv[0], errno);
  	} else {
-@@ -762,21 +763,28 @@
+@@ -762,21 +762,28 @@
  source (char **environ, char *file)
  {
      char	**args, *args_safe[2];
@@ -52,7 +44,7 @@
 -	    args[1] = NULL;
 +	f = fopen (file, "r");
 +	if (!f)
-+	    LogInfo ("not sourcing %s (%s)\n", file, strerror (errno));
++	    LogInfo ("not sourcing %s (%s)\n", file, _SysErrorMsg (errno));
 +	else {
 +	    fclose (f);
 +	    LogInfo ("sourcing %s\n", file);



Reply to: