luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

raw_read() always fopen("rb") even on windows, always swallow "\r"

This commit is contained in:
rlar 2012-05-06 14:27:57 +02:00
parent e598598d70
commit 10e5dbfbcc
1 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/frontend/rawfile.c
View File

@ -292,42 +292,11 @@ raw_read(char *name) {
FILE *fp, *lastin, *lastout, *lasterr;
#if defined(__MINGW32__) || defined(_MSC_VER)
bool binary = TRUE;
#endif
if ((fp = fopen(name, "r")) == NULL) {
if ((fp = fopen(name, "rb")) == NULL) {
perror(name);
}
#if defined(__MINGW32__) || defined(_MSC_VER)
/* Test, whether file really ASCII, otherwise assume binary hvogt 15.3.2000 */
while (fgets(buf, BSIZE_SP, fp)) {
if (ciprefix("values:", buf)) {
binary = FALSE;
rewind(fp); /* rewind */
fprintf(cp_err, "\nASCII raw file\n");
break;
}
else if (ciprefix("binary:", buf)) {
binary = TRUE;
rewind(fp); /* rewind */
break;
}
}
if (binary) {
(void) fclose(fp);
if ((fp = fopen(name, "rb")) == NULL) {
perror(name);
return (NULL);
}
fprintf(cp_err, "\nbinary raw file\n");
}
/*--------------------------------------------------------*/
#endif
/* Since we call cp_evloop() from here, we have to do this junk. */
lastin = cp_curin;
lastout = cp_curout;
@ -339,6 +308,11 @@ raw_read(char *name) {
cp_pushcontrol();
while (fgets(buf, BSIZE_SP, fp)) {
r = strchr(buf, '\n');
if(r && r > buf && r[-1] == '\r') {
r[-1] = '\n';
r[0] = '\0';
}
/* Figure out what this line is... */
if (ciprefix("title:", buf)) {
s = buf;