frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bogus contact address in Xserver/os/util.c (Bug #738).

This commit is contained in:
Kevin E Martin 2004-08-11 22:27:50 +00:00
parent 56520ecd5c
commit f95293e525
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
os/utils.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.4 2004/07/31 04:23:21 kem Exp $ */ /* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.5 2004/07/31 09:14:06 kem Exp $ */
/* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */ /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
/* /*
@ -1898,16 +1898,24 @@ enum BadCode {
InternalError InternalError
}; };
#if defined(VENDORSUPPORT)
#define BUGADDRESS VENDORSUPPORT
#elif defined(BUILDERADDR)
#define BUGADDRESS BUILDERADDR
#else
#define BUGADDRESS "xorg@freedesktop.org"
#endif
#define ARGMSG \ #define ARGMSG \
"\nIf the arguments used are valid, and have been rejected incorrectly\n" \ "\nIf the arguments used are valid, and have been rejected incorrectly\n" \
"please send details of the arguments and why they are valid to\n" \ "please send details of the arguments and why they are valid to\n" \
"&&&&&@X.org. In the meantime, you can start the Xserver as\n" \ "%s. In the meantime, you can start the Xserver as\n" \
"the \"super user\" (root).\n" "the \"super user\" (root).\n"
#define ENVMSG \ #define ENVMSG \
"\nIf the environment is valid, and have been rejected incorrectly\n" \ "\nIf the environment is valid, and have been rejected incorrectly\n" \
"please send details of the environment and why it is valid to\n" \ "please send details of the environment and why it is valid to\n" \
"&&&&&@X.org. In the meantime, you can start the Xserver as\n" \ "%s. In the meantime, you can start the Xserver as\n" \
"the \"super user\" (root).\n" "the \"super user\" (root).\n"
void void
@ -2015,20 +2023,20 @@ CheckUserParameters(int argc, char **argv, char **envp)
return; return;
case UnsafeArg: case UnsafeArg:
ErrorF("Command line argument number %d is unsafe\n", i); ErrorF("Command line argument number %d is unsafe\n", i);
ErrorF(ARGMSG); ErrorF(ARGMSG, BUGADDRESS);
break; break;
case ArgTooLong: case ArgTooLong:
ErrorF("Command line argument number %d is too long\n", i); ErrorF("Command line argument number %d is too long\n", i);
ErrorF(ARGMSG); ErrorF(ARGMSG, BUGADDRESS);
break; break;
case UnprintableArg: case UnprintableArg:
ErrorF("Command line argument number %d contains unprintable" ErrorF("Command line argument number %d contains unprintable"
" characters\n", i); " characters\n", i);
ErrorF(ARGMSG); ErrorF(ARGMSG, BUGADDRESS);
break; break;
case EnvTooLong: case EnvTooLong:
ErrorF("Environment variable `%s' is too long\n", e); ErrorF("Environment variable `%s' is too long\n", e);
ErrorF(ENVMSG); ErrorF(ENVMSG, BUGADDRESS);
break; break;
case OutputIsPipe: case OutputIsPipe:
ErrorF("Stdout and/or stderr is a pipe\n"); ErrorF("Stdout and/or stderr is a pipe\n");
@ -2038,8 +2046,8 @@ CheckUserParameters(int argc, char **argv, char **envp)
break; break;
default: default:
ErrorF("Unknown error\n"); ErrorF("Unknown error\n");
ErrorF(ARGMSG); ErrorF(ARGMSG, BUGADDRESS);
ErrorF(ENVMSG); ErrorF(ENVMSG, BUGADDRESS);
break; break;
} }
FatalError("X server aborted because of unsafe environment\n"); FatalError("X server aborted because of unsafe environment\n");