summaryrefslogtreecommitdiff
path: root/dialects/darwin
diff options
context:
space:
mode:
authorJinWang An <jinwang.an@samsung.com>2021-12-28 10:01:55 +0900
committerJinWang An <jinwang.an@samsung.com>2021-12-28 10:01:55 +0900
commit251aa3b4092071250ad7d50333b8846f5e34a997 (patch)
treed4f14f2c27eb25c245e786d856aaac0ff5749b0b /dialects/darwin
parent87a741891d5e52c324ed5d956c04eab8d2714ad8 (diff)
downloadlsof-upstream/4.90.tar.gz
lsof-upstream/4.90.tar.bz2
lsof-upstream/4.90.zip
Imported Upstream version 4.90upstream/4.90
Diffstat (limited to 'dialects/darwin')
-rw-r--r--dialects/darwin/libproc/Makefile2
-rw-r--r--dialects/darwin/libproc/dfile.c8
-rw-r--r--dialects/darwin/libproc/dproc.c6
-rw-r--r--dialects/darwin/libproc/dstore.c2
-rw-r--r--dialects/darwin/libproc/machine.h2
5 files changed, 12 insertions, 8 deletions
diff --git a/dialects/darwin/libproc/Makefile b/dialects/darwin/libproc/Makefile
index 6433004..a3bdc3c 100644
--- a/dialects/darwin/libproc/Makefile
+++ b/dialects/darwin/libproc/Makefile
@@ -1,7 +1,7 @@
# Darwin libproc-based lsof Makefile
#
-# $Id: Makefile,v 1.7 2009/03/25 19:21:37 abe Exp abe $
+# $Id: Makefile,v 1.8 2018/02/14 14:27:57 abe Exp $
PROG= lsof
diff --git a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c
index d7705f6..6b99c66 100644
--- a/dialects/darwin/libproc/dfile.c
+++ b/dialects/darwin/libproc/dfile.c
@@ -36,12 +36,16 @@
#ifndef lint
static char copyright[] =
"@(#) Copyright 2005-2007 Apple Inc. and Purdue Research Foundation.\nAll rights reserved.\n";
-static char *rcsid = "$Id: dfile.c,v 1.8 2012/04/10 16:41:04 abe Exp abe $";
+static char *rcsid = "$Id: dfile.c,v 1.9 2018/02/14 14:27:57 abe Exp $";
#endif
#include "lsof.h"
+#if defined(PROC_FP_GUARDED)
+#extern struct pff_tab Pgf_tab[];
+#endif /* defined(PROC_FP_GUARDED) */
+
/*
* enter_file_info() -- enter file information
@@ -286,7 +290,7 @@ print_nm(lf)
#if defined(PROC_FP_GUARDED)
if (extra > 1)
- putchar(`,');
+ putchar(',');
if (lf->guardflags) {
struct pff_tab *tp;
long gf;
diff --git a/dialects/darwin/libproc/dproc.c b/dialects/darwin/libproc/dproc.c
index e4a2f00..069dc2b 100644
--- a/dialects/darwin/libproc/dproc.c
+++ b/dialects/darwin/libproc/dproc.c
@@ -37,7 +37,7 @@
#ifndef lint
static char copyright[] =
"@(#) Copyright 2005-2007 Apple Inc. and Purdue Research Foundation.\nAll rights reserved.\n";
-static char *rcsid = "$Id: dproc.c,v 1.9 2013/01/02 17:03:05 abe Exp $";
+static char *rcsid = "$Id: dproc.c,v 1.10 2018/02/14 14:27:57 abe Exp $";
#endif
#include "lsof.h"
@@ -221,7 +221,7 @@ gather_proc_info()
* If only ORed process selection options have been specified,
* enable conditional file skipping and socket file only checking.
*/
- if ((Selflags & SELFILE) || !(Selflags & SELPROC))
+ if ((Selflags & SELFILE) || !(Selflags & SelProc))
cckreg = ckscko = 0;
else
cckreg = ckscko = 1;
@@ -338,7 +338,7 @@ gather_proc_info()
* socket file only checking, based on the process' selection
* status.
*/
- ckscko = (sf & SELPROC) ? 0 : 1;
+ ckscko = (sf & SelProc) ? 0 : 1;
}
/*
* Get root and current directory information.
diff --git a/dialects/darwin/libproc/dstore.c b/dialects/darwin/libproc/dstore.c
index 8727181..713070c 100644
--- a/dialects/darwin/libproc/dstore.c
+++ b/dialects/darwin/libproc/dstore.c
@@ -37,7 +37,7 @@
#ifndef lint
static char copyright[] =
"@(#) Copyright 2005 Apple Computer, Inc. and Purdue Research Foundation.\nAll rights reserved.\n";
-static char *rcsid = "$Id: dstore.c,v 1.4 2008/10/21 16:15:16 abe Exp abe $";
+static char *rcsid = "$Id: dstore.c,v 1.5 2018/02/14 14:27:57 abe Exp $";
#endif
diff --git a/dialects/darwin/libproc/machine.h b/dialects/darwin/libproc/machine.h
index 050a49a..9918eb7 100644
--- a/dialects/darwin/libproc/machine.h
+++ b/dialects/darwin/libproc/machine.h
@@ -35,7 +35,7 @@
/*
- * $Id: machine.h,v 1.10 2013/01/02 17:03:05 abe Exp abe $
+ * $Id: machine.h,v 1.11 2018/02/14 14:27:57 abe Exp $
*/