diff --git a/usr.bin/systat/disks.c b/usr.bin/systat/disks.c deleted file mode 100644 index f3ac91d413b7..000000000000 --- a/usr.bin/systat/disks.c +++ /dev/null @@ -1,207 +0,0 @@ -/*- - * Copyright (c) 1980, 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef lint -static char sccsid[] = "@(#)disks.c 8.1 (Berkeley) 6/6/93"; -#endif /* not lint */ - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include "systat.h" -#include "extern.h" - -static void dkselect __P((char *, int, int [])); -static int read_names __P((void)); - -static struct nlist namelist[] = { -#define X_DK_NDRIVE 0 - { "_dk_ndrive" }, -#define X_DK_WPMS 1 - { "_dk_wpms" }, -#if defined(hp300) || defined(luna68k) -#define X_HPDINIT (X_DK_WPMS+1) - { "_hp_dinit" }, -#endif -#if defined(i386) -#define X_DK_NAMES (X_DK_WPMS+1) - { "_dk_names" }, -#endif -#ifdef mips -#define X_SCSI_DINIT (X_DK_WPMS+1) - { "_scsi_dinit" }, -#endif -#ifdef sun -#define X_MBDINIT (X_DK_WPMS+1) - { "_mbdinit" }, -#endif -#ifdef tahoe -#define X_VBDINIT (X_DK_WPMS+1) - { "_vbdinit" }, -#endif -#ifdef vax -#define X_MBDINIT (X_DK_WPMS+1) - { "_mbdinit" }, -#define X_UBDINIT (X_DK_WPMS+2) - { "_ubdinit" }, -#endif - { "" }, -}; - -float *dk_mspw; -int dk_ndrive, *dk_select; -char **dr_name; - -#include "names.c" /* XXX */ - -int -dkinit() -{ - register int i; - register char *cp; - static int once = 0; - static char buf[1024]; - - if (once) - return(1); - - if (kvm_nlist(kd, namelist)) { - nlisterr(namelist); - return(0); - } - if (namelist[X_DK_NDRIVE].n_value == 0) { - error("dk_ndrive undefined in kernel"); - return(0); - } - NREAD(X_DK_NDRIVE, &dk_ndrive, sizeof(dk_ndrive)); - if (dk_ndrive <= 0) { - error("dk_ndrive=%d according to %s", dk_ndrive, getbootfile()); - return(0); - } - dk_mspw = (float *)calloc(dk_ndrive, sizeof (float)); - { - long *wpms = (long *)calloc(dk_ndrive, sizeof(long)); - KREAD(NPTR(X_DK_WPMS), wpms, dk_ndrive * sizeof (long)); - for (i = 0; i < dk_ndrive; i++) - *(dk_mspw + i) = (*(wpms + i) == 0)? 0.0: - (float) 1.0 / *(wpms + i); - free(wpms); - } - dr_name = (char **)calloc(dk_ndrive, sizeof (char *)); - dk_select = (int *)calloc(dk_ndrive, sizeof (int)); - for (cp = buf, i = 0; i < dk_ndrive; i++) { - dr_name[i] = cp; - snprintf(cp, sizeof(buf) - (cp - buf), "dk%d", i); - cp += strlen(cp) + 1; - if (cp > buf + sizeof(buf)) - errx(1, "buf too small in dkinit, aborting"); - if (dk_mspw[i] != 0.0) - dk_select[i] = 1; - } - if (!read_names()) { - free(dr_name); - free(dk_select); - free(dk_mspw); - return(0); - } - once = 1; - return(1); -} - -int -dkcmd(cmd, args) - char *cmd, *args; -{ - if (prefix(cmd, "display") || prefix(cmd, "add")) { - dkselect(args, 1, dk_select); - return (1); - } - if (prefix(cmd, "ignore") || prefix(cmd, "delete")) { - dkselect(args, 0, dk_select); - return (1); - } - if (prefix(cmd, "drives")) { - register int i; - - move(CMDLINE, 0); clrtoeol(); - for (i = 0; i < dk_ndrive; i++) - if (dk_mspw[i] != 0.0) - printw("%s ", dr_name[i]); - return (1); - } - return (0); -} - -static void -dkselect(args, truefalse, selections) - char *args; - int truefalse, selections[]; -{ - register char *cp; - register int i; - char *index(); - - cp = index(args, '\n'); - if (cp) - *cp = '\0'; - for (;;) { - for (cp = args; *cp && isspace(*cp); cp++) - ; - args = cp; - for (; *cp && !isspace(*cp); cp++) - ; - if (*cp) - *cp++ = '\0'; - if (cp - args == 0) - break; - for (i = 0; i < dk_ndrive; i++) - if (strcmp(args, dr_name[i]) == 0) { - if (dk_mspw[i] != 0.0) - selections[i] = truefalse; - else - error("%s: drive not configured", - dr_name[i]); - break; - } - if (i >= dk_ndrive) - error("%s: unknown drive", args); - args = cp; - } -} diff --git a/usr.bin/vmstat/names.c b/usr.bin/vmstat/names.c deleted file mode 100644 index b7d3a3a9e42b..000000000000 --- a/usr.bin/vmstat/names.c +++ /dev/null @@ -1,271 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)names.c 8.1 (Berkeley) 6/6/93 - */ - -#if !defined(hp300) && !defined(tahoe) && !defined(vax) && \ - !defined(luna68k) && !defined(mips) && !defined(i386) -char *defdrives[] = { 0 }; -#endif - -#if defined(i386) -/* - * i386 support added by Rodney W. Grimes. - */ -#include - -char *defdrives[] = { "wd0", "wd1", "sd0", "sd1", 0 }; - -int -read_names() -{ - u_long dk_names; - static char thenames[DK_NDRIVE][DK_NAMELEN]; - int i; - - dk_names = namelist[X_DK_NAMES].n_value; - if (dk_names == 0) { - warnx("disk name info not in namelist"); - return(0); - } - - kvm_read(kd, dk_names, thenames, sizeof thenames); - for(i = 0; thenames[i][0]; i++) { - dr_name[i] = thenames[i]; - } - return(1); -} -#endif /* i386 */ - -#if defined(hp300) || defined(luna68k) -#if defined(hp300) -#include -#else -#include -#endif - -char *defdrives[] = { "sd0", "sd1", "sd2", "rd0", "rd1", "rd2", 0 }; - -int -read_names() -{ - register char *p; - register u_long hp; - static char buf[BUFSIZ]; - struct hp_device hdev; - struct driver hdrv; - char name[10]; - - hp = namelist[X_HPDINIT].n_value; - if (hp == 0) { - (void)fprintf(stderr, - "disk init info not in namelist\n"); - return (0); - } - p = buf; - for (;; hp += sizeof hdev) { - (void)kvm_read(kd, hp, &hdev, sizeof hdev); - if (hdev.hp_driver == 0) - break; - if (hdev.hp_dk < 0 || hdev.hp_alive == 0 || - hdev.hp_cdriver == 0) - continue; - (void)kvm_read(kd, (u_long)hdev.hp_driver, &hdrv, sizeof hdrv); - (void)kvm_read(kd, (u_long)hdrv.d_name, name, sizeof name); - dr_name[hdev.hp_dk] = p; - p += sprintf(p, "%s%d", name, hdev.hp_unit) + 1; - } - return (1); -} -#endif /* hp300 || luna68k */ - -#ifdef tahoe -#include - -char *defdrives[] = { "dk0", "dk1", "dk2", 0 }; - -int -read_names() -{ - register char *p; - struct vba_device udev, *up; - struct vba_driver udrv; - char name[10]; - static char buf[BUFSIZ]; - - up = (struct vba_device *)namelist[X_VBDINIT].n_value; - if (up == 0) { - (void) fprintf(stderr, - "disk init info not in namelist\n"); - return (0); - } - p = buf; - for (;; up += sizeof udev) { - (void)kvm_read(kd, up, &udev, sizeof udev); - if (udev.ui_driver == 0) - break; - if (udev.ui_dk < 0 || udev.ui_alive == 0) - continue; - (void)kvm_read(kd, udev.ui_driver, &udrv, sizeof udrv); - (void)kvm_read(kd, udrv.ud_dname, name, sizeof name); - dr_name[udev.ui_dk] = p; - p += sprintf(p, "%s%d", name, udev.ui_unit); - } - return (1); -} -#endif /* tahoe */ - -#ifdef vax -#include -#include - -char *defdrives[] = { "hp0", "hp1", "hp2", 0 }; - -int -read_names() -{ - register char *p; - unsigned long mp, up; - struct mba_device mdev; - struct mba_driver mdrv; - struct uba_device udev; - struct uba_driver udrv; - char name[10]; - static char buf[BUFSIZ]; - - mp = namelist[X_MBDINIT].n_value; - up = namelist[X_UBDINIT].n_value; - if (mp == 0 && up == 0) { - (void)fprintf(stderr, - "disk init info not in namelist\n"); - return (0); - } - p = buf; - if (mp) - for (;; mp += sizeof mdev) { - (void)kvm_read(kd, mp, &mdev, sizeof mdev); - if (mdev.mi_driver == 0) - break; - if (mdev.mi_dk < 0 || mdev.mi_alive == 0) - continue; - (void)kvm_read(kd, mdev.mi_driver, &mdrv, sizeof mdrv); - (void)kvm_rea(kd, mdrv.md_dname, name, sizeof name); - dr_name[mdev.mi_dk] = p; - p += sprintf(p, "%s%d", name, mdev.mi_unit); - } - if (up) - for (;; up += sizeof udev) { - (void)kvm_read(kd, up, &udev, sizeof udev); - if (udev.ui_driver == 0) - break; - if (udev.ui_dk < 0 || udev.ui_alive == 0) - continue; - (void)kvm_read(kd, udev.ui_driver, &udrv, sizeof udrv); - (void)kvm_read(kd, udrv.ud_dname, name, sizeof name); - dr_name[udev.ui_dk] = p; - p += sprintf(p, "%s%d", name, udev.ui_unit); - } - return (1); -} -#endif /* vax */ - -#ifdef sun -#include - -int -read_names() -{ - static int once = 0; - struct mb_device mdev; - struct mb_driver mdrv; - short two_char; - char *cp = (char *) &two_char; - register struct mb_device *mp; - - mp = (struct mb_device *)namelist[X_MBDINIT].n_value; - if (mp == 0) { - (void)fprintf(stderr, - "disk init info not in namelist\n"); - return (0); - } - for (;; ++mp) { - (void)kvm_read(kd, mp++, &mdev, sizeof(mdev)); - if (mdev.md_driver == 0) - break; - if (mdev.md_dk < 0 || mdev.md_alive == 0) - continue; - (void)kvm_read(kd, mdev.md_driver, &mdrv, sizeof(mdrv)); - (void)kvm_read(kd, mdrv.mdr_dname, &two_char, sizeof(two_char)); - (void)sprintf(dr_name[mdev.md_dk], - "%c%c%d", cp[0], cp[1], mdev.md_unit); - } - return(1); -} -#endif /* sun */ - -#if defined(mips) -#include - -char *defdrives[] = { "rz0", "rz1", "rz2", "rz3", "rz4", "rz5", "rz6", 0 }; - -int -read_names() -{ - register char *p; - register u_long sp; - static char buf[BUFSIZ]; - struct scsi_device sdev; - struct driver hdrv; - char name[10]; - - sp = namelist[X_SCSI_DINIT].n_value; - if (sp == 0) { - (void)fprintf(stderr, "disk init info not in namelist\n"); - return (0); - } - p = buf; - for (;; sp += sizeof sdev) { - (void)kvm_read(kd, sp, &sdev, sizeof sdev); - if (sdev.sd_driver == 0) - break; - if (sdev.sd_dk < 0 || sdev.sd_alive == 0 || - sdev.sd_cdriver == 0) - continue; - (void)kvm_read(kd, (u_long)sdev.sd_driver, &hdrv, sizeof hdrv); - (void)kvm_read(kd, (u_long)hdrv.d_name, name, sizeof name); - dr_name[sdev.sd_dk] = p; - p += sprintf(p, "%s%d", name, sdev.sd_unit) + 1; - } - return (1); -} -#endif /* mips */