Remove lint
This commit is contained in:
christos
parent
9d2eb0ba97
commit
cc7ffa0da4
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: kvm.c,v 1.61 1998/08/10 02:46:06 perry Exp $ */
|
||||
/* $NetBSD: kvm.c,v 1.62 1998/09/27 18:15:58 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1989, 1992, 1993
|
||||
@ -42,7 +42,7 @@
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94";
|
||||
#else
|
||||
__RCSID("$NetBSD: kvm.c,v 1.61 1998/08/10 02:46:06 perry Exp $");
|
||||
__RCSID("$NetBSD: kvm.c,v 1.62 1998/09/27 18:15:58 christos Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
@ -625,7 +625,7 @@ int dumpsize;
|
||||
if (clear_gap(kd, fp, gap) == -1)
|
||||
return (-1);
|
||||
|
||||
return (offset);
|
||||
return (int)offset;
|
||||
}
|
||||
|
||||
kvm_t *
|
||||
@ -713,7 +713,7 @@ kvm_dbopen(kd)
|
||||
kvm_t *kd;
|
||||
{
|
||||
DBT rec;
|
||||
int dbversionlen;
|
||||
size_t dbversionlen;
|
||||
struct nlist nitem;
|
||||
char dbversion[_POSIX2_LINE_MAX];
|
||||
char kversion[_POSIX2_LINE_MAX];
|
||||
@ -744,7 +744,7 @@ kvm_dbopen(kd)
|
||||
goto close;
|
||||
if (rec.data == 0 || rec.size != sizeof(struct nlist))
|
||||
goto close;
|
||||
memcpy((char *)&nitem, (char *)rec.data, sizeof(nitem));
|
||||
memcpy(&nitem, rec.data, sizeof(nitem));
|
||||
if (kvm_read(kd, (u_long)nitem.n_value, kversion, dbversionlen) !=
|
||||
dbversionlen)
|
||||
goto close;
|
||||
@ -810,11 +810,9 @@ kvm_nlist(kd, nl)
|
||||
/*
|
||||
* Avoid alignment issues.
|
||||
*/
|
||||
memcpy((char *)&p->n_type,
|
||||
(char *)&((struct nlist *)rec.data)->n_type,
|
||||
(void)memcpy(&p->n_type, &((struct nlist *)rec.data)->n_type,
|
||||
sizeof(p->n_type));
|
||||
memcpy((char *)&p->n_value,
|
||||
(char *)&((struct nlist *)rec.data)->n_value,
|
||||
(void)memcpy(&p->n_value, &((struct nlist *)rec.data)->n_value,
|
||||
sizeof(p->n_value));
|
||||
}
|
||||
/*
|
||||
@ -845,7 +843,8 @@ kvm_t *kd;
|
||||
|
||||
errno = 0;
|
||||
val = 0;
|
||||
if (pwrite(kd->pmfd, &val, sizeof(val), _kvm_pa2off(kd, pa)) == -1) {
|
||||
if (pwrite(kd->pmfd, (void *) &val, sizeof(val),
|
||||
_kvm_pa2off(kd, pa)) == -1) {
|
||||
_kvm_syserr(kd, 0, "cannot invalidate dump - pwrite");
|
||||
return (-1);
|
||||
}
|
||||
@ -892,7 +891,7 @@ kvm_read(kd, kva, buf, len)
|
||||
cc = len;
|
||||
foff = _kvm_pa2off(kd, pa);
|
||||
errno = 0;
|
||||
cc = pread(kd->pmfd, cp, cc, foff);
|
||||
cc = pread(kd->pmfd, cp, (size_t)cc, foff);
|
||||
if (cc < 0) {
|
||||
_kvm_syserr(kd, kd->program, "kvm_read");
|
||||
break;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: kvm_file.c,v 1.9 1998/02/03 19:12:42 perry Exp $ */
|
||||
/* $NetBSD: kvm_file.c,v 1.10 1998/09/27 18:15:59 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1989, 1992, 1993
|
||||
@ -38,7 +38,7 @@
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)kvm_file.c 8.1 (Berkeley) 6/4/93";
|
||||
#else
|
||||
__RCSID("$NetBSD: kvm_file.c,v 1.9 1998/02/03 19:12:42 perry Exp $");
|
||||
__RCSID("$NetBSD: kvm_file.c,v 1.10 1998/09/27 18:15:59 christos Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
@ -75,7 +75,7 @@ __RCSID("$NetBSD: kvm_file.c,v 1.9 1998/02/03 19:12:42 perry Exp $");
|
||||
#include "kvm_private.h"
|
||||
|
||||
#define KREAD(kd, addr, obj) \
|
||||
(kvm_read(kd, addr, obj, sizeof(*obj)) != sizeof(*obj))
|
||||
(kvm_read(kd, (u_long) addr, obj, sizeof(*obj)) != sizeof(*obj))
|
||||
|
||||
static int
|
||||
kvm_deadfiles __P((kvm_t *, int, int, long, int));
|
||||
@ -83,41 +83,42 @@ kvm_deadfiles __P((kvm_t *, int, int, long, int));
|
||||
/*
|
||||
* Get file structures.
|
||||
*/
|
||||
/*ARGSUSED*/
|
||||
static int
|
||||
kvm_deadfiles(kd, op, arg, filehead_o, nfiles)
|
||||
kvm_deadfiles(kd, op, arg, ofhead, nfiles)
|
||||
kvm_t *kd;
|
||||
int op, arg, nfiles;
|
||||
long filehead_o;
|
||||
long ofhead;
|
||||
{
|
||||
int buflen = kd->arglen, n = 0;
|
||||
struct file *fp;
|
||||
struct filelist filehead;
|
||||
struct filelist fhead;
|
||||
char *where = kd->argspc;
|
||||
|
||||
/*
|
||||
* first copyout filehead
|
||||
*/
|
||||
if (buflen > sizeof (filehead)) {
|
||||
if (KREAD(kd, filehead_o, &filehead)) {
|
||||
if (buflen > sizeof(fhead)) {
|
||||
if (KREAD(kd, ofhead, &fhead)) {
|
||||
_kvm_err(kd, kd->program, "can't read filehead");
|
||||
return (0);
|
||||
}
|
||||
buflen -= sizeof (filehead);
|
||||
where += sizeof (filehead);
|
||||
*(struct filelist *)kd->argspc = filehead;
|
||||
buflen -= sizeof(fhead);
|
||||
where -= sizeof(fhead);
|
||||
(void)memcpy(kd->argspc, &fhead, sizeof(fhead));
|
||||
}
|
||||
/*
|
||||
* followed by an array of file structures
|
||||
*/
|
||||
for (fp = filehead.lh_first; fp != 0; fp = fp->f_list.le_next) {
|
||||
if (buflen > sizeof (struct file)) {
|
||||
if (KREAD(kd, (long)fp, ((struct file *)where))) {
|
||||
for (fp = fhead.lh_first; fp != 0; fp = fp->f_list.le_next) {
|
||||
if (buflen > sizeof(struct file)) {
|
||||
if (KREAD(kd, (long)fp, ((struct file *)(void *)where))) {
|
||||
_kvm_err(kd, kd->program, "can't read kfp");
|
||||
return (0);
|
||||
}
|
||||
buflen -= sizeof (struct file);
|
||||
fp = (struct file *)where;
|
||||
where += sizeof (struct file);
|
||||
buflen -= sizeof(struct file);
|
||||
fp = (struct file *)(void *)where;
|
||||
where -= sizeof(struct file);
|
||||
n++;
|
||||
}
|
||||
}
|
||||
@ -135,9 +136,10 @@ kvm_getfiles(kd, op, arg, cnt)
|
||||
int *cnt;
|
||||
{
|
||||
size_t size;
|
||||
int mib[2], st, nfiles;
|
||||
int mib[2], st;
|
||||
int numfiles;
|
||||
struct file *fp, *fplim;
|
||||
struct filelist filehead;
|
||||
struct filelist fhead;
|
||||
|
||||
if (ISALIVE(kd)) {
|
||||
size = 0;
|
||||
@ -156,21 +158,21 @@ kvm_getfiles(kd, op, arg, cnt)
|
||||
return (0);
|
||||
kd->arglen = size;
|
||||
st = sysctl(mib, 2, kd->argspc, &size, NULL, 0);
|
||||
if (st == -1 || size < sizeof(filehead)) {
|
||||
if (st == -1 || size < sizeof(fhead)) {
|
||||
_kvm_syserr(kd, kd->program, "kvm_getfiles");
|
||||
return (0);
|
||||
}
|
||||
filehead = *(struct filelist *)kd->argspc;
|
||||
fp = (struct file *)(kd->argspc + sizeof (filehead));
|
||||
fplim = (struct file *)(kd->argspc + size);
|
||||
for (nfiles = 0; filehead.lh_first && (fp < fplim);
|
||||
nfiles++, fp++)
|
||||
filehead.lh_first = fp->f_list.le_next;
|
||||
(void)memcpy(&fhead, kd->argspc, sizeof(fhead));
|
||||
fp = (struct file *)(void *)(kd->argspc + sizeof(fhead));
|
||||
fplim = (struct file *)(void *)(kd->argspc + size);
|
||||
for (numfiles = 0; fhead.lh_first && (fp < fplim);
|
||||
numfiles++, fp++)
|
||||
fhead.lh_first = fp->f_list.le_next;
|
||||
} else {
|
||||
struct nlist nl[3], *p;
|
||||
|
||||
nl[0].n_name = "_filehead";
|
||||
nl[1].n_name = "_nfiles";
|
||||
nl[1].n_name = "_numfiles";
|
||||
nl[2].n_name = 0;
|
||||
|
||||
if (kvm_nlist(kd, nl) != 0) {
|
||||
@ -180,11 +182,11 @@ kvm_getfiles(kd, op, arg, cnt)
|
||||
"%s: no such symbol", p->n_name);
|
||||
return (0);
|
||||
}
|
||||
if (KREAD(kd, nl[0].n_value, &nfiles)) {
|
||||
_kvm_err(kd, kd->program, "can't read nfiles");
|
||||
if (KREAD(kd, nl[0].n_value, &numfiles)) {
|
||||
_kvm_err(kd, kd->program, "can't read numfiles");
|
||||
return (0);
|
||||
}
|
||||
size = sizeof(filehead) + (nfiles + 10) * sizeof(struct file);
|
||||
size = sizeof(fhead) + (numfiles + 10) * sizeof(struct file);
|
||||
if (kd->argspc == 0)
|
||||
kd->argspc = (char *)_kvm_malloc(kd, size);
|
||||
else if (kd->arglen < size)
|
||||
@ -192,10 +194,11 @@ kvm_getfiles(kd, op, arg, cnt)
|
||||
if (kd->argspc == 0)
|
||||
return (0);
|
||||
kd->arglen = size;
|
||||
nfiles = kvm_deadfiles(kd, op, arg, nl[1].n_value, nfiles);
|
||||
if (nfiles == 0)
|
||||
numfiles = kvm_deadfiles(kd, op, arg, (long)nl[1].n_value,
|
||||
numfiles);
|
||||
if (numfiles == 0)
|
||||
return (0);
|
||||
}
|
||||
*cnt = nfiles;
|
||||
*cnt = numfiles;
|
||||
return (kd->argspc);
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: kvm_getloadavg.c,v 1.4 1997/08/15 02:21:58 mikel Exp $ */
|
||||
/* $NetBSD: kvm_getloadavg.c,v 1.5 1998/09/27 18:15:59 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1993
|
||||
@ -38,7 +38,7 @@
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)kvm_getloadavg.c 8.1 (Berkeley) 6/4/93";
|
||||
#else
|
||||
__RCSID("$NetBSD: kvm_getloadavg.c,v 1.4 1997/08/15 02:21:58 mikel Exp $");
|
||||
__RCSID("$NetBSD: kvm_getloadavg.c,v 1.5 1998/09/27 18:15:59 christos Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
@ -93,7 +93,7 @@ kvm_getloadavg(kd, loadavg, nelem)
|
||||
}
|
||||
|
||||
#define KREAD(kd, addr, obj) \
|
||||
(kvm_read(kd, addr, (char *)(obj), sizeof(*obj)) != sizeof(*obj))
|
||||
(kvm_read(kd, addr, (void *)(obj), sizeof(*obj)) != sizeof(*obj))
|
||||
if (KREAD(kd, nl[X_AVERUNNABLE].n_value, &loadinfo)) {
|
||||
_kvm_err(kd, kd->program, "can't read averunnable");
|
||||
return (-1);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: kvm_i386.c,v 1.13 1998/06/30 20:29:39 thorpej Exp $ */
|
||||
/* $NetBSD: kvm_i386.c,v 1.14 1998/09/27 18:16:00 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1989, 1992, 1993
|
||||
@ -42,7 +42,7 @@
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
|
||||
#else
|
||||
__RCSID("$NetBSD: kvm_i386.c,v 1.13 1998/06/30 20:29:39 thorpej Exp $");
|
||||
__RCSID("$NetBSD: kvm_i386.c,v 1.14 1998/09/27 18:16:00 christos Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
@ -86,6 +86,7 @@ _kvm_freevtop(kd)
|
||||
free(kd->vmst);
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
int
|
||||
_kvm_initvtop(kd)
|
||||
kvm_t *kd;
|
||||
@ -104,7 +105,7 @@ _kvm_kvatop(kd, va, pa)
|
||||
u_long *pa;
|
||||
{
|
||||
cpu_kcore_hdr_t *cpu_kh;
|
||||
int page_off;
|
||||
u_long page_off;
|
||||
pd_entry_t pde;
|
||||
pt_entry_t pte;
|
||||
u_long pde_pa, pte_pa;
|
||||
@ -121,8 +122,8 @@ _kvm_kvatop(kd, va, pa)
|
||||
* Find and read the page directory entry.
|
||||
*/
|
||||
pde_pa = cpu_kh->ptdpaddr + (pdei(va) * sizeof(pd_entry_t));
|
||||
if (pread(kd->pmfd, &pde, sizeof(pde), _kvm_pa2off(kd, pde_pa)) !=
|
||||
sizeof(pde)) {
|
||||
if (pread(kd->pmfd, (void *)&pde, sizeof(pde),
|
||||
_kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
|
||||
_kvm_syserr(kd, 0, "could not read PDE");
|
||||
goto lose;
|
||||
}
|
||||
@ -135,8 +136,8 @@ _kvm_kvatop(kd, va, pa)
|
||||
goto lose;
|
||||
}
|
||||
pte_pa = (pde & PG_FRAME) + (ptei(va) * sizeof(pt_entry_t));
|
||||
if (pread(kd->pmfd, &pte, sizeof(pte), _kvm_pa2off(kd, pte_pa)) !=
|
||||
sizeof(pte)) {
|
||||
if (pread(kd->pmfd, (void *) &pte, sizeof(pte),
|
||||
_kvm_pa2off(kd, pte_pa)) != sizeof(pte)) {
|
||||
_kvm_syserr(kd, 0, "could not read PTE");
|
||||
goto lose;
|
||||
}
|
||||
@ -149,10 +150,10 @@ _kvm_kvatop(kd, va, pa)
|
||||
goto lose;
|
||||
}
|
||||
*pa = (pte & PG_FRAME) + page_off;
|
||||
return (NBPG - page_off);
|
||||
return (int)(NBPG - page_off);
|
||||
|
||||
lose:
|
||||
*pa = -1;
|
||||
*pa = (u_long)~0L;
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -170,7 +171,7 @@ _kvm_pa2off(kd, pa)
|
||||
int i;
|
||||
|
||||
cpu_kh = kd->cpu_data;
|
||||
ramsegs = (phys_ram_seg_t *)((char *)cpu_kh + ALIGN(sizeof *cpu_kh));
|
||||
ramsegs = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh));
|
||||
|
||||
off = 0;
|
||||
for (i = 0; i < cpu_kh->nmemsegs; i++) {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: kvm_proc.c,v 1.27 1998/09/09 00:31:25 thorpej Exp $ */
|
||||
/* $NetBSD: kvm_proc.c,v 1.28 1998/09/27 18:16:00 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
@ -78,7 +78,7 @@
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93";
|
||||
#else
|
||||
__RCSID("$NetBSD: kvm_proc.c,v 1.27 1998/09/09 00:31:25 thorpej Exp $");
|
||||
__RCSID("$NetBSD: kvm_proc.c,v 1.28 1998/09/27 18:16:00 christos Exp $");
|
||||
#endif
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
@ -119,7 +119,7 @@ __RCSID("$NetBSD: kvm_proc.c,v 1.27 1998/09/09 00:31:25 thorpej Exp $");
|
||||
#include "kvm_private.h"
|
||||
|
||||
#define KREAD(kd, addr, obj) \
|
||||
(kvm_read(kd, addr, (char *)(obj), sizeof(*obj)) != sizeof(*obj))
|
||||
(kvm_read(kd, addr, (void *)(obj), sizeof(*obj)) != sizeof(*obj))
|
||||
|
||||
char *_kvm_uread __P((kvm_t *, const struct proc *, u_long, u_long *));
|
||||
#if !defined(UVM)
|
||||
@ -149,6 +149,7 @@ _kvm_uread(kd, p, va, cnt)
|
||||
u_long va;
|
||||
u_long *cnt;
|
||||
{
|
||||
int true = 1;
|
||||
u_long addr, head;
|
||||
u_long offset;
|
||||
struct vm_map_entry vme;
|
||||
@ -156,14 +157,14 @@ _kvm_uread(kd, p, va, cnt)
|
||||
struct vm_amap amap;
|
||||
struct vm_anon *anonp, anon;
|
||||
struct vm_page pg;
|
||||
int slot;
|
||||
u_long slot;
|
||||
#else
|
||||
struct vm_object vmo;
|
||||
int rv;
|
||||
#endif
|
||||
|
||||
if (kd->swapspc == 0) {
|
||||
kd->swapspc = (char *)_kvm_malloc(kd, kd->nbpg);
|
||||
kd->swapspc = (char *)_kvm_malloc(kd, (size_t)kd->nbpg);
|
||||
if (kd->swapspc == 0)
|
||||
return (0);
|
||||
}
|
||||
@ -175,7 +176,7 @@ _kvm_uread(kd, p, va, cnt)
|
||||
*/
|
||||
head = (u_long)&p->p_vmspace->vm_map.header;
|
||||
addr = head;
|
||||
while (1) {
|
||||
while (true) {
|
||||
if (KREAD(kd, addr, &vme))
|
||||
return (0);
|
||||
|
||||
@ -226,12 +227,12 @@ _kvm_uread(kd, p, va, cnt)
|
||||
if (KREAD(kd, addr, &pg))
|
||||
return NULL;
|
||||
|
||||
if (pread(kd->pmfd, kd->swapspc, kd->nbpg,
|
||||
if (pread(kd->pmfd, (void *)kd->swapspc, (size_t)kd->nbpg,
|
||||
(off_t)pg.phys_addr) != kd->nbpg)
|
||||
return NULL;
|
||||
}
|
||||
else {
|
||||
if (pread(kd->swfd, kd->swapspc, kd->nbpg,
|
||||
if (pread(kd->swfd, (void *)kd->swapspc, (size_t)kd->nbpg,
|
||||
(off_t)(anon.an_swslot * kd->nbpg)) != kd->nbpg)
|
||||
return NULL;
|
||||
}
|
||||
@ -269,7 +270,7 @@ _kvm_uread(kd, p, va, cnt)
|
||||
/* Found the page. */
|
||||
offset %= kd->nbpg;
|
||||
*cnt = kd->nbpg - offset;
|
||||
return (&kd->swapspc[offset]);
|
||||
return (&kd->swapspc[(size_t)offset]);
|
||||
}
|
||||
|
||||
#if !defined(UVM)
|
||||
@ -443,8 +444,12 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt)
|
||||
return (-1);
|
||||
}
|
||||
if (KREAD(kd, (u_long)proc.p_cred, &eproc.e_pcred) == 0)
|
||||
(void)KREAD(kd, (u_long)eproc.e_pcred.pc_ucred,
|
||||
&eproc.e_ucred);
|
||||
if (KREAD(kd, (u_long)eproc.e_pcred.pc_ucred,
|
||||
&eproc.e_ucred)) {
|
||||
_kvm_err(kd, kd->program,
|
||||
"can't read proc credentials at %x", p);
|
||||
return -1;
|
||||
}
|
||||
|
||||
switch(what) {
|
||||
|
||||
@ -517,7 +522,7 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt)
|
||||
eproc.e_wmesg, WMESGLEN);
|
||||
|
||||
(void)kvm_read(kd, (u_long)proc.p_vmspace,
|
||||
(char *)&eproc.e_vm, sizeof(eproc.e_vm));
|
||||
(void *)&eproc.e_vm, sizeof(eproc.e_vm));
|
||||
|
||||
eproc.e_xsize = eproc.e_xrssize = 0;
|
||||
eproc.e_xccount = eproc.e_xswrss = 0;
|
||||
@ -710,8 +715,9 @@ kvm_argv(kd, p, addr, narg, maxcnt)
|
||||
int maxcnt;
|
||||
{
|
||||
char *np, *cp, *ep, *ap;
|
||||
u_long oaddr = -1;
|
||||
int len, cc;
|
||||
u_long oaddr = (u_long)~0L;
|
||||
u_long len;
|
||||
size_t cc;
|
||||
char **argv;
|
||||
|
||||
/*
|
||||
@ -738,18 +744,18 @@ kvm_argv(kd, p, addr, narg, maxcnt)
|
||||
return (0);
|
||||
}
|
||||
if (kd->argspc == 0) {
|
||||
kd->argspc = (char *)_kvm_malloc(kd, kd->nbpg);
|
||||
kd->argspc = (char *)_kvm_malloc(kd, (size_t)kd->nbpg);
|
||||
if (kd->argspc == 0)
|
||||
return (0);
|
||||
kd->arglen = kd->nbpg;
|
||||
}
|
||||
if (kd->argbuf == 0) {
|
||||
kd->argbuf = (char *)_kvm_malloc(kd, kd->nbpg);
|
||||
kd->argbuf = (char *)_kvm_malloc(kd, (size_t)kd->nbpg);
|
||||
if (kd->argbuf == 0)
|
||||
return (0);
|
||||
}
|
||||
cc = sizeof(char *) * narg;
|
||||
if (kvm_uread(kd, p, addr, (char *)kd->argv, cc) != cc)
|
||||
if (kvm_uread(kd, p, addr, (void *)kd->argv, cc) != cc)
|
||||
return (0);
|
||||
ap = np = kd->argspc;
|
||||
argv = kd->argv;
|
||||
@ -760,16 +766,16 @@ kvm_argv(kd, p, addr, narg, maxcnt)
|
||||
while (argv < kd->argv + narg && *argv != 0) {
|
||||
addr = (u_long)*argv & ~(kd->nbpg - 1);
|
||||
if (addr != oaddr) {
|
||||
if (kvm_uread(kd, p, addr, kd->argbuf, kd->nbpg) !=
|
||||
kd->nbpg)
|
||||
if (kvm_uread(kd, p, addr, kd->argbuf,
|
||||
(size_t)kd->nbpg) != kd->nbpg)
|
||||
return (0);
|
||||
oaddr = addr;
|
||||
}
|
||||
addr = (u_long)*argv & (kd->nbpg - 1);
|
||||
cp = kd->argbuf + addr;
|
||||
cc = kd->nbpg - addr;
|
||||
if (maxcnt > 0 && cc > maxcnt - len)
|
||||
cc = maxcnt - len;;
|
||||
cp = kd->argbuf + (size_t)addr;
|
||||
cc = kd->nbpg - (size_t)addr;
|
||||
if (maxcnt > 0 && cc > (size_t)(maxcnt - len))
|
||||
cc = (size_t)(maxcnt - len);
|
||||
ep = memchr(cp, '\0', cc);
|
||||
if (ep != 0)
|
||||
cc = ep - cp + 1;
|
||||
@ -780,7 +786,7 @@ kvm_argv(kd, p, addr, narg, maxcnt)
|
||||
|
||||
kd->arglen *= 2;
|
||||
kd->argspc = (char *)_kvm_realloc(kd, kd->argspc,
|
||||
kd->arglen);
|
||||
(size_t)kd->arglen);
|
||||
if (kd->argspc == 0)
|
||||
return (0);
|
||||
/*
|
||||
@ -855,7 +861,7 @@ proc_verify(kd, kernp, p)
|
||||
* Just read in the whole proc. It's not that big relative
|
||||
* to the cost of the read system call.
|
||||
*/
|
||||
if (kvm_read(kd, kernp, (char *)&kernproc, sizeof(kernproc)) !=
|
||||
if (kvm_read(kd, kernp, (void *)&kernproc, sizeof(kernproc)) !=
|
||||
sizeof(kernproc))
|
||||
return (0);
|
||||
return (p->p_pid == kernproc.p_pid &&
|
||||
@ -881,7 +887,7 @@ kvm_doargv(kd, kp, nchr, info)
|
||||
if (p->p_stat == SZOMB)
|
||||
return (0);
|
||||
cnt = kvm_uread(kd, p, kd->usrstack - sizeof(arginfo),
|
||||
(char *)&arginfo, sizeof(arginfo));
|
||||
(void *)&arginfo, sizeof(arginfo));
|
||||
if (cnt != sizeof(arginfo))
|
||||
return (0);
|
||||
|
||||
@ -934,7 +940,7 @@ kvm_uread(kd, p, uva, buf, len)
|
||||
|
||||
cp = buf;
|
||||
while (len > 0) {
|
||||
int cc;
|
||||
size_t cc;
|
||||
char *dp;
|
||||
u_long cnt;
|
||||
|
||||
@ -943,9 +949,8 @@ kvm_uread(kd, p, uva, buf, len)
|
||||
_kvm_err(kd, 0, "invalid address (%x)", uva);
|
||||
return (0);
|
||||
}
|
||||
cc = MIN(cnt, len);
|
||||
cc = (size_t)MIN(cnt, len);
|
||||
memcpy(cp, dp, cc);
|
||||
|
||||
cp += cc;
|
||||
uva += cc;
|
||||
len -= cc;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user