From owner-svn-src-projects@FreeBSD.ORG Sat Aug 1 13:58:49 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44330106566C; Sat, 1 Aug 2009 13:58:48 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 44E938FC20; Sat, 1 Aug 2009 13:58:48 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n71DwkFo082983; Sat, 1 Aug 2009 13:58:46 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n71DwksK082980; Sat, 1 Aug 2009 13:58:46 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <200908011358.n71DwksK082980@svn.freebsd.org> From: Stanislav Sedov Date: Sat, 1 Aug 2009 13:58:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196016 - projects/libprocstat/usr.bin/fstat X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Aug 2009 13:58:49 -0000 Author: stas Date: Sat Aug 1 13:58:46 2009 New Revision: 196016 URL: http://svn.freebsd.org/changeset/base/196016 Log: - Improve error handling. - Handly ctty case in fstat. Modified: projects/libprocstat/usr.bin/fstat/fstat.c projects/libprocstat/usr.bin/fstat/libprocstat.c Modified: projects/libprocstat/usr.bin/fstat/fstat.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/fstat.c Sat Aug 1 12:51:16 2009 (r196015) +++ projects/libprocstat/usr.bin/fstat/fstat.c Sat Aug 1 13:58:46 2009 (r196016) @@ -267,6 +267,8 @@ print_file_info(struct procstat *procsta printf(" mmap"); else if (fst->fs_uflags & PS_FST_UFLAG_JAIL) printf(" jail"); + else if (fst->fs_uflags & PS_FST_UFLAG_CTTY) + printf(" ctty"); else printf(" %4d", fst->fs_fd); Modified: projects/libprocstat/usr.bin/fstat/libprocstat.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/libprocstat.c Sat Aug 1 12:51:16 2009 (r196015) +++ projects/libprocstat/usr.bin/fstat/libprocstat.c Sat Aug 1 13:58:46 2009 (r196016) @@ -232,6 +232,7 @@ procstat_freeprocs(struct procstat *proc if (p != NULL) free(p); + p = NULL; } struct filestat_list * @@ -254,10 +255,14 @@ procstat_freefiles(struct procstat *proc STAILQ_FOREACH_SAFE(fst, head, next, tmp) free(fst); free(head); - if (procstat->vmentries != NULL) + if (procstat->vmentries != NULL) { free (procstat->vmentries); - if (procstat->files != NULL) + procstat->vmentries = NULL; + } + if (procstat->files != NULL) { free (procstat->files); + procstat->files = NULL; + } } static struct filestat * @@ -931,7 +936,7 @@ kinfo_vtype2fst(int kfvtype) static int procstat_get_vnode_info_sysctl(struct filestat *fst, struct vnstat *vn, - char *errbuf __unused) + char *errbuf) { struct statfs stbuf; struct kinfo_file *kif; @@ -972,9 +977,12 @@ procstat_get_vnode_info_sysctl(struct fi status = kif->kf_status; } vn->vn_type = vntype; - if (vntype == PS_FST_VTYPE_VNON || vntype == PS_FST_VTYPE_VBAD || - (status & KF_ATTR_VALID) == 0) + if (vntype == PS_FST_VTYPE_VNON || vntype == PS_FST_VTYPE_VBAD) return (0); + if ((status & KF_ATTR_VALID) == 0) { + snprintf(errbuf, _POSIX2_LINE_MAX, "? (no info available)"); + return (1); + } if (path && *path) { statfs(path, &stbuf); vn->vn_mntdir = strdup(stbuf.f_mntonname);