Code for release 4.04

Author: jleffler

filter.c

@@ -5,7 +5,7 @@
 @(#)Purpose:        Standard File Filter
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1987-89,1991,1993,1996-99,2002-05,2008
-@(#)Product:        :PRODUCT:
+@(#)Product:        SCC Version 4.04.20081127 (2008-11-27)
 */
 
 /*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
-@(#)Product:        :PRODUCT:
+@(#)Product:        SCC Version 4.04.20081127 (2008-11-27)
 */
 
 /*TABSTOP=4*/

scc.1

@@ -0,0 +1,32 @@
+.\" @(#)$Id: scc.1,v 1.1 2008/11/27 22:49:18 jleffler Exp $
+.\" @(#)Manual page: Application -- Part of application
+.ds fC "Version: $Revision: 1.1 $ ($Date: 2008/11/27 22:49:18 $)
+.TH PROG 1S "JLSS UNIX Tools"
+.SH NAME
+scc \(em Strip C or C++ comments from source code
+.SH SYNOPSIS
+\fBscc\fP [-wCV] [file ...]
+.SH DESCRIPTION
+The \fBscc\fP program strips C comments from source code.
+By default, it only eliminates classic C comments between `\*c/*\*d' and `\*c*/\*d'.
+By specifying `\*c-C\*d', you can also eliminate C++ and C99 comments between `\*c//\*d' and end of line.
+By specifying `\*c-w\*d', you can obtain warnings about nested C comments - that is, about `\*c/*\*d' appearing inside another classic C comment.
+The `\*c-V\*d' option prints the version information and exits.
+.P
+The \fBscc\*d' program is aware of the intricacies of backslash-newline, and single-quoted characters, and double-quoted character strings.
+Consequently, it correctly handles such bizarre comments as this:
+.P
+\*c/\e
+.br
+*\e
+.br
+*\e
+.br
+/\*d
+.br
+.SH AUTHOR
+Jonathan Leffler
+.br
+JLSS
+.br
+27th November 2008

scc.c

@@ -1,7 +1,7 @@
 /*
 @(#)File:           $RCSfile: scc.c,v $
-@(#)Version:        $Revision: 4.3 $
-@(#)Last changed:   $Date: 2007/12/14 23:44:09 $
+@(#)Version:        $Revision: 4.4 $
+@(#)Last changed:   $Date: 2008/08/09 20:15:06 $
 @(#)Purpose:        Strip C comments
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1991,1993,1997-98,2003,2005
@@ -41,7 +41,7 @@ static int nline = 0;	/* Line counter */
 static const char usestr[] = "[-wCV] [file ...]";
 
 #ifndef lint
-static const char rcs[] = "@(#)$Id: scc.c,v 4.3 2007/12/14 23:44:09 jleffler Exp $";
+static const char rcs[] = "@(#)$Id: scc.c,v 4.4 2008/08/09 20:15:06 jleffler Exp $";
 #endif
 
 static int getch(FILE *fp)
@@ -70,12 +70,12 @@ static int peek(FILE *fp)
 
 static void warning(const char *str, const char *file, int line)
 {
-	err_report(ERR_REM, ERR_STAT, "%s:%ld: %s\n", file, line, str);
+	err_report(ERR_REM, ERR_STAT, "%s:%d: %s\n", file, line, str);
 }
 
 static void warning2(const char *s1, const char *s2, const char *file, int line)
 {
-	err_report(ERR_REM, ERR_STAT, "%s:%ld: %s %s\n", file, line, s1, s2);
+	err_report(ERR_REM, ERR_STAT, "%s:%d: %s %s\n", file, line, s1, s2);
 }
 
 static void endquote(char q, FILE *fp, char *fn, const char *msg)
@@ -258,7 +258,7 @@ int main(int argc, char **argv)
 			Cflag = 1;
 			break;
 		case 'V':
-			err_version("SCC", "$Revision: 4.3 $ ($Date: 2007/12/14 23:44:09 $)");
+			err_version("SCC", "$Revision: 4.4 $ ($Date: 2008/08/09 20:15:06 $)");
 			break;
 		default:
 			err_usage(usestr);

scc.mk

@@ -1,6 +1,6 @@
-# Makefile automatically generated by bomrelease version 1.12
+# Makefile automatically generated by bomrelease version 1.17 (2008/11/18 22:15:54)
 #
-# scc version 4.03 (2008-06-07)
+# scc version 4.04 (2008-11-27)
 
 PROGRAM = scc
 SOURCE  = stderr.c filter.c scc.c

scc.test

@@ -0,0 +1,135 @@
+/*
+@(#)File:            $RCSfile: scc.test,v $
+@(#)Version:         $Revision: 1.6 $
+@(#)Last changed:    $Date: 2007/12/14 23:45:02 $
+@(#)Purpose:         Test file for program SCC
+@(#)Author:          J Leffler
+@(#)Copyright:       (C) JLSS 1997,2003
+@(#)Product:         SCC Version 4.04.20081127 (2008-11-27)
+*/
+
+/*TABSTOP=4*/
+
+// -- C++ comment
+
+/*
+Multiline C-style comment
+#ifndef lint
+static const char sccs[] = "@(#)$Id: scc.test,v 1.6 2007/12/14 23:45:02 jleffler Exp $";
+#endif
+*/
+
+/*
+Multi-line C-style comment
+with embedded /* in line %C% which should generate a warning
+if scc is run with the -w option
+Two comment starts /* embedded /* in line %C% should generate one warning
+*/
+
+/* Comment */ Non-comment /* Comment Again */ Non-Comment Again /*
+Comment again on the next line */
+
+// A C++ comment with a C-style comment marker /* in the middle
+This is plain text under C++ (C99) commenting - but comment body otherwise
+// A C++ comment with a C-style comment end marker */ in the middle
+
+The following C-style comment end marker should generate a warning
+if scc is run with the -w option
+*/
+Two of these */ generate */ one warning
+
+It is possible to have both warnings on a single line.
+Eg:
+*/ /* /* */ */
+
+SCC has been trained to handle 'q' single quotes in most of
+the aberrant forms that can be used.  '\0', '\\', '\'', '\\
+n' (a valid variant on '\n'), because the backslash followed
+by newline is elided by the token scanning code in CPP before
+any other processing occurs.
+
+This is a legitimate equivalent to '\n' too: '\
+\n', again because the backslash/newline processing occurs early.
+
+The non-portable 'ab', '/*', '*/', '//' forms are handled OK too.
+
+The following quote should generate a warning from SCC; a
+compiler would not accept it.  '
+\n'
+
+" */ /* SCC has been trained to know about strings /* */ */"!
+"\"Double quotes embedded in strings, \\\" too\'!"
+"And \
+newlines in them"
+
+"And escaped double quotes at the end of a string\""
+
+aa '\\
+n' OK
+aa "\""
+aa "\
+\n"
+
+This is followed by C++/C99 comment number 1.
+// C++/C99 comment with \
+continuation character \
+on three source lines (this should not be seen with the -C flag)
+The C++/C99 comment number 1 has finished.
+
+This is followed by C++/C99 comment number 2.
+/\
+/\
+C++/C99 comment (this should not be seen with the -C flag)
+The C++/C99 comment number 2 has finished.
+
+This is followed by regular C comment number 1.
+/\
+*\
+Regular
+comment
+*\
+/
+The regular C comment number 1 has finished.
+
+/\
+\/ This is not a C++/C99 comment!
+
+This is followed by C++/C99 comment number 3.
+/\
+\
+\
+/ But this is a C++/C99 comment!
+The C++/C99 comment number 3 has finished.
+
+/\
+\* This is not a C or C++  comment!
+
+This is followed by regular C comment number 2.
+/\
+*/ This is a regular C comment *\
+but this is just a routine continuation *\
+and that was not the end either - but this is *\
+\
+/
+The regular C comment number 2 has finished.
+
+This is followed by regular C comment number 3.
+/\
+\
+\
+\
+* C comment */
+The regular C comment number 3 has finished.
+
+More double quoted string stuff:
+
+    if (logtable_out)
+    {
+	sprintf(logtable_out,
+		"insert into %s (bld_id, err_operation, err_expected, err_sql_stmt, err_sql_state)" 
+		" values (\"%s\", \"%s\", \"%s\", \"", str_logtable, blade, operation, expected);
+	/* watch out for embedded double quotes. */
+    }
+
+
+/* Non-terminated C-style comment at the end of the file

stderr.c

@@ -5,7 +5,7 @@
 @(#)Purpose:        Error reporting routines
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1988-91,1996-99,2001,2003,2005-08
-@(#)Product:        :PRODUCT:
+@(#)Product:        SCC Version 4.04.20081127 (2008-11-27)
 */
 
 /*TABSTOP=4*/

stderr.h

@@ -1,11 +1,11 @@
 /*
 @(#)File:           $RCSfile: stderr.h,v $
-@(#)Version:        $Revision: 8.21 $
-@(#)Last changed:   $Date: 2008/04/07 10:55:46 $
+@(#)Version:        $Revision: 8.22 $
+@(#)Last changed:   $Date: 2008/08/09 20:12:49 $
 @(#)Purpose:        Header file for standard error functions
 @(#)Author:         J Leffler
 @(#)Copyright:      (C) JLSS 1989-93,1996-99,2003,2005-08
-@(#)Product:        :PRODUCT:
+@(#)Product:        SCC Version 4.04.20081127 (2008-11-27)
 */
 
 #ifndef STDERR_H
@@ -14,7 +14,7 @@
 #ifdef MAIN_PROGRAM
 #ifndef lint
 /* Prevent over-aggressive optimizers from eliminating ID string */
-const char jlss_id_stderr_h[] = "@(#)$Id: stderr.h,v 8.21 2008/04/07 10:55:46 jleffler Exp $";
+const char jlss_id_stderr_h[] = "@(#)$Id: stderr.h,v 8.22 2008/08/09 20:12:49 jleffler Exp $";
 #endif /* lint */
 #endif
 
@@ -88,6 +88,7 @@ extern void err_error(const char *format, ...) PRINTFLIKE(1,2) NORETURN();
 extern void err_error1(const char *s1) NORETURN();
 extern void err_error2(const char *s1, const char *s2) NORETURN();
 extern void err_help(const char *use_str, const char *hlp_str) NORETURN();
+extern void err_helplist(const char *use_str, const char * const *help_list) NORETURN();
 extern void err_internal(const char *function, const char *msg) NORETURN();
 extern void err_logmsg(FILE *fp, int flags, int estat, const char *format, ...) PRINTFLIKE(4,5);
 extern void err_print(int flags, int estat, const char *format, va_list args);