Mercurial > illumos > git > illumos-joyent

changeset 24447:00b1166f2457

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[illumos-gate merge] commit d2f7972d81337947df76c36b8c2a5f290829fa7a 12167 Update prototypes to 2020 commit b377984a15f854afd6ce777dfe332bac906ff7ba 12159 truss psflags printing is broken
author Jerry Jelinek <jerry.jelinek@joyent.com>
date Wed, 08 Jan 2020 12:49:48 +0000
parents 5dc5f014ce92 (current diff) d472a71bae33 (diff)
children 26e87d5dd27f
files usr/src/cmd/truss/print.c
diffstat 14 files changed, 20 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/truss/print.c	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/cmd/truss/print.c	Wed Jan 08 12:49:48 2020 +0000
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2017, Joyent, Inc. All rights reserved.
+ * Copyright 2020 Joyent, Inc.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -1635,9 +1635,12 @@
 		secflag_clear(&val, PROC_SEC_NOEXECSTACK);
 	}
 
-	len = strlen(str);
-	ptr = str + len;
-	(void) snprintf(ptr, sizeof (str) - len, "|%#x", val);
+	if (val != 0) {
+		len = strlen(str);
+		ptr = str + len;
+		(void) snprintf(ptr, sizeof (str) - len, "|%#x", val);
+	}
+
 	outstring(pri, str + 1);
 }
 
--- a/usr/src/prototypes/README	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/README	Wed Jan 08 12:49:48 2020 +0000
@@ -17,5 +17,5 @@
  */
 
 /*
- * Copyright 2019 <contributor>
+ * Copyright 2020 <contributor>
  */
--- a/usr/src/prototypes/prototype.Makefile	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.Makefile	Wed Jan 08 12:49:48 2020 +0000
@@ -10,6 +10,6 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
--- a/usr/src/prototypes/prototype.c	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.c	Wed Jan 08 12:49:48 2020 +0000
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2019 <contributor>
+ * Copyright 2020 <contributor>
  */
 
 /*
--- a/usr/src/prototypes/prototype.csh	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.csh	Wed Jan 08 12:49:48 2020 +0000
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
--- a/usr/src/prototypes/prototype.h	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.h	Wed Jan 08 12:49:48 2020 +0000
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2019 <contributor>
+ * Copyright 2020 <contributor>
  */
 
 #ifndef _PROTOTYPE_H
--- a/usr/src/prototypes/prototype.java	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.java	Wed Jan 08 12:49:48 2020 +0000
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2019 <contributor>
+ * Copyright 2020 <contributor>
  */
 
 /*
--- a/usr/src/prototypes/prototype.ksh	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.ksh	Wed Jan 08 12:49:48 2020 +0000
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
--- a/usr/src/prototypes/prototype.man	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.man	Wed Jan 08 12:49:48 2020 +0000
@@ -9,5 +9,5 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2019 <contributor>
+.\" Copyright 2020 <contributor>
 .\"
--- a/usr/src/prototypes/prototype.mapfile-vers	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.mapfile-vers	Wed Jan 08 12:49:48 2020 +0000
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
 #
--- a/usr/src/prototypes/prototype.pl	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.pl	Wed Jan 08 12:49:48 2020 +0000
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
 #
--- a/usr/src/prototypes/prototype.py	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.py	Wed Jan 08 12:49:48 2020 +0000
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
 #
--- a/usr/src/prototypes/prototype.s	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.s	Wed Jan 08 12:49:48 2020 +0000
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2019 <contributor>
+ * Copyright 2020 <contributor>
  */
 
 	.file	"prototype.s"
--- a/usr/src/prototypes/prototype.sh	Tue Jan 07 14:06:48 2020 -0700
+++ b/usr/src/prototypes/prototype.sh	Wed Jan 08 12:49:48 2020 +0000
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #