Code for release 6.16 (pre-release)

Author: jleffler

README

@@ -1,4 +1,4 @@
-SCC Version 5.05 (2012-01-23)
+SCC Version 6.16 (2016-01-19)
 
 This is the source code to a program which is licenced under the terms of the
 GNU General Public License Version 3
@@ -12,4 +12,4 @@ Ideally, the build process should simply be a question of running:
 If you have questions or comments, please contact the author:
 Jonathan Leffler via email at [email protected]
 
-Package created: 2012-01-23
+Package created: 2016-01-19

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 5.05 (2012-01-23)
+@(#)Product:        SCC Version 6.16 (2016-01-19)
 */
 
 /*TABSTOP=4*/

filter.c

@@ -1,11 +1,11 @@
 /*
 @(#)File:           $RCSfile: filter.c,v $
-@(#)Version:        $Revision: 3.15 $
-@(#)Last changed:   $Date: 2008/02/11 08:44:50 $
-@(#)Purpose:        Standard File Filter
+@(#)Version:        $Revision: 2015.2 $
+@(#)Last changed:   $Date: 2015/02/17 04:53:03 $
+@(#)Purpose:        Classic File Filter
 @(#)Author:         J Leffler
-@(#)Copyright:      (C) JLSS 1987-89,1991,1993,1996-99,2002-05,2008
-@(#)Product:        SCC Version 5.05 (2012-01-23)
+@(#)Copyright:      (C) JLSS 1987-89,1991,1993,1996-99,2002-05,2008,2012,2014-15
+@(#)Product:        SCC Version 6.16 (2016-01-19)
 */
 
 /*TABSTOP=4*/
@@ -15,16 +15,18 @@
 #include <string.h>
 #include <errno.h>
 
-static char *no_args[] = { "-", 0 };
+static char  dash[] = "-";
+static char *no_args[] = { dash, 0 };
 static const char em_invoptnum[] = "invalid (negative) option number";
 
 #ifndef lint
 /* Prevent over-aggressive optimizers from eliminating ID string */
-const char jlss_id_filter_c[] = "@(#)$Id: filter.c,v 3.15 2008/02/11 08:44:50 jleffler Exp $";
+extern const char jlss_id_filter_c[];
+const char jlss_id_filter_c[] = "@(#)$Id: filter.c,v 2015.2 2015/02/17 04:53:03 jleffler Exp $";
 #endif /* lint */
 
 /*
-    Purpose:    Standard File Filter
+    Purpose:    Classic File Filter
 
     Maintenance Log
     ---------------
@@ -36,6 +38,7 @@ const char jlss_id_filter_c[] = "@(#)$Id: filter.c,v 3.15 2008/02/11 08:44:50 jl
     31/03/1998  JL    Add support for continuing on error opening a file
     22/08/2003  JL    Remove filter_setcontinue - always continue on error.
     18/12/2004  JL    Rename Filter to ClassicFilter; do not modify argv.
+    27/12/2014  JL    Support filter_numfiles()
 
     Arguments
     ---------
@@ -57,9 +60,8 @@ const char jlss_id_filter_c[] = "@(#)$Id: filter.c,v 3.15 2008/02/11 08:44:50 jl
 
 void filter(int argc, char **argv, int optnum, ClassicFilter function)
 {
-    int             i;
-    FILE           *fp;
-    char           *file;
+    int   i;
+    FILE *fp;
 
     if (optnum < 0)
         err_abort(em_invoptnum);
@@ -69,18 +71,18 @@ void filter(int argc, char **argv, int optnum, ClassicFilter function)
         argv = no_args;
         optnum = 0;
     }
+    filter_setnumfiles(argc - optnum);
 
     for (i = optnum; i < argc; i++)
     {
         if (strcmp(argv[i], "-") == 0)
         {
-            file = "(standard input)";
-            (*function)(stdin, file);
+            char name[] = "(standard input)";
+            (*function)(stdin, name);
         }
         else if ((fp = fopen(argv[i], "r")) != NULL)
         {
-            file = argv[i];
-            (*function)(fp, file);
+            (*function)(fp, argv[i]);
             fclose(fp);
         }
         else
@@ -98,12 +100,12 @@ void filter(int argc, char **argv, int optnum, ClassicFilter function)
 */
 
 #include <ctype.h>
-#include "getopt.h"
+#include <unistd.h>
 
 static void fcopy(FILE *f1, FILE *f2)
 {
-    char            buffer[BUFSIZ];
-    int             n;
+    char   buffer[BUFSIZ];
+    size_t n;
 
     while ((n = fread(buffer, sizeof(char), sizeof(buffer), f1)) > 0)
     {
@@ -114,7 +116,7 @@ static void fcopy(FILE *f1, FILE *f2)
 
 static void vis(FILE *fp, char *fn)
 {
-    int             c;
+    int c;
 
     fprintf(stdout, "%s:\n", fn);
     while ((c = getc(fp)) != EOF)
@@ -134,7 +136,7 @@ static void cat(FILE *fp, char *fn)
     fcopy(fp, stdout);
 }
 
-int             main(int argc, char **argv)
+int main(int argc, char **argv)
 {
     int             opt;
     ClassicFilter   f = cat;
@@ -146,7 +148,7 @@ int             main(int argc, char **argv)
         if (opt == 'v')
             f = vis;
         else if (opt == 'V')
-            err_version("FILTER", "$Revision: 3.15 $ ($Date: 2008/02/11 08:44:50 $)");
+            err_version("FILTER", "$Revision: 2015.2 $ ($Date: 2015/02/17 04:53:03 $)");
         else
             err_usage("[-vV] [file ...]");
     }

filter.h

@@ -1,11 +1,11 @@
 /*
 @(#)File:           $RCSfile: filter.h,v $
-@(#)Version:        $Revision: 2008.1 $
-@(#)Last changed:   $Date: 2008/02/11 07:39:08 $
+@(#)Version:        $Revision: 2015.2 $
+@(#)Last changed:   $Date: 2015/02/17 04:51:48 $
 @(#)Purpose:        Header for filter functions
 @(#)Author:         J Leffler
-@(#)Copyright:      (C) JLSS 1993,1995-98,2003-04,2006,2008
-@(#)Product:        SCC Version 5.05 (2012-01-23)
+@(#)Copyright:      (C) JLSS 1993,1995-98,2003-04,2006,2008,2014-15
+@(#)Product:        SCC Version 6.16 (2016-01-19)
 */
 
 /*TABSTOP=4*/
@@ -16,7 +16,8 @@
 #ifdef MAIN_PROGRAM
 #ifndef lint
 /* Prevent over-aggressive optimizers from eliminating ID string */
-const char jlss_id_filter_h[] = "@(#)$Id: filter.h,v 2008.1 2008/02/11 07:39:08 jleffler Exp $";
+extern const char jlss_id_filter_h[];
+const char jlss_id_filter_h[] = "@(#)$Id: filter.h,v 2015.2 2015/02/17 04:51:48 jleffler Exp $";
 #endif /* lint */
 #endif /* MAIN_PROGRAM */
 
@@ -32,21 +33,57 @@ const char jlss_id_filter_h[] = "@(#)$Id: filter.h,v 2008.1 2008/02/11 07:39:08
 typedef void (*ClassicFilter)(FILE *ifp, char *fn);
 extern void filter(int argc, char **argv, int optnum, ClassicFilter function);
 
+/* No file name at all; no error status feedback */
+/* Source: filtera.c */
+typedef void (*ClassicFilterAnon)(FILE *ifp);
+extern void filter_anon(int argc, char **argv, int optnum, ClassicFilterAnon function);
+
 /* Modern mode 1 - without output file specified */
 /* Source: stdfilter.c */
 typedef int (*StdoutFilter)(FILE *ifp, const char *fn);
 extern int filter_stdout(int argc, char **argv, int optnum, StdoutFilter function);
 
+/* Modern mode 1 - without output file specified */
+/* Source: stdfiltera.c */
+typedef int (*StdoutFilterAnon)(FILE *ifp);
+extern int filter_stdout_anon(int argc, char **argv, int optnum, StdoutFilterAnon function);
+
 /* Modern mode 2 - with output file specified */
 /* NB: OutputFilter is compatible with AFF code */
 /* Source: outfilter.c */
 typedef int (*OutputFilter)(FILE *ifp, const char *fn, FILE *ofp);
 extern int filter_output(int argc, char **argv, int optnum, OutputFilter function);
 
+/* Modern mode 2 - with output file specified */
+/* Source: outfiltera.c */
+typedef int (*OutputFilterAnon)(FILE *ifp, FILE *ofp);
+extern int filter_output_anon(int argc, char **argv, int optnum, OutputFilterAnon function);
+
+/* Set output file for filter_output() and filter_output_anon() */
+/* Returns previous value of the file (does not set new value if passed null pointer). */
+/* Source: outfilterso.c */
+extern FILE *filter_setoutput(FILE *out);
+
 /* Standard I/O error check code */
-/* Used internally by filter_stdout() and filter_output(). */
+/* Used internally by filter_stdout(), filter_stdout_anon(), filter_output() and filter_output_anon(). */
 /* Not normally used by client programs. */
 /* Source: filterio.c */
 extern int filter_io_check(FILE *ifp, const char *ifn, FILE *ofp);
 
+/*
+** Number of files to process: enables support for grep-like prefixing
+** of output with file name - or not.
+** To print file names before output lines, use:
+**    if (filter_numfiles() > 1)
+**        printf("%s:%s\n", filename, line);
+**    else
+**        puts(line);
+** Call filter_setnumfiles(0) to reset to default state (seldom needed).
+** Call filter_setnumfiles(1) to suppress headings (grep -h).
+** Call filter_setnumfiles(2) to force headings (grep -H).
+** Source: filterio.c
+*/
+extern int filter_numfiles(void);
+extern void filter_setnumfiles(int num);
+
 #endif /* FILTER_H */

filterio.c

@@ -0,0 +1,86 @@
+/*
+@(#)File:           $RCSfile: filterio.c,v $
+@(#)Version:        $Revision: 2014.2 $
+@(#)Last changed:   $Date: 2014/12/27 23:14:36 $
+@(#)Purpose:        Perform standardized I/O error check for filter programs
+@(#)Author:         J Leffler
+@(#)Copyright:      (C) JLSS 2003,2005,2008,2014
+@(#)Product:        SCC Version 6.16 (2016-01-19)
+*/
+
+/*TABSTOP=4*/
+
+#include "filter.h"
+#include "stderr.h"
+
+static int numfiles = 0;
+
+#ifndef lint
+/* Prevent over-aggressive optimizers from eliminating ID string */
+const char jlss_id_filterio_c[] = "@(#)$Id: filterio.c,v 2014.2 2014/12/27 23:14:36 jleffler Exp $";
+#endif /* lint */
+
+/* filter_numfiles() - return number of files to be processed */
+int filter_numfiles(void)
+{
+    return numfiles;
+}
+
+/* filter_setnumfiles() - set number of files to be processed */
+/*
+** Only set number of files if not overridden by prior
+** filter_setnumfiles(1) or filter_setnumfiles(2)
+*/
+void filter_setnumfiles(int num)
+{
+    if (numfiles == 0)
+        numfiles = num;
+}
+
+/* filter_io_check() - did an input or output error occur? */
+int filter_io_check(FILE *ifp, const char *ifn, FILE *ofp)
+{
+    int rc = 0;
+    if (ferror(ifp))
+    {
+        err_sysrem("read error on file %s\n", ifn);
+        rc = -1;
+    }
+    if (ferror(ofp))
+    {
+        err_sysrem("write error on output file\n");
+        rc = -1;
+    }
+    return(rc);
+}
+
+#ifdef TEST
+
+#include <stdlib.h>
+
+static int cat(FILE *ifp, const char *ifn, FILE *ofp)
+{
+    char buffer[4096];
+    size_t nbytes;
+
+    while ((nbytes = fread(buffer, sizeof(char), sizeof(buffer), ifp)) != 0)
+    {
+        if (fwrite(buffer, sizeof(char), nbytes, ofp) != nbytes)
+        {
+            err_syserr1("write failed");
+            break;
+        }
+    }
+    return(filter_io_check(ifp, ifn, ofp));
+}
+
+int main(int argc, char **argv)
+{
+    int rc = EXIT_SUCCESS;
+    err_setarg0(argv[0]);
+    if (filter_output(argc, argv, 1, cat) != 0)
+        rc = EXIT_FAILURE;
+    return(rc);
+}
+
+#endif /* TEST */

posixver.h

@@ -1,11 +1,11 @@
 /*
 @(#)File:           $RCSfile: posixver.h,v $
-@(#)Version:        $Revision: 1.1 $
-@(#)Last changed:   $Date: 2010/08/29 00:27:48 $
+@(#)Version:        $Revision: 1.3 $
+@(#)Last changed:   $Date: 2015/07/05 21:28:18 $
 @(#)Purpose:        Request appropriate POSIX and X/Open Support
 @(#)Author:         J Leffler
-@(#)Copyright:      (C) JLSS 2010
-@(#)Product:        SCC Version 5.05 (2012-01-23)
+@(#)Copyright:      (C) JLSS 2010,2015
+@(#)Product:        SCC Version 6.16 (2016-01-19)
 */
 
 /*TABSTOP=4*/
@@ -25,8 +25,10 @@
 /* _XOPEN_SOURCE 500 is loosely equivalent to _POSIX_C_SOURCE 199506L */
 
 #if !defined(_XOPEN_SOURCE) && !defined(_POSIX_C_SOURCE)
-#if __STDC_VERSION__ >= 199901L
-#define _XOPEN_SOURCE 600   /* SUS v3, POSIX 1003.1 2004 (POSIX 2001 + Corrigenda) */
+#if defined(__cplusplus)
+#define _XOPEN_SOURCE 700   /* SUS v4, POSIX 1003.1 2008/13 (POSIX 2008/13) */
+#elif __STDC_VERSION__ >= 199901L
+#define _XOPEN_SOURCE 700   /* SUS v4, POSIX 1003.1 2008/13 (POSIX 2008/13) */
 #else
 #define _XOPEN_SOURCE 500   /* SUS v2, POSIX 1003.1 1997 */
 #endif /* __STDC_VERSION__ */

scc-test.binary.cpp

@@ -0,0 +1,15 @@
+/*
+@(#)File:           $RCSfile: scc-test.binary.cpp,v $
+@(#)Version:        $Revision: 1.3 $
+@(#)Last changed:   $Date: 2014/07/16 07:07:50 $
+@(#)Purpose:        Test SCC on C++14 binary numbers
+@(#)Author:         J Leffler
+@(#)Copyright:      (C) JLSS 2014
+@(#)Product:        SCC Version 6.16 (2016-01-19)
+*/
+
+int i = 0b0100;
+int j = 0b1000'1000;
+int k = 0b1010'0101'1111'0000;
+int l = 0B1011;
+int m = 0B1'0'1'1;  // Not sensible, but valid