HFNOC/Signal-Server
2
0
Fork 0
forked from ExternalVendorCode/Signal-Server
Code Pull Requests Activity

Correctly detect perm errors on pat files

Browse Source
This commit is contained in:
Gareth Evans
2017-02-22 19:35:15 +00:00
parent 96257f9b16
commit d33f5d293e
1 changed files with 268 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
inputs.cc
View File

@@ -696,8 +696,7 @@ int LoadPAT(char *filename)
/* Load .az antenna pattern file */ /* Load .az antenna pattern file */
if( (fd = fopen(azfile, "r")) == NULL ) if( (fd = fopen(azfile, "r")) != NULL ){
return errno;
/* Clear azimuth pattern array */ /* Clear azimuth pattern array */
@@ -824,11 +823,13 @@ int LoadPAT(char *filename)
azimuth_pattern[360] = azimuth_pattern[0]; azimuth_pattern[360] = azimuth_pattern[0];
got_azimuth_pattern = 255; got_azimuth_pattern = 255;
}else if( errno == EACCES ){
return errno;
}
/* Read and process .el file */ /* Read and process .el file */
if( (fd = fopen(elfile, "r")) == NULL ) if( (fd = fopen(elfile, "r")) != NULL ){
return errno;
for (x = 0; x <= 10000; x++) { for (x = 0; x <= 10000; x++) {
el_pattern[x] = 0.0; el_pattern[x] = 0.0;
@@ -1008,6 +1009,9 @@ int LoadPAT(char *filename)
LR.antenna_pattern[x][y] = az * elevation; LR.antenna_pattern[x][y] = az * elevation;
} }
} }
}else if( errno == EACCES ){
return errno;
}
return 0; return 0;
} }