summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2015-10-25 15:24:07 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2015-10-25 15:24:07 +0000
commitd37a0bffe49dd695beb69fc5204d492c350251d4 (patch)
treed5466699fc78f090d4c8a0700c24259c37f4bf62
parenta11a52360e5e3d0b2749bd85edeb5a7851081341 (diff)
Reduce white space diff with upstreams. No other change.
-rw-r--r--xserver/hw/xfree86/os-support/bsd/bsd_init.c80
1 files changed, 40 insertions, 40 deletions
diff --git a/xserver/hw/xfree86/os-support/bsd/bsd_init.c b/xserver/hw/xfree86/os-support/bsd/bsd_init.c
index 9f37c14d3..ff97155f6 100644
--- a/xserver/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/xserver/hw/xfree86/os-support/bsd/bsd_init.c
@@ -173,47 +173,47 @@ xf86OpenConsole()
return;
}
if (serverGeneration == 1) {
- /* check if we are run with euid==0 */
- if (geteuid() != 0 && issetugid()) {
- FatalError("xf86OpenConsole: Server must either be suid root"
+ /* check if we are run with euid==0 */
+ if (geteuid() != 0 && issetugid()) {
+ FatalError("xf86OpenConsole: Server must either be suid root"
" or without privileges at all");
- }
-
- if (!KeepTty) {
- /*
- * detaching the controlling tty solves problems of kbd character
- * loss. This is not interesting for CO driver, because it is
- * exclusive.
- */
- setpgrp(0, getpid());
- if ((i = open("/dev/tty",O_RDWR)) >= 0) {
- ioctl(i,TIOCNOTTY,(char *)0);
- close(i);
- }
- }
-
- /* detect which driver we are running on */
- for (driver = xf86ConsTab; *driver; driver++) {
- if ((fd = (*driver)()) >= 0)
- break;
- }
-
- /* Check that a supported console driver was found */
- if (fd < 0) {
- char cons_drivers[80] = {0, };
- for (i = 0; i < sizeof(supported_drivers) / sizeof(char *); i++) {
- if (i) {
- strcat(cons_drivers, ", ");
- }
- strcat(cons_drivers, supported_drivers[i]);
- }
- FatalError(
- "%s: No console driver found\n\tSupported drivers: %s\n\t%s",
- "xf86OpenConsole", cons_drivers, CHECK_DRIVER_MSG);
- }
- xf86Info.consoleFd = fd;
-
- switch (xf86Info.consType) {
+ }
+
+ if (!KeepTty) {
+ /*
+ * detaching the controlling tty solves problems of kbd character
+ * loss. This is not interesting for CO driver, because it is
+ * exclusive.
+ */
+ setpgrp(0, getpid());
+ if ((i = open("/dev/tty",O_RDWR)) >= 0) {
+ ioctl(i,TIOCNOTTY,(char *)0);
+ close(i);
+ }
+ }
+
+ /* detect which driver we are running on */
+ for (driver = xf86ConsTab; *driver; driver++) {
+ if ((fd = (*driver)()) >= 0)
+ break;
+ }
+
+ /* Check that a supported console driver was found */
+ if (fd < 0) {
+ char cons_drivers[80] = {0, };
+ for (i = 0; i < sizeof(supported_drivers) / sizeof(char *); i++) {
+ if (i) {
+ strcat(cons_drivers, ", ");
+ }
+ strcat(cons_drivers, supported_drivers[i]);
+ }
+ FatalError(
+ "%s: No console driver found\n\tSupported drivers: %s\n\t%s",
+ "xf86OpenConsole", cons_drivers, CHECK_DRIVER_MSG);
+ }
+ xf86Info.consoleFd = fd;
+
+ switch (xf86Info.consType) {
#ifdef PCCONS_SUPPORT
case PCCONS:
if (ioctl(xf86Info.consoleFd, CONSOLE_X_MODE_ON, 0) < 0) {