Author: pluknet
Date: Mon Feb 27 17:39:34 2012
New Revision: 232233
URL: http://svn.freebsd.org/changeset/base/232233
Log:
Backout r230934 which didn't work with unix sockets and
several filesystem layers mounted at the specified path.
Pointy hat to: pluknet
Modified:
head/usr.bin/fstat/fstat.c
Modified: head/usr.bin/fstat/fstat.c
==============================================================================
--- head/usr.bin/fstat/fstat.c Mon Feb 27 17:33:16 2012 (r232232)
+++ head/usr.bin/fstat/fstat.c Mon Feb 27 17:39:34 2012 (r232233)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <sys/socketvar.h>
#include <sys/sysctl.h>
#include <sys/queue.h>
-#include <sys/un.h>
#include <netinet/in.h>
@@ -225,53 +224,28 @@ static void
print_file_info(struct procstat *procstat, struct filestat *fst,
const char *uname, const char *cmd, int pid)
{
- struct sockstat sock;
struct vnstat vn;
DEVS *d;
const char *filename;
int error, fsmatch = 0;
char errbuf[_POSIX2_LINE_MAX];
- error = 0;
filename = NULL;
if (checkfile != 0) {
- switch (fst->fs_type) {
- case PS_FST_TYPE_VNODE:
- case PS_FST_TYPE_FIFO:
- error = procstat_get_vnode_info(procstat, fst, &vn,
errbuf);
- break;
- case PS_FST_TYPE_SOCKET:
- error = procstat_get_socket_info(procstat, fst, &sock,
errbuf);
- break;
- default:
+ if (fst->fs_type != PS_FST_TYPE_VNODE &&
+ fst->fs_type != PS_FST_TYPE_FIFO)
return;
- }
+ error = procstat_get_vnode_info(procstat, fst, &vn, errbuf);
if (error != 0)
return;
for (d = devs; d != NULL; d = d->next)
- switch (fst->fs_type) {
- case PS_FST_TYPE_VNODE:
- case PS_FST_TYPE_FIFO:
- if (d->fsid == vn.vn_fsid) {
- fsmatch = 1;
- if ((unsigned)d->ino == vn.vn_fileid) {
- filename = d->name;
- break;
- }
- }
- break;
- case PS_FST_TYPE_SOCKET:
- if (sock.dom_family == AF_UNIX) {
- fsmatch = 1;
- if (strcmp(((struct sockaddr_un *)
- (&sock.sa_local))->sun_path,
- d->name) == 0) {
- filename = d->name;
- break;
- }
+ if (d->fsid == vn.vn_fsid) {
+ fsmatch = 1;
+ if ((unsigned)d->ino == vn.vn_fileid) {
+ filename = d->name;
+ break;
}
- break;
}
if (fsmatch == 0 || (filename == NULL && fsflg == 0))
return;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
