[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/common xf86Init.c, 1.1.4.5.2.2, 1.1.4.5.2.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/common
In directory pdx:/tmp/cvs-serv31289/programs/Xserver/hw/xfree86/common

Modified Files:
      Tag: XORG-RELEASE-1
	xf86Init.c 
Log Message:
- fixing -config
- fixing nameing issues


Index: xf86Init.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v
retrieving revision 1.1.4.5.2.2
retrieving revision 1.1.4.5.2.3
diff -u -d -r1.1.4.5.2.2 -r1.1.4.5.2.3
--- a/xf86Init.c	2 Apr 2004 21:47:17 -0000	1.1.4.5.2.2
+++ b/xf86Init.c	6 Apr 2004 16:13:42 -0000	1.1.4.5.2.3
@@ -1344,15 +1344,15 @@
       return 2;
     }
   }
-  if (!strcmp(argv[i], "-xf86config"))
+  if (!strcmp(argv[i], "-config"))
   {
     if (!argv[i + 1])
       return 0;
     if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {
-      FatalError("\nInvalid argument for -xf86config\n"
-	  "\tFor non-root users, the file specified with -xf86config must be\n"
+      FatalError("\nInvalid argument for -config\n"
+	  "\tFor non-root users, the file specified with -config must be\n"
 	  "\ta relative path and must not contain any \"..\" elements.\n"
-	  "\tUsing default XF86Config search path.\n\n");
+	  "\tUsing default "__XCONFIGFILE__" search path.\n\n");
     }
     xf86ConfigFile = argv[i + 1];
     return 2;
@@ -1655,15 +1655,14 @@
   ErrorF("Device Dependent Usage\n");
   if (getuid() == 0)
   {
-    ErrorF("-xf86config file       specify a configuration file\n");
     ErrorF("-modulepath paths      specify the module search path\n");
     ErrorF("-logfile file          specify a log file name\n");
-    ErrorF("-configure             probe for devices and write an XF86Config\n");
+    ErrorF("-configure             probe for devices and write an "__XCONFIGFILE__"\n");
   }
   else
   {
-    ErrorF("-xf86config file       specify a configuration file, relative to the\n");
-    ErrorF("                       XF86Config search path, only root can use absolute\n");
+    ErrorF("-config file       specify a configuration file, relative to the\n");
+    ErrorF("                       "__XCONFIGFILE__" search path, only root can use absolute\n");
   }
   ErrorF("-probeonly             probe for devices, then exit\n");
   ErrorF("-scanpci               execute the scanpci module and exit\n");