| ps.c (141578) | ps.c (172207) |
|---|---|
| 1/*- 2 * Copyright (c) 1990, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 33 unchanged lines hidden (view full) --- 42 43#if 0 44#ifndef lint 45static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94"; 46#endif /* not lint */ 47#endif 48 49#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1990, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 33 unchanged lines hidden (view full) --- 42 43#if 0 44#ifndef lint 45static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94"; 46#endif /* not lint */ 47#endif 48 49#include <sys/cdefs.h> |
| 50__FBSDID("$FreeBSD: head/bin/ps/ps.c 141578 2005-02-09 17:37:39Z ru $"); | 50__FBSDID("$FreeBSD: head/bin/ps/ps.c 172207 2007-09-17 05:31:39Z jeff $"); |
| 51 52#include <sys/param.h> 53#include <sys/proc.h> 54#include <sys/user.h> 55#include <sys/stat.h> 56#include <sys/ioctl.h> 57#include <sys/sysctl.h> 58#include <sys/mount.h> --- 930 unchanged lines hidden (view full) --- 989 char *comm, int maxlen) 990{ 991 const char *s; 992 993 s = fmt_argv((*fn)(kd, ki->ki_p, termwidth), comm, maxlen); 994 return (s); 995} 996 | 51 52#include <sys/param.h> 53#include <sys/proc.h> 54#include <sys/user.h> 55#include <sys/stat.h> 56#include <sys/ioctl.h> 57#include <sys/sysctl.h> 58#include <sys/mount.h> --- 930 unchanged lines hidden (view full) --- 989 char *comm, int maxlen) 990{ 991 const char *s; 992 993 s = fmt_argv((*fn)(kd, ki->ki_p, termwidth), comm, maxlen); 994 return (s); 995} 996 |
| 997#define UREADOK(ki) (forceuread || (ki->ki_p->ki_sflag & PS_INMEM)) | 997#define UREADOK(ki) (forceuread || (ki->ki_p->ki_flag & P_INMEM)) |
| 998 999static void 1000saveuser(KINFO *ki) 1001{ 1002 | 998 999static void 1000saveuser(KINFO *ki) 1001{ 1002 |
| 1003 if (ki->ki_p->ki_sflag & PS_INMEM) { | 1003 if (ki->ki_p->ki_flag & P_INMEM) { |
| 1004 /* 1005 * The u-area might be swapped out, and we can't get 1006 * at it because we have a crashdump and no swap. 1007 * If it's here fill in these fields, otherwise, just 1008 * leave them 0. 1009 */ 1010 ki->ki_valid = 1; 1011 } else --- 191 unchanged lines hidden --- | 1004 /* 1005 * The u-area might be swapped out, and we can't get 1006 * at it because we have a crashdump and no swap. 1007 * If it's here fill in these fields, otherwise, just 1008 * leave them 0. 1009 */ 1010 ki->ki_valid = 1; 1011 } else --- 191 unchanged lines hidden --- |