d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some additional smarts for XFree86 configuration.

Browse Source 
Fix a bogon I thought I fixed in the last commit.
This commit is contained in:
Jordan K. Hubbard 1996-12-12 22:38:41 +00:00
parent 4d224b7f55
commit 3cd31ab739
9 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/sysinstall/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: config.c,v 1.62 1996/12/09 08:22:11 jkh Exp $
* $Id: config.c,v 1.63 1996/12/11 09:34:55 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -358,6 +358,9 @@ int
configXFree86(dialogMenuItem *self)
{
if (file_executable("/usr/X11R6/bin/XF86Setup")) {
dialog_clear_norefresh();
if (!file_readable("/dev/mouse") && !msgYesNo("Does this system have a mouse attached to it?"))
dmenuOpenSimple(&MenuMouse, FALSE);
dialog_clear();
systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat");
systemExecute("/usr/X11R6/bin/XF86Setup");

6
release/sysinstall/menus.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.99 1996/12/08 12:27:57 jkh Exp $
* $Id: menus.c,v 1.100 1996/12/09 06:02:28 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1276,8 +1276,8 @@ DMenu MenuUsermgmt = {
"login accounts.\n",
"Configure your user groups and users",
NULL,
{ { "Add group", "Add a new user group to the system.", NULL, userAddGroup },
{ "Add user", "Add a new user to the system.", NULL, userAddUser },
{ { "Add user", "Add a new user to the system.", NULL, userAddUser },
{ "Add group", "Add a new user group to the system.", NULL, userAddGroup },
{ "Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ NULL } },
};

6
release/sysinstall/misc.c
View File

@ -1,7 +1,7 @@
/*
* Miscellaneous support routines..
*
* $Id: misc.c,v 1.23 1996/12/09 08:22:15 jkh Exp $
* $Id: misc.c,v 1.24 1996/12/11 18:23:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -80,8 +80,8 @@ string_concat(char *one, char *two)
char *
sstrncpy(char *dst, const char *src, int size)
{
dst[size - 1] = '\0';
return strncpy(dst, src, size - 1);
dst[--size] = '\0';
return strncpy(dst, src, size);
}
/* Concatenate three strings into static storage */

5
usr.sbin/sade/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: config.c,v 1.62 1996/12/09 08:22:11 jkh Exp $
* $Id: config.c,v 1.63 1996/12/11 09:34:55 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -358,6 +358,9 @@ int
configXFree86(dialogMenuItem *self)
{
if (file_executable("/usr/X11R6/bin/XF86Setup")) {
dialog_clear_norefresh();
if (!file_readable("/dev/mouse") && !msgYesNo("Does this system have a mouse attached to it?"))
dmenuOpenSimple(&MenuMouse, FALSE);
dialog_clear();
systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat");
systemExecute("/usr/X11R6/bin/XF86Setup");

6
usr.sbin/sade/menus.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.99 1996/12/08 12:27:57 jkh Exp $
* $Id: menus.c,v 1.100 1996/12/09 06:02:28 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1276,8 +1276,8 @@ DMenu MenuUsermgmt = {
"login accounts.\n",
"Configure your user groups and users",
NULL,
{ { "Add group", "Add a new user group to the system.", NULL, userAddGroup },
{ "Add user", "Add a new user to the system.", NULL, userAddUser },
{ { "Add user", "Add a new user to the system.", NULL, userAddUser },
{ "Add group", "Add a new user group to the system.", NULL, userAddGroup },
{ "Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ NULL } },
};

6
usr.sbin/sade/misc.c
View File

@ -1,7 +1,7 @@
/*
* Miscellaneous support routines..
*
* $Id: misc.c,v 1.23 1996/12/09 08:22:15 jkh Exp $
* $Id: misc.c,v 1.24 1996/12/11 18:23:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -80,8 +80,8 @@ string_concat(char *one, char *two)
char *
sstrncpy(char *dst, const char *src, int size)
{
dst[size - 1] = '\0';
return strncpy(dst, src, size - 1);
dst[--size] = '\0';
return strncpy(dst, src, size);
}
/* Concatenate three strings into static storage */

5
usr.sbin/sysinstall/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: config.c,v 1.62 1996/12/09 08:22:11 jkh Exp $
* $Id: config.c,v 1.63 1996/12/11 09:34:55 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -358,6 +358,9 @@ int
configXFree86(dialogMenuItem *self)
{
if (file_executable("/usr/X11R6/bin/XF86Setup")) {
dialog_clear_norefresh();
if (!file_readable("/dev/mouse") && !msgYesNo("Does this system have a mouse attached to it?"))
dmenuOpenSimple(&MenuMouse, FALSE);
dialog_clear();
systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat");
systemExecute("/usr/X11R6/bin/XF86Setup");

6
usr.sbin/sysinstall/menus.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.99 1996/12/08 12:27:57 jkh Exp $
* $Id: menus.c,v 1.100 1996/12/09 06:02:28 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1276,8 +1276,8 @@ DMenu MenuUsermgmt = {
"login accounts.\n",
"Configure your user groups and users",
NULL,
{ { "Add group", "Add a new user group to the system.", NULL, userAddGroup },
{ "Add user", "Add a new user to the system.", NULL, userAddUser },
{ { "Add user", "Add a new user to the system.", NULL, userAddUser },
{ "Add group", "Add a new user group to the system.", NULL, userAddGroup },
{ "Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ NULL } },
};

6
usr.sbin/sysinstall/misc.c
View File

@ -1,7 +1,7 @@
/*
* Miscellaneous support routines..
*
* $Id: misc.c,v 1.23 1996/12/09 08:22:15 jkh Exp $
* $Id: misc.c,v 1.24 1996/12/11 18:23:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -80,8 +80,8 @@ string_concat(char *one, char *two)
char *
sstrncpy(char *dst, const char *src, int size)
{
dst[size - 1] = '\0';
return strncpy(dst, src, size - 1);
dst[--size] = '\0';
return strncpy(dst, src, size);
}
/* Concatenate three strings into static storage */