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

convert to lower case for spice2 input and remove few warnings

This commit is contained in:
dwarning 2026-01-08 22:35:52 +01:00
parent d239dd1afa
commit e8016ebf63
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/ngsconvert.c
View File

@ -21,6 +21,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
#include <errno.h> #include <errno.h>
int input(FILE *fp);
FILE *cp_in = NULL; FILE *cp_in = NULL;
FILE *cp_out = NULL; FILE *cp_out = NULL;
@ -59,6 +60,7 @@ char *cp_program = "sconvert";
#define TMALLOC(t, n) (t*) tmalloc(sizeof(t) * (size_t)(n)) #define TMALLOC(t, n) (t*) tmalloc(sizeof(t) * (size_t)(n))
#define TREALLOC(t, p, n) (t*) trealloc(p, sizeof(t) * (size_t)(n)) #define TREALLOC(t, p, n) (t*) trealloc(p, sizeof(t) * (size_t)(n))
#if defined(__MINGW32__) || defined(_MSC_VER)
FILE * FILE *
newfopen(const char *fn, const char* md) newfopen(const char *fn, const char* md)
{ {
@ -68,6 +70,7 @@ newfopen(const char *fn, const char* md)
fp = fopen(fn, md); fp = fopen(fn, md);
return fp; return fp;
} }
#endif
char * char *
smktemp(char *id) smktemp(char *id)
@ -204,7 +207,11 @@ oldread(char *name)
pl->pl_scale = pl->pl_dvecs = v; pl->pl_scale = pl->pl_dvecs = v;
end = v; end = v;
tfread(buf, 1, 8, fp); tfread(buf, 1, 8, fp);
buf[8] = '\0'; for (j = 0; j < 8; j++) {
if (buf[j] == ' ') break;
buf[j] = (char) tolower((unsigned char) buf[j]);
}
buf[j] = '\0';
v->v_name = strdup(buf); v->v_name = strdup(buf);
} }
for (v = pl->pl_dvecs; v; v = v->v_next) { for (v = pl->pl_dvecs; v; v = v->v_next) {
@ -392,15 +399,19 @@ oldwrite(char *name, bool app, struct plot *pl)
int int
main(int ac, char **av) main(int ac, char **av)
{ {
char *sf, *af; char *sf = NULL, *af = NULL;
char buf[BSIZE_SP]; char buf[BSIZE_SP];
char t, f; char t = 0, f = 0;
struct plot *pl; struct plot *pl;
size_t n; size_t n;
char *infile = NULL; char *infile = NULL;
char *outfile = NULL; char *outfile = NULL;
FILE *fp; FILE *fp;
cp_in = stdin;
cp_out = stdout;
cp_err = stderr;
switch (ac) { switch (ac) {
case 5: case 5:
sf = av[2]; sf = av[2];
@ -426,20 +437,32 @@ main(int ac, char **av)
case 1: printf("Input file: "); case 1: printf("Input file: ");
(void) fflush(stdout); (void) fflush(stdout);
(void) fgets(buf, BSIZE_SP, stdin); if (fgets(buf, BSIZE_SP, stdin) != NULL) {
sf = strdup(buf); sf = strdup(buf);
} else {
printf("Error reading input file.");
}
printf("Input type: "); printf("Input type: ");
(void) fflush(stdout); (void) fflush(stdout);
(void) fgets(buf, BSIZE_SP, stdin); if (fgets(buf, BSIZE_SP, stdin) != NULL) {
f = buf[0]; f = buf[0];
} else {
printf("Error reading input type.");
}
printf("Output file: "); printf("Output file: ");
(void) fflush(stdout); (void) fflush(stdout);
(void) fgets(buf, BSIZE_SP, stdin); if (fgets(buf, BSIZE_SP, stdin) != NULL) {
af = strdup(buf); af = strdup(buf);
} else {
printf("Error reading output file.");
}
printf("Output type: "); printf("Output type: ");
(void) fflush(stdout); (void) fflush(stdout);
(void) fgets(buf, BSIZE_SP, stdin); if (fgets(buf, BSIZE_SP, stdin) != NULL) {
t = buf[0]; t = buf[0];
} else {
printf("Error reading output type.");
}
break; break;
default: default:
fprintf(cp_err, fprintf(cp_err,