ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use new utils::sfread() utility function in several classes

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-10-17 11:29:08 -04:00
parent 7d1cd63e1d
commit cad6293078
22 changed files with 169 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/utils.cpp
View File

@ -17,6 +17,10 @@
#include "lammps.h"
#include "error.h"
#if defined(__linux)
#include <unistd.h> // for readlink
#endif
/*! \file utils.cpp */
/*
@ -127,14 +131,32 @@ void utils::sfgets(const char *srcname, int srcline, char *s, int size,
return;
}
#define MAXFILEBUF 1024
/* like fread() but aborts with an error or EOF is encountered */
void sfread(const char *srcname, int srcline, void *s, size_t size,
size_t num, FILE *fp, const char *filename, Error *error)
void utils::sfread(const char *srcname, int srcline, void *s, size_t size,
size_t num, FILE *fp, const char *filename, Error *error)
{
char inferred_name[MAXFILEBUF];
size_t rv = fread(s,size,num,fp);
if (rv != num) { // something went wrong
std::string errmsg;
// try to figure out the file name from the file pointer
if (!filename) {
// on Linux we can infer the name of the open file from /proc
// otherwise we set it to "(unknown)"
#if defined(__linux)
char procpath[32];
int fd = fileno(fp);
snprintf(procpath,32,"/proc/self/fd/%d",fd);
memset(inferred_name,0,MAXFILEBUF);
readlink(procpath,inferred_name,MAXFILEBUF);
#else
strcpy(inferred_name,"(unknown)");
#endif
filename = inferred_name;
}
if (feof(fp)) {
errmsg = "Unexpected end of file while reading file '";
} else if (ferror(fp)) {