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

src/main.c, rewrite to be autoindent friendly

This commit is contained in:
rlar 2015-01-03 20:56:42 +01:00
parent 86c61c1909
commit 6aff8d5418
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.c
View File

@ -724,9 +724,6 @@ append_to_stream(FILE *dest, FILE *source)
static bool static bool
read_initialisation_file(char *dir, char *name) read_initialisation_file(char *dir, char *name)
{ {
#ifndef HAVE_UNISTD_H
FILE *fp = NULL;
#endif /* not HAVE_UNISTD_H */
char *path; char *path;
bool result = FALSE; bool result = FALSE;
@ -744,16 +741,23 @@ read_initialisation_file(char *dir, char *name)
/* now access the file */ /* now access the file */
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
if (access(path, R_OK) == 0) { if (access(path, R_OK) == 0)
result = TRUE;
#else #else
if ((fp = fopen(path, "r")) != NULL) { {
(void) fclose(fp); FILE *fp = fopen(path, "r");
if (fp) {
fclose(fp);
result = TRUE;
}
}
#endif /* HAVE_UNISTD_H */ #endif /* HAVE_UNISTD_H */
if (result) {
inp_source(path); inp_source(path);
#ifdef TRACE #ifdef TRACE
printf("Init file: '%s'\n", path); printf("Init file: '%s'\n", path);
#endif /* TRACE */ #endif /* TRACE */
result = TRUE; /* loaded okay */
} }
if (path != name) if (path != name)