From 7fb07b1793208d7236d957ec0300bb0cc4c34cef Mon Sep 17 00:00:00 2001
From: Gareth Evans <gareth.evans@contextis.co.uk>
Date: Sat, 4 Mar 2017 19:08:12 +0000
Subject: [PATCH] Detect perm errors in loss colors

---
 inputs.cc  | 12 ++++++------
 inputs.hh  |  2 +-
 outputs.cc |  7 +++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/inputs.cc b/inputs.cc
index f5c0a9b..409abe0 100644
--- a/inputs.cc
+++ b/inputs.cc
@@ -1143,7 +1143,7 @@ int LoadSignalColors(struct site xmtr)
 	return 0;
 }
 
-void LoadLossColors(struct site xmtr)
+int LoadLossColors(struct site xmtr)
 {
 	int x, y, ok, val[4];
 	char filename[255], string[80], *pointer = NULL, *s = NULL;
@@ -1243,14 +1243,13 @@ void LoadLossColors(struct site xmtr)
 
 	region.levels = 16;
 
-	fd = fopen(filename, "r");
-
-	if (fd == NULL && xmtr.filename[0] == '\0')
+	if ( xmtr.filename[0] == '\0' && (fd = fopen(filename, "r")) == NULL )
 		/* Don't save if we don't have an output file */
-		return;
+		return 0;
 
 	if (fd == NULL) {
-		fd = fopen(filename, "w");
+		if( (fd = fopen(filename, "w")) == NULL )
+			return errno;
 
 		for (x = 0; x < region.levels; x++)
 			fprintf(fd, "%3d: %3d, %3d, %3d\n", region.level[x],
@@ -1295,6 +1294,7 @@ void LoadLossColors(struct site xmtr)
 		fclose(fd);
 		region.levels = x;
 	}
+	return 0;
 }
 
 void LoadDBMColors(struct site xmtr)
diff --git a/inputs.hh b/inputs.hh
index 3c14514..f216b65 100644
--- a/inputs.hh
+++ b/inputs.hh
@@ -7,7 +7,7 @@ int LoadSDF_SDF(char *name, int winfiles);
 char LoadSDF(char *name, int winfiles);
 int LoadPAT(char *az_filename, char *el_filename);
 int LoadSignalColors(struct site xmtr);
-void LoadLossColors(struct site xmtr);
+int LoadLossColors(struct site xmtr);
 void LoadDBMColors(struct site xmtr);
 void LoadTopoData(int max_lon, int min_lon, int max_lat, int min_lat);
 void LoadUDT(char *filename);
diff --git a/outputs.cc b/outputs.cc
index 7f59063..43b2fa9 100644
--- a/outputs.cc
+++ b/outputs.cc
@@ -34,7 +34,7 @@ void DoPathLoss(char *filename, unsigned char geo, unsigned char kml,
 	image_ctx_t ctx;
 	int success;
 
-	if((success = image_init(&ctx, width, (kml ? height : height + 30), IMAGE_RGB, IMAGE_DEFAULT)) != 0){
+	if( (success = image_init(&ctx, width, (kml ? height : height + 30), IMAGE_RGB, IMAGE_DEFAULT)) != 0 ){
 		fprintf(stderr,"Error initializing image\n");
 		exit(success);
 	}
@@ -44,7 +44,10 @@ void DoPathLoss(char *filename, unsigned char geo, unsigned char kml,
 	    255.0 / pow((double)(max_elevation - min_elevation),
 			one_over_gamma);
 
-	LoadLossColors(xmtr[0]);
+	if( (success = LoadLossColors(xmtr[0])) != 0 ){
+		fprintf(stderr,"Error loading loss colors\n");
+		exit(success);
+	}
 
 	if( filename != NULL ) {