Code for release 6.70

One primary change is to add -e option to replace comments with empty
comments, either /* */ or // (with nothing after it except the newline).
This makes some forms of analysis easier (and also means there isn't
trailing blanks in the output unless there were trailing blanks in the
input.

The other primary change affects the output from -c (print comments
instead of code); newlines are preserved in appropriate locations, so
that comments on separate lines are printed on separate lines.  This makes
the output easier to read.

One minor change is that the 'feature' names were changed and made more
systematic.

Output/makefile

@@ -1,4 +1,4 @@
-# @(#)$Id: makefile,v 1.4 2016/06/13 04:06:50 jleffler Exp $
+# @(#)$Id: makefile,v 1.5 2017/10/18 05:56:33 jleffler Exp $
 #
 # Makefile for SCC test output directory
 
@@ -103,6 +103,12 @@ FILES = \
 	scc-test.ucns-c90.2 \
 	scc-test.ucns-c99.1 \
 	scc-test.ucns-c99.2 \
+	scc.test-08.example2-e.1 \
+	scc.test-08.example2-e.2 \
+	scc.test-08.example2-ec.1 \
+	scc.test-08.example2-ec.2 \
+	scc.test-08.example2-en.1 \
+	scc.test-08.example2-en.2 \
 
 all:	${FILES}
 

Output/scc-test.example2-c++98-c-n.1

@@ -5,7 +5,7 @@
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 6.60 (2016-06-12)
+@(#)Product:        SCC Version 6.70 (2017-10-17)
 */
 
 /* Mainly for testing */

Output/scc-test.example2-c++98-c.1

@@ -1,9 +1,18 @@
 /*
 @(#)File:           $RCSfile: scc-test.example2-c++98-c.1,v $
-@(#)Version:        $Revision: 1.1 $
-@(#)Last changed:   $Date: 2016/05/22 19:39:46 $
+@(#)Version:        $Revision: 1.2 $
+@(#)Last changed:   $Date: 2017/10/18 06:38:59 $
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 6.60 (2016-06-12)
-*//* Mainly for testing *//* Retained comments */// C++ style comments// The newline is part of the comment.// The newline should be printed.// The newline should probably still be printed?/* C style *//* or functions *//*EOF*/
+@(#)Product:        SCC Version 6.70 (2017-10-17)
+*/
+/* Mainly for testing */
+/* Retained comments */
+// C++ style comments
+// The newline is part of the comment.
+// The newline should be printed.
+// The newline should probably still be printed?
+/* C style */
+/* or functions */
+/*EOF*/

Output/scc-test.example2-c90-c-n.1

@@ -5,7 +5,7 @@
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 6.60 (2016-06-12)
+@(#)Product:        SCC Version 6.70 (2017-10-17)
 */
 
 /* Mainly for testing */

Output/scc-test.example2-c90-c-n.2

@@ -1,4 +1,4 @@
-scc: scc-test.example2.c:13: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:14: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:15: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:16: Double slash comment used but not supported in C90
+scc: scc-test.example2.c:13: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:14: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:15: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:16: Double slash comment feature used but not supported in C90

Output/scc-test.example2-c90-c.1

@@ -1,9 +1,14 @@
 /*
 @(#)File:           $RCSfile: scc-test.example2-c90-c.1,v $
-@(#)Version:        $Revision: 1.1 $
-@(#)Last changed:   $Date: 2016/05/22 19:39:46 $
+@(#)Version:        $Revision: 1.2 $
+@(#)Last changed:   $Date: 2017/10/18 06:38:59 $
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 6.60 (2016-06-12)
-*//* Mainly for testing *//* Retained comments *//* C style *//* or functions *//*EOF*/
+@(#)Product:        SCC Version 6.70 (2017-10-17)
+*/
+/* Mainly for testing */
+/* Retained comments */
+/* C style */
+/* or functions */
+/*EOF*/

Output/scc-test.example2-c90-c.2

@@ -1,4 +1,4 @@
-scc: scc-test.example2.c:13: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:14: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:15: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:16: Double slash comment used but not supported in C90
+scc: scc-test.example2.c:13: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:14: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:15: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:16: Double slash comment feature used but not supported in C90

Output/scc-test.example2-c90-n.2

@@ -1,4 +1,4 @@
-scc: scc-test.example2.c:13: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:14: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:15: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:16: Double slash comment used but not supported in C90
+scc: scc-test.example2.c:13: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:14: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:15: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:16: Double slash comment feature used but not supported in C90

Output/scc-test.example2-c90.2

@@ -1,4 +1,4 @@
-scc: scc-test.example2.c:13: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:14: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:15: Double slash comment used but not supported in C90
-scc: scc-test.example2.c:16: Double slash comment used but not supported in C90
+scc: scc-test.example2.c:13: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:14: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:15: Double slash comment feature used but not supported in C90
+scc: scc-test.example2.c:16: Double slash comment feature used but not supported in C90

Output/scc-test.example2-c99-c-n.1

@@ -5,7 +5,7 @@
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 6.60 (2016-06-12)
+@(#)Product:        SCC Version 6.70 (2017-10-17)
 */
 
 /* Mainly for testing */

Output/scc-test.example2-c99-c.1

@@ -1,9 +1,18 @@
 /*
 @(#)File:           $RCSfile: scc-test.example2-c99-c.1,v $
-@(#)Version:        $Revision: 1.1 $
-@(#)Last changed:   $Date: 2016/05/22 19:39:46 $
+@(#)Version:        $Revision: 1.2 $
+@(#)Last changed:   $Date: 2017/10/18 06:38:59 $
 @(#)Purpose:        Test SCC on core functionality
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
-@(#)Product:        SCC Version 6.60 (2016-06-12)
-*//* Mainly for testing *//* Retained comments */// C++ style comments// The newline is part of the comment.// The newline should be printed.// The newline should probably still be printed?/* C style *//* or functions *//*EOF*/
+@(#)Product:        SCC Version 6.70 (2017-10-17)
+*/
+/* Mainly for testing */
+/* Retained comments */
+// C++ style comments
+// The newline is part of the comment.
+// The newline should be printed.
+// The newline should probably still be printed?
+/* C style */
+/* or functions */
+/*EOF*/

Output/scc-test.example3-c++98.2

@@ -1,2 +1,2 @@
-scc: scc-test.example3.c:21: Unicode feature used but not supported in C++98
-scc: scc-test.example3.c:22: Unicode feature used but not supported in C++98
+scc: scc-test.example3.c:21: Unicode character or string feature used but not supported in C++98
+scc: scc-test.example3.c:22: Unicode character or string feature used but not supported in C++98

Output/scc-test.example3-c90.2

@@ -1,3 +1,3 @@
-scc: scc-test.example3.c:12: Double slash comment used but not supported in C90
-scc: scc-test.example3.c:21: Unicode feature used but not supported in C90
-scc: scc-test.example3.c:22: Unicode feature used but not supported in C90
+scc: scc-test.example3.c:12: Double slash comment feature used but not supported in C90
+scc: scc-test.example3.c:21: Unicode character or string feature used but not supported in C90
+scc: scc-test.example3.c:22: Unicode character or string feature used but not supported in C90

Output/scc-test.example3-c99.2

@@ -1,2 +1,2 @@
-scc: scc-test.example3.c:21: Unicode feature used but not supported in C99
-scc: scc-test.example3.c:22: Unicode feature used but not supported in C99
+scc: scc-test.example3.c:21: Unicode character or string feature used but not supported in C99
+scc: scc-test.example3.c:22: Unicode character or string feature used but not supported in C99

Output/scc-test.numpunct-c++11.2

@@ -1,9 +1,9 @@
 scc: scc-test.numpunct.cpp:11: Numeric punctuation feature used but not supported in C++11
 scc: scc-test.numpunct.cpp:11: Numeric punctuation feature used but not supported in C++11
-scc: scc-test.numpunct.cpp:11: Hexadecimal floating point constant used but not supported in C++11
+scc: scc-test.numpunct.cpp:11: Hexadecimal floating point constant feature used but not supported in C++11
 scc: scc-test.numpunct.cpp:12: Numeric punctuation feature used but not supported in C++11
 scc: scc-test.numpunct.cpp:12: Numeric punctuation feature used but not supported in C++11
-scc: scc-test.numpunct.cpp:12: Hexadecimal floating point constant used but not supported in C++11
+scc: scc-test.numpunct.cpp:12: Hexadecimal floating point constant feature used but not supported in C++11
 scc: scc-test.numpunct.cpp:13: Binary literal feature used but not supported in C++11
 scc: scc-test.numpunct.cpp:13: Numeric punctuation feature used but not supported in C++11
 scc: scc-test.numpunct.cpp:14: Binary literal feature used but not supported in C++11

Output/scc-test.numpunct-c++14.2

@@ -1,2 +1,2 @@
-scc: scc-test.numpunct.cpp:11: Hexadecimal floating point constant used but not supported in C++14
-scc: scc-test.numpunct.cpp:12: Hexadecimal floating point constant used but not supported in C++14
+scc: scc-test.numpunct.cpp:11: Hexadecimal floating point constant feature used but not supported in C++14
+scc: scc-test.numpunct.cpp:12: Hexadecimal floating point constant feature used but not supported in C++14

Output/scc-test.rawstring-c11.2

@@ -1,15 +1,15 @@
-scc: scc-test.rawstring.cpp:34: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:37: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:38: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:40: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:42: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:44: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:46: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:51: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:154: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:162: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:167: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:169: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:176: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:177: Raw string used but not supported in C11
-scc: scc-test.rawstring.cpp:179: Raw string used but not supported in C11
+scc: scc-test.rawstring.cpp:34: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:37: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:38: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:40: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:42: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:44: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:46: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:51: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:154: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:162: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:167: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:169: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:176: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:177: Raw string feature used but not supported in C11
+scc: scc-test.rawstring.cpp:179: Raw string feature used but not supported in C11

Output/scc-test.ucns-c90.2

@@ -1,23 +1,23 @@
-scc: scc-test.ucns.c:33: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:37: Universal character names feature used but not supported in C90
-scc: scc-test.ucns.c:38: Universal character names feature used but not supported in C90
-scc: scc-test.ucns.c:39: Universal character names feature used but not supported in C90
-scc: scc-test.ucns.c:72: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:94: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:95: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:96: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:101: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:106: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:111: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:124: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:141: Universal character names feature used but not supported in C90
-scc: scc-test.ucns.c:142: Universal character names feature used but not supported in C90
-scc: scc-test.ucns.c:142: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:143: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:143: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:144: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:144: Universal character names feature used but not supported in C90
-scc: scc-test.ucns.c:144: Double slash comment used but not supported in C90
-scc: scc-test.ucns.c:145: Universal character names feature used but not supported in C90
-scc: scc-test.ucns.c:146: Universal character names feature used but not supported in C90
-scc: scc-test.ucns.c:147: Universal character names feature used but not supported in C90
+scc: scc-test.ucns.c:33: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:37: Universal character name feature used but not supported in C90
+scc: scc-test.ucns.c:38: Universal character name feature used but not supported in C90
+scc: scc-test.ucns.c:39: Universal character name feature used but not supported in C90
+scc: scc-test.ucns.c:72: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:94: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:95: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:96: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:101: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:106: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:111: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:124: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:141: Universal character name feature used but not supported in C90
+scc: scc-test.ucns.c:142: Universal character name feature used but not supported in C90
+scc: scc-test.ucns.c:142: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:143: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:143: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:144: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:144: Universal character name feature used but not supported in C90
+scc: scc-test.ucns.c:144: Double slash comment feature used but not supported in C90
+scc: scc-test.ucns.c:145: Universal character name feature used but not supported in C90
+scc: scc-test.ucns.c:146: Universal character name feature used but not supported in C90
+scc: scc-test.ucns.c:147: Universal character name feature used but not supported in C90

Output/scc.test-08.example2-e.1

@@ -0,0 +1,14 @@
+/* */
+
+/* */
+/* */
+Including trailing //
+What is the correct behaviour?  //
+//
+And with comment stripping?  //
+So that this text appears on a separate line from the question.
+And what about newlines and /* */ comments when they are retained?
+Perhaps a newline should be generated when the line had a comment on it somewhere?
+Which function /* */ controls this?
+
+/* */

Output/scc.test-08.example2-ec.1

@@ -0,0 +1,18 @@
+/*
+@(#)File:           $RCSfile: scc.test-08.example2-ec.1,v $
+@(#)Version:        $Revision: 1.2 $
+@(#)Last changed:   $Date: 2017/10/18 06:38:59 $
+@(#)Purpose:        Test SCC on core functionality
+@(#)Author:         J Leffler
+@(#)Copyright:      (C) JLSS 1997,2003,2007,2013-15
+@(#)Product:        SCC Version 6.70 (2017-10-17)
+*/
+/* Mainly for testing */
+/* Retained comments */
+// C++ style comments
+// The newline is part of the comment.
+// The newline should be printed.
+// The newline should probably still be printed?
+/* C style */
+/* or functions */
+/*EOF*/

Output/scc.test-08.example2-en.1

@@ -0,0 +1,22 @@
+/*
+
+
+
+
+
+
+
+ */
+
+/* */
+/* */
+Including trailing //
+What is the correct behaviour?  //
+//
+And with comment stripping?  //
+So that this text appears on a separate line from the question.
+And what about newlines and /* */ comments when they are retained?
+Perhaps a newline should be generated when the line had a comment on it somewhere?
+Which function /* */ controls this?
+
+/* */

errhelp.c

@@ -5,7 +5,7 @@
 @(#)Purpose:        Print usage and help message in standard format.
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 2007-09
-@(#)Product:        SCC Version 6.60 (2016-06-12)
+@(#)Product:        SCC Version 6.70 (2017-10-17)
 */
 
 /*TABSTOP=4*/

filter.c

@@ -5,7 +5,7 @@
 @(#)Purpose:        Classic File Filter
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1987-89,1991,1993,1996-99,2002-05,2008,2012,2014-15
-@(#)Product:        SCC Version 6.60 (2016-06-12)
+@(#)Product:        SCC Version 6.70 (2017-10-17)
 */
 
 /*TABSTOP=4*/

filter.h

@@ -5,7 +5,7 @@
 @(#)Purpose:        Header for filter functions
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1993,1995-98,2003-04,2006,2008,2014-15
-@(#)Product:        SCC Version 6.60 (2016-06-12)
+@(#)Product:        SCC Version 6.70 (2017-10-17)
 */
 
 /*TABSTOP=4*/

filterio.c

@@ -5,7 +5,7 @@
 @(#)Purpose:        Perform standardized I/O error check for filter programs
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 2003,2005,2008,2014
-@(#)Product:        SCC Version 6.60 (2016-06-12)
+@(#)Product:        SCC Version 6.70 (2017-10-17)
 */
 
 /*TABSTOP=4*/

makefile

@@ -1,6 +1,8 @@
-# @(#)$Id: makefile,v 1.6 2016/06/11 22:26:40 jleffler Exp $
+# @(#)$Id: makefile,v 1.8 2017/10/18 05:50:43 jleffler Exp $
 #
-# Makefile for SCC (Strip C/C++ Comments)
+# Release Makefile for SCC (Strip C/C++ Comments)
+#
+# No access to JLSS libraries - use scc.mk for that.
 
 PROGRAM = scc
 SOURCE  = errhelp.c filter.c filterio.c stderr.c scc.c
@@ -28,6 +30,7 @@ TEST_SCRIPTS = \
 	scc.test-05.sh \
 	scc.test-06.sh \
 	scc.test-07.sh \
+	scc.test-08.sh \
 
 all: ${PROGRAM} ${TESTTOOLS}
 

posixver.h

@@ -1,11 +1,11 @@
 /*
 @(#)File:           $RCSfile: posixver.h,v $
-@(#)Version:        $Revision: 1.3 $
-@(#)Last changed:   $Date: 2015/07/05 21:28:18 $
+@(#)Version:        $Revision: 1.4 $
+@(#)Last changed:   $Date: 2017/06/18 00:15:42 $
 @(#)Purpose:        Request appropriate POSIX and X/Open Support
 @(#)Author:         J Leffler
-@(#)Copyright:      (C) JLSS 2010,2015
-@(#)Product:        SCC Version 6.60 (2016-06-12)
+@(#)Copyright:      (C) JLSS 2010-2017
+@(#)Product:        SCC Version 6.70 (2017-10-17)
 */
 
 /*TABSTOP=4*/
@@ -15,7 +15,7 @@
 
 /*
 ** Include this file before including system headers.  By default, with
-** C99 support from the compiler, it requests POSIX 2001 support.  With
+** C99 support from the compiler, it requests POSIX 2008 support.  With
 ** C89 support only, it requests POSIX 1997 support.  Override the
 ** default behaviour by setting either _XOPEN_SOURCE or _POSIX_C_SOURCE.
 */