jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 12:28:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Another round of updates for -current and 3.2

Browse Source
This commit is contained in:
Jordan K. Hubbard 1999-05-05 11:34:03 +00:00
parent 9775e37869
commit 2d49c1f84a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=46503
13 changed files with 61 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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.127 1999/04/28 06:39:25 jkh Exp $
* $Id: config.c,v 1.128 1999/04/28 07:20:11 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -558,8 +558,12 @@ tryagain:
"utility.");
dialog_clear();
systemExecute(execfile);
if (!file_readable("/etc/XF86Config") && !msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?"))
goto tryagain;
if (!file_readable("/etc/XF86Config")) {
if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?"))
goto tryagain;
else
return DITEM_FAILURE | DITEM_RESTORE;
}
configXDesktop(self);
return DITEM_SUCCESS | DITEM_RESTORE;
}

4
release/sysinstall/dist.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: dist.c,v 1.137 1999/03/19 10:54:37 jkh Exp $
* $Id: dist.c,v 1.138 1999/04/21 07:22:37 obrien Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -202,8 +202,6 @@ distVerifyFlags(void)
XF86Dists |= DIST_XF86_FONTS;
if (XF86Dists || XF86ServerDists || XF86FontDists)
Dists |= DIST_XF86;
if (Dists & DIST_XF86)
Dists |= DIST_COMPAT22;
if (isDebug())
msgDebug("Dist Masks: Dists: %0x, DES: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n",
Dists, DESDists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists);

4
release/sysinstall/install.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: install.c,v 1.232 1999/04/27 14:33:25 jkh Exp $
* $Id: install.c,v 1.233 1999/04/28 10:51:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -751,7 +751,7 @@ installFixupBin(dialogMenuItem *self)
msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
"to it. See the debug screen (ALT-F2) for details.");
}
else {
else if (file_readable("/boot/kernel.conf")) {
FILE *fp;
if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {

11
release/sysinstall/kget.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: kget.c,v 1.4 1999/03/10 02:50:31 jkh Exp $
* $Id: kget.c,v 1.5 1999/05/05 10:14:06 jkh Exp $
*/
#include "sysinstall.h"
@ -34,7 +34,7 @@
int
kget(char *out)
{
int len, i, bytes_written;
int len, i, bytes_written = 0;
char *buf;
char *mib1 = "machdep.uc_devlist";
char *mib2 = "machdep.uc_pnplist";
@ -53,7 +53,7 @@ kget(char *out)
}
if (len <= 0) {
msgDebug("kget: mib1 has length of %d\n", len);
return -1;
goto pnp;
}
buf = (char *)alloca(len * sizeof(char));
i = sysctlbyname(mib1, buf, &len, NULL, NULL);
@ -70,7 +70,7 @@ kget(char *out)
return -1;
}
i = bytes_written = 0;
i = 0;
while (i < len) {
id = (struct isa_device *)(buf + i);
p = (buf + i + sizeof(struct isa_device));
@ -105,6 +105,8 @@ kget(char *out)
}
i += sizeof(struct isa_device) + 8;
}
pnp:
/* Now, print the changes to PnP override table */
i = sysctlbyname(mib2, NULL, &len, NULL, NULL);
if (i) {
@ -154,6 +156,7 @@ kget(char *out)
bytes_written += fprintf(fout,"\n");
}
} while ((i += sizeof(struct pnp_cinfo)) < len);
bail:
if (bytes_written)
fprintf(fout, "q\n");

