[illumos-gate merge]

commit d2f7972d81337947df76c36b8c2a5f290829fa7a
    12167 Update prototypes to 2020
commit b377984a15f854afd6ce777dfe332bac906ff7ba
    12159 truss psflags printing is broken

14 files changed, 20 insertions, 17 deletions

diff --git a/usr/src/cmd/truss/print.c b/usr/src/cmd/truss/print.c
index b0cf21d346..c679988bd5 100644
--- a/usr/src/cmd/truss/print.c
+++ b/usr/src/cmd/truss/print.c
@@ -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 @@ prt_psflags(private_t *pri, secflagset_t val)
 		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);
 }
 
diff --git a/usr/src/prototypes/README b/usr/src/prototypes/README
index 9caa807985..85dfe77bcd 100644
--- a/usr/src/prototypes/README
+++ b/usr/src/prototypes/README
@@ -17,5 +17,5 @@ CDDL version 1.0 for each new file introduced in illumos.
  */
 
 /*
- * Copyright 2019 <contributor>
+ * Copyright 2020 <contributor>
  */
diff --git a/usr/src/prototypes/prototype.Makefile b/usr/src/prototypes/prototype.Makefile
index 1076b28511..76e4c9f402 100644
--- a/usr/src/prototypes/prototype.Makefile
+++ b/usr/src/prototypes/prototype.Makefile
@@ -10,6 +10,6 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.c b/usr/src/prototypes/prototype.c
index c5b0610800..697ca2f594 100644
--- a/usr/src/prototypes/prototype.c
+++ b/usr/src/prototypes/prototype.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2019 <contributor>
+ * Copyright 2020 <contributor>
  */
 
 /*
diff --git a/usr/src/prototypes/prototype.csh b/usr/src/prototypes/prototype.csh
index 8a0b329c85..60fa7f3e8f 100644
--- a/usr/src/prototypes/prototype.csh
+++ b/usr/src/prototypes/prototype.csh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.h b/usr/src/prototypes/prototype.h
index ad13c8d3bc..b92e6aae09 100644
--- a/usr/src/prototypes/prototype.h
+++ b/usr/src/prototypes/prototype.h
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2019 <contributor>
+ * Copyright 2020 <contributor>
  */
 
 #ifndef _PROTOTYPE_H
diff --git a/usr/src/prototypes/prototype.java b/usr/src/prototypes/prototype.java
index fb1244599a..4de4a78a94 100644
--- a/usr/src/prototypes/prototype.java
+++ b/usr/src/prototypes/prototype.java
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2019 <contributor>
+ * Copyright 2020 <contributor>
  */
 
 /*
diff --git a/usr/src/prototypes/prototype.ksh b/usr/src/prototypes/prototype.ksh
index 461f955820..f69153663f 100644
--- a/usr/src/prototypes/prototype.ksh
+++ b/usr/src/prototypes/prototype.ksh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.man b/usr/src/prototypes/prototype.man
index f611dcfa6b..4c5cc3e514 100644
--- a/usr/src/prototypes/prototype.man
+++ b/usr/src/prototypes/prototype.man
@@ -9,5 +9,5 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2019 <contributor>
+.\" Copyright 2020 <contributor>
 .\"
diff --git a/usr/src/prototypes/prototype.mapfile-vers b/usr/src/prototypes/prototype.mapfile-vers
index 3a97d1dffa..08463224c1 100644
--- a/usr/src/prototypes/prototype.mapfile-vers
+++ b/usr/src/prototypes/prototype.mapfile-vers
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.pl b/usr/src/prototypes/prototype.pl
index e010953597..459d961062 100644
--- a/usr/src/prototypes/prototype.pl
+++ b/usr/src/prototypes/prototype.pl
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.py b/usr/src/prototypes/prototype.py
index fcaf1e3fe2..d6240365a5 100644
--- a/usr/src/prototypes/prototype.py
+++ b/usr/src/prototypes/prototype.py
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.s b/usr/src/prototypes/prototype.s
index 00009214db..91ca220507 100644
--- a/usr/src/prototypes/prototype.s
+++ b/usr/src/prototypes/prototype.s
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2019 <contributor>
+ * Copyright 2020 <contributor>
  */
 
 	.file	"prototype.s"
diff --git a/usr/src/prototypes/prototype.sh b/usr/src/prototypes/prototype.sh
index e048830fb2..fae70c599c 100644
--- a/usr/src/prototypes/prototype.sh
+++ b/usr/src/prototypes/prototype.sh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2019 <contributor>
+# Copyright 2020 <contributor>
 #