| ps.c (245610) | ps.c (245635) |
|---|---|
| 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 245610 2013-01-18 18:24:40Z jhb $"); | 50__FBSDID("$FreeBSD: head/bin/ps/ps.c 245635 2013-01-19 00:21:55Z jhb $"); |
| 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> --- 1104 unchanged lines hidden (view full) --- 1163 1164static const char * 1165fmt(char **(*fn)(kvm_t *, const struct kinfo_proc *, int), KINFO *ki, 1166 char *comm, char *thread, int maxlen) 1167{ 1168 const char *s; 1169 1170 s = fmt_argv((*fn)(kd, ki->ki_p, termwidth), comm, | 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> --- 1104 unchanged lines hidden (view full) --- 1163 1164static const char * 1165fmt(char **(*fn)(kvm_t *, const struct kinfo_proc *, int), KINFO *ki, 1166 char *comm, char *thread, int maxlen) 1167{ 1168 const char *s; 1169 1170 s = fmt_argv((*fn)(kd, ki->ki_p, termwidth), comm, |
| 1171 ki->ki_p->ki_numthreads > 1 ? thread : NULL, maxlen); | 1171 showthreads && ki->ki_p->ki_numthreads > 1 ? thread : NULL, maxlen); |
| 1172 return (s); 1173} 1174 1175#define UREADOK(ki) (forceuread || (ki->ki_p->ki_flag & P_INMEM)) 1176 1177static void 1178saveuser(KINFO *ki) 1179{ --- 201 unchanged lines hidden --- | 1172 return (s); 1173} 1174 1175#define UREADOK(ki) (forceuread || (ki->ki_p->ki_flag & P_INMEM)) 1176 1177static void 1178saveuser(KINFO *ki) 1179{ --- 201 unchanged lines hidden --- |