8
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.196 1999/04/27 14:33:26 jkh Exp $
* $Id: menus.c,v 1.197 1999/05/01 11:27:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -443,6 +443,8 @@ DMenu MenuXF86Config = {
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" },
{ "XF98Setup", "Fully graphical XFree86 configuration tool (PC98).",
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF98Setup" },
{ "XDesktop", "X already set up, just do desktop configuration.",
NULL, dmenuSubmenu, NULL, &MenuXDesktops },
{ NULL } },
};
@ -851,7 +853,7 @@ DMenu MenuSrcDistributions = {
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS ,
"Select the sub-components of src you wish to install.",
"Please check off those portions of the FreeBSD source tree\n"
"you wish to install.",
"you wish to install (remember to use SPACE, not ENTER!).",
NULL,
NULL,
{ { "All", "Select all of the below",
@ -1449,6 +1451,8 @@ DMenu MenuSysconsSaver = {
dmenuVarCheck, configSaver, NULL, "saver=daemon" },
{ "Fade", "Fade out effect screen saver",
dmenuVarCheck, configSaver, NULL, "saver=fade" },
{ "Fire", "Flames effect screen saver",
dmenuVarCheck, configSaver, NULL, "saver=fire" },
{ "Green", "\"Green\" power saving mode (if supported by monitor)",
dmenuVarCheck, configSaver, NULL, "saver=green" },
{ "Logo", "\"BSD Daemon\" animated screen saver (graphics)",

10
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.127 1999/04/28 06:39:25 jkh Exp $
* $Id: config.c,v 1.128 1999/04/28 07:20:11 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -558,8 +558,12 @@ tryagain:
"utility.");
dialog_clear();
systemExecute(execfile);
if (!file_readable("/etc/XF86Config") && !msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?"))
goto tryagain;
if (!file_readable("/etc/XF86Config")) {
if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?"))
goto tryagain;
else
return DITEM_FAILURE | DITEM_RESTORE;
}
configXDesktop(self);
return DITEM_SUCCESS | DITEM_RESTORE;
}

4
usr.sbin/sade/install.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: install.c,v 1.232 1999/04/27 14:33:25 jkh Exp $
* $Id: install.c,v 1.233 1999/04/28 10:51:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -751,7 +751,7 @@ installFixupBin(dialogMenuItem *self)
msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
"to it. See the debug screen (ALT-F2) for details.");
}
else {
else if (file_readable("/boot/kernel.conf")) {
FILE *fp;
if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {

8
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.196 1999/04/27 14:33:26 jkh Exp $
* $Id: menus.c,v 1.197 1999/05/01 11:27:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -443,6 +443,8 @@ DMenu MenuXF86Config = {
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" },
{ "XF98Setup", "Fully graphical XFree86 configuration tool (PC98).",
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF98Setup" },
{ "XDesktop", "X already set up, just do desktop configuration.",
NULL, dmenuSubmenu, NULL, &MenuXDesktops },
{ NULL } },
};
@ -851,7 +853,7 @@ DMenu MenuSrcDistributions = {
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS ,
"Select the sub-components of src you wish to install.",
"Please check off those portions of the FreeBSD source tree\n"
"you wish to install.",
"you wish to install (remember to use SPACE, not ENTER!).",
NULL,
NULL,
{ { "All", "Select all of the below",
@ -1449,6 +1451,8 @@ DMenu MenuSysconsSaver = {
dmenuVarCheck, configSaver, NULL, "saver=daemon" },
{ "Fade", "Fade out effect screen saver",
dmenuVarCheck, configSaver, NULL, "saver=fade" },
{ "Fire", "Flames effect screen saver",
dmenuVarCheck, configSaver, NULL, "saver=fire" },
{ "Green", "\"Green\" power saving mode (if supported by monitor)",
dmenuVarCheck, configSaver, NULL, "saver=green" },
{ "Logo", "\"BSD Daemon\" animated screen saver (graphics)",

10
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.127 1999/04/28 06:39:25 jkh Exp $
* $Id: config.c,v 1.128 1999/04/28 07:20:11 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -558,8 +558,12 @@ tryagain:
"utility.");
dialog_clear();
systemExecute(execfile);
if (!file_readable("/etc/XF86Config") && !msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?"))
goto tryagain;
if (!file_readable("/etc/XF86Config")) {
if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?"))
goto tryagain;
else
return DITEM_FAILURE | DITEM_RESTORE;
}
configXDesktop(self);
return DITEM_SUCCESS | DITEM_RESTORE;
}

4
usr.sbin/sysinstall/dist.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: dist.c,v 1.137 1999/03/19 10:54:37 jkh Exp $
* $Id: dist.c,v 1.138 1999/04/21 07:22:37 obrien Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -202,8 +202,6 @@ distVerifyFlags(void)
XF86Dists |= DIST_XF86_FONTS;
if (XF86Dists || XF86ServerDists || XF86FontDists)
Dists |= DIST_XF86;
if (Dists & DIST_XF86)
Dists |= DIST_COMPAT22;
if (isDebug())
msgDebug("Dist Masks: Dists: %0x, DES: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n",
Dists, DESDists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists);

4
usr.sbin/sysinstall/install.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: install.c,v 1.232 1999/04/27 14:33:25 jkh Exp $
* $Id: install.c,v 1.233 1999/04/28 10:51:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -751,7 +751,7 @@ installFixupBin(dialogMenuItem *self)
msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
"to it. See the debug screen (ALT-F2) for details.");
}
else {
else if (file_readable("/boot/kernel.conf")) {
FILE *fp;
if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {

11
usr.sbin/sysinstall/kget.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: kget.c,v 1.4 1999/03/10 02:50:31 jkh Exp $
* $Id: kget.c,v 1.5 1999/05/05 10:14:06 jkh Exp $
*/
#include "sysinstall.h"
@ -34,7 +34,7 @@
int
kget(char *out)
{
int len, i, bytes_written;
int len, i, bytes_written = 0;
char *buf;
char *mib1 = "machdep.uc_devlist";
char *mib2 = "machdep.uc_pnplist";
@ -53,7 +53,7 @@ kget(char *out)
}
if (len <= 0) {
msgDebug("kget: mib1 has length of %d\n", len);
return -1;
goto pnp;
}
buf = (char *)alloca(len * sizeof(char));
i = sysctlbyname(mib1, buf, &len, NULL, NULL);
@ -70,7 +70,7 @@ kget(char *out)
return -1;
}
i = bytes_written = 0;
i = 0;
while (i < len) {
id = (struct isa_device *)(buf + i);
p = (buf + i + sizeof(struct isa_device));
@ -105,6 +105,8 @@ kget(char *out)
}
i += sizeof(struct isa_device) + 8;
}
pnp:
/* Now, print the changes to PnP override table */
i = sysctlbyname(mib2, NULL, &len, NULL, NULL);
if (i) {
@ -154,6 +156,7 @@ kget(char *out)
bytes_written += fprintf(fout,"\n");
}
} while ((i += sizeof(struct pnp_cinfo)) < len);
bail:
if (bytes_written)
fprintf(fout, "q\n");

8
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.196 1999/04/27 14:33:26 jkh Exp $
* $Id: menus.c,v 1.197 1999/05/01 11:27:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -443,6 +443,8 @@ DMenu MenuXF86Config = {
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" },
{ "XF98Setup", "Fully graphical XFree86 configuration tool (PC98).",
NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF98Setup" },
{ "XDesktop", "X already set up, just do desktop configuration.",
NULL, dmenuSubmenu, NULL, &MenuXDesktops },
{ NULL } },
};
@ -851,7 +853,7 @@ DMenu MenuSrcDistributions = {
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS ,
"Select the sub-components of src you wish to install.",
"Please check off those portions of the FreeBSD source tree\n"
"you wish to install.",
"you wish to install (remember to use SPACE, not ENTER!).",
NULL,
NULL,
{ { "All", "Select all of the below",
@ -1449,6 +1451,8 @@ DMenu MenuSysconsSaver = {
dmenuVarCheck, configSaver, NULL, "saver=daemon" },
{ "Fade", "Fade out effect screen saver",
dmenuVarCheck, configSaver, NULL, "saver=fade" },
{ "Fire", "Flames effect screen saver",
dmenuVarCheck, configSaver, NULL, "saver=fire" },
{ "Green", "\"Green\" power saving mode (if supported by monitor)",
dmenuVarCheck, configSaver, NULL, "saver=green" },
{ "Logo", "\"BSD Daemon\" animated screen saver (graphics)",