From 15b19193ed5155d16c056f057580237f090f80dc Mon Sep 17 00:00:00 2001
From: Bob Supnik <Bob@supnik.org>
Date: Thu, 9 Mar 2017 08:33:07 -0800
Subject: [PATCH] SIGMA: Add LOAD support for Carriage Control Tape

---
 sigma/sigma_lp.c  | 31 +++++++++++++++++++++++--------
 sigma/sigma_sys.c |  8 ++++++--
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/sigma/sigma_lp.c b/sigma/sigma_lp.c
index cfcddd49..740c6bbd 100644
--- a/sigma/sigma_lp.c
+++ b/sigma/sigma_lp.c
@@ -1,6 +1,6 @@
 /* sigma_lp.c: Sigma 7440/7450 line printer
 
-   Copyright (c) 2007-2008, Robert M. Supnik
+   Copyright (c) 2007-2017, Robert M. Supnik
 
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,8 @@
    in this Software without prior written authorization from Robert M Supnik.
 
    lp           7440/7445 or 7450 line printer
+
+   09-Mar-2017  RMS     Fixed unclosed file returns in CCT load (COVERITY)
 */
 
 #include "sigma_io_defs.h"
@@ -107,6 +109,7 @@ t_stat lp_attach (UNIT *uptr, CONST char *cptr);
 t_stat lp_settype (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
 t_stat lp_showtype (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
 t_stat lp_load_cct (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
+t_stat lp_read_cct (FILE *cfile);
 uint32 lp_fmt (UNIT *uptr);
 uint32 lp_skip (UNIT *uptr, uint32 ch);
 uint32 lp_space (UNIT *uptr, uint32 lines, t_bool skp);
@@ -466,19 +469,32 @@ lp_pass = 0;
 return attach_unit (uptr, cptr);
 }
 
-/* Set carriage control tape */
+/* Set handler for carriage control tape */
 
 t_stat lp_load_cct (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
 {
-uint32 col, rpt, ptr, mask;
-uint8 cctbuf[CCT_LNT];
-t_stat r;
-char cbuf[CBUFSIZE], gbuf[CBUFSIZE];
 FILE *cfile;
+t_stat r;
 
-if ((cptr == NULL) || (*cptr == 0)) return SCPE_ARG;
+if ((cptr == NULL) || (*cptr == 0))
+    return SCPE_ARG;
 if ((cfile = fopen (cptr, "r")) == NULL)
     return SCPE_OPENERR;
+r = lp_read_cct (cfile);
+fclose (cfile);
+return r;
+}
+
+/* Read carriage control tape - used by SET and LOAD */
+
+t_stat lp_read_cct (FILE *cfile)
+{
+uint32 col, rpt, ptr, mask;
+uint8 cctbuf[CCT_LNT];
+char *cptr;
+t_stat r;
+char cbuf[CBUFSIZE], gbuf[CBUFSIZE];
+
 ptr = 0;
 for ( ; (cptr = fgets (cbuf, CBUFSIZE, cfile)) != NULL; ) {
     mask = 0;
@@ -508,7 +524,6 @@ lp_cctl = ptr;
 lp_cctp = 0;
 for (rpt = 0; rpt < lp_cctl; rpt++)
     lp_cct[rpt] = cctbuf[rpt];
-fclose (cfile);
 return SCPE_OK;
 }
 
diff --git a/sigma/sigma_sys.c b/sigma/sigma_sys.c
index 749162b1..5e089b8c 100644
--- a/sigma/sigma_sys.c
+++ b/sigma/sigma_sys.c
@@ -1,6 +1,6 @@
 /* sigma_sys.c: Sigma system interface
 
-   Copyright (c) 2007-2008, Robert M Supnik
+   Copyright (c) 2007-2017, Robert M Supnik
 
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
@@ -22,6 +22,8 @@
    Except as contained in this notice, the name of Robert M Supnik shall not be
    used in advertising or otherwise to promote the sale, use or other dealings
    in this Software without prior written authorization from Robert M Supnik.
+
+   09-Mar-2017  RMS     Added LOAD processor for CCT
 */
 
 #include "sigma_defs.h"
@@ -50,6 +52,8 @@ t_stat fprint_sym_m (FILE *of, uint32 inst);
 t_stat parse_sym_m (const char *cptr, t_value *val);
 void fprint_ebcdic (FILE *of, uint32 c);
 
+extern t_stat lp_read_cct (FILE *cfile);
+
 /* SCP data structures and interface routines
 
    sim_name             simulator name string
@@ -166,7 +170,7 @@ uint8 ebcdic_to_ascii[256] = {
 
 t_stat sim_load (FILE *fileref, CONST char *cptr, CONST char *fnam, int flag)
 {
-return SCPE_NOFNC;
+return lp_read_cct (fileref);
 }
 
 /* Symbol and format tables */