misccoms.c, indentation and whitespace cleanup
This commit is contained in:
parent
215809b99f
commit
5f3b453a30
|
|
@ -18,17 +18,17 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
|
||||||
#include <readline/readline.h>
|
#include <readline/readline.h>
|
||||||
#include <readline/history.h>
|
#include <readline/history.h>
|
||||||
extern char history_file[];
|
extern char history_file[];
|
||||||
#endif /* HAVE_GNUREADLINE */
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_BSDEDITLINE
|
#ifdef HAVE_BSDEDITLINE
|
||||||
/* SJB added edit line support 2005-05-05 */
|
|
||||||
#include <editline/readline.h>
|
#include <editline/readline.h>
|
||||||
extern char history_file[];
|
extern char history_file[];
|
||||||
#endif /* HAVE_BSDEDITLINE */
|
#endif
|
||||||
|
|
||||||
extern IFsimulator SIMinfo;
|
extern IFsimulator SIMinfo;
|
||||||
static void byemesg(void);
|
static void byemesg(void);
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
com_quit(wordlist *wl)
|
com_quit(wordlist *wl)
|
||||||
{
|
{
|
||||||
|
|
@ -39,12 +39,13 @@ com_quit(wordlist *wl)
|
||||||
bool noask;
|
bool noask;
|
||||||
|
|
||||||
noask = cp_getvar("noaskquit", CP_BOOL, NULL);
|
noask = cp_getvar("noaskquit", CP_BOOL, NULL);
|
||||||
|
|
||||||
gr_clean();
|
gr_clean();
|
||||||
cp_ccon(FALSE);
|
cp_ccon(FALSE);
|
||||||
|
|
||||||
if(wl)
|
if(wl)
|
||||||
if(wl->wl_word)
|
if(wl->wl_word)
|
||||||
if(cieq(wl->wl_word,"noask"))
|
if(cieq(wl->wl_word, "noask")) {
|
||||||
{
|
|
||||||
byemesg();
|
byemesg();
|
||||||
exit(EXIT_NORMAL);
|
exit(EXIT_NORMAL);
|
||||||
}
|
}
|
||||||
|
|
@ -65,8 +66,7 @@ com_quit(wordlist *wl)
|
||||||
(ncc > 1) ? "s are" : " is");
|
(ncc > 1) ? "s are" : " is");
|
||||||
for (cc = ft_circuits; cc; cc = cc->ci_next)
|
for (cc = ft_circuits; cc; cc = cc->ci_next)
|
||||||
if (cc->ci_inprogress)
|
if (cc->ci_inprogress)
|
||||||
fprintf(cp_out, "\t%s\n",
|
fprintf(cp_out, "\t%s\n", cc->ci_name);
|
||||||
cc->ci_name);
|
|
||||||
}
|
}
|
||||||
if (npl) {
|
if (npl) {
|
||||||
if (ncc)
|
if (ncc)
|
||||||
|
|
@ -77,22 +77,23 @@ com_quit(wordlist *wl)
|
||||||
for (pl = plot_list; pl; pl = pl->pl_next)
|
for (pl = plot_list; pl; pl = pl->pl_next)
|
||||||
if (!pl->pl_written && pl->pl_dvecs)
|
if (!pl->pl_written && pl->pl_dvecs)
|
||||||
fprintf(cp_out, "%s\t%s, %s\n",
|
fprintf(cp_out, "%s\t%s, %s\n",
|
||||||
pl->pl_typename,
|
pl->pl_typename, pl->pl_title, pl->pl_name);
|
||||||
pl->pl_title,
|
|
||||||
pl->pl_name);
|
|
||||||
}
|
}
|
||||||
fprintf(cp_out,
|
|
||||||
"\nAre you sure you want to quit (yes)? ");
|
fprintf(cp_out, "\nAre you sure you want to quit (yes)? ");
|
||||||
(void) fflush(cp_out);
|
(void) fflush(cp_out);
|
||||||
|
|
||||||
if (!fgets(buf, sizeof(buf), stdin)) {
|
if (!fgets(buf, sizeof(buf), stdin)) {
|
||||||
clearerr(stdin);
|
clearerr(stdin);
|
||||||
*buf = 'y';
|
*buf = 'y';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((*buf == 'y') || (*buf == 'Y') || (*buf == '\n')) {
|
if ((*buf == 'y') || (*buf == 'Y') || (*buf == '\n')) {
|
||||||
#ifdef EXPERIMENTAL_CODE
|
#ifdef EXPERIMENTAL_CODE
|
||||||
/* Destroy CKT when quit. Add by Gong Ding, gdiso@ustc.edu */
|
/* Destroy CKT when quit. Add by Gong Ding, gdiso@ustc.edu */
|
||||||
for (cc = ft_circuits; cc; cc = cc->ci_next)
|
for (cc = ft_circuits; cc; cc = cc->ci_next)
|
||||||
if(SIMinfo.deleteCircuit) SIMinfo.deleteCircuit(cc->ci_ckt);
|
if(SIMinfo.deleteCircuit)
|
||||||
|
SIMinfo.deleteCircuit(cc->ci_ckt);
|
||||||
#endif
|
#endif
|
||||||
byemesg();
|
byemesg();
|
||||||
}
|
}
|
||||||
|
|
@ -105,7 +106,6 @@ com_quit(wordlist *wl)
|
||||||
byemesg();
|
byemesg();
|
||||||
|
|
||||||
exit(EXIT_NORMAL);
|
exit(EXIT_NORMAL);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -122,6 +122,7 @@ com_bug(wordlist *wl)
|
||||||
fprintf(cp_err, "Error: No address to send bug reports to.\n");
|
fprintf(cp_err, "Error: No address to send bug reports to.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(cp_out, "Calling the mail program . . .(sending to %s)\n\n",
|
fprintf(cp_out, "Calling the mail program . . .(sending to %s)\n\n",
|
||||||
Bug_Addr);
|
Bug_Addr);
|
||||||
fprintf(cp_out,
|
fprintf(cp_out,
|
||||||
|
|
@ -133,11 +134,11 @@ com_bug(wordlist *wl)
|
||||||
(void) sprintf(buf, SYSTEM_MAIL, ft_sim->simulator,
|
(void) sprintf(buf, SYSTEM_MAIL, ft_sim->simulator,
|
||||||
ft_sim->version, Bug_Addr);
|
ft_sim->version, Bug_Addr);
|
||||||
(void) system(buf);
|
(void) system(buf);
|
||||||
|
|
||||||
fprintf(cp_out, "Bug report sent. Thank you.\n");
|
fprintf(cp_out, "Bug report sent. Thank you.\n");
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#else /* SYSTEM_MAIL */
|
#else
|
||||||
|
|
||||||
void
|
void
|
||||||
com_bug(wordlist *wl)
|
com_bug(wordlist *wl)
|
||||||
|
|
@ -146,23 +147,26 @@ com_bug(wordlist *wl)
|
||||||
|
|
||||||
fprintf(cp_out, "Please use the ngspice bug tracker at:\n");
|
fprintf(cp_out, "Please use the ngspice bug tracker at:\n");
|
||||||
fprintf(cp_out, "http://sourceforge.net/tracker/?group_id=38962&atid=423915\n");
|
fprintf(cp_out, "http://sourceforge.net/tracker/?group_id=38962&atid=423915\n");
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* SYSTEM_MAIL */
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* printout upon startup or 'version' command. options to version are -s (short)
|
/* printout upon startup or 'version' command. options to version are -s (short)
|
||||||
or -f (full). 'version' with options may also be used in ngspice pipe mode. */
|
or -f (full). 'version' with options may also be used in ngspice pipe mode. */
|
||||||
|
|
||||||
void
|
void
|
||||||
com_version(wordlist *wl)
|
com_version(wordlist *wl)
|
||||||
{
|
{
|
||||||
char *s;
|
char *s;
|
||||||
|
|
||||||
if (!wl) {
|
if (!wl) {
|
||||||
/* no printout in pipe mode (-p) */
|
|
||||||
if (ft_pipemode) return;
|
|
||||||
fprintf(cp_out, "******\n");
|
|
||||||
|
|
||||||
|
/* no printout in pipe mode (-p) */
|
||||||
|
if (ft_pipemode)
|
||||||
|
return;
|
||||||
|
|
||||||
|
fprintf(cp_out, "******\n");
|
||||||
fprintf(cp_out, "** %s-%s : %s\n", ft_sim->simulator,
|
fprintf(cp_out, "** %s-%s : %s\n", ft_sim->simulator,
|
||||||
ft_sim->version, ft_sim->description);
|
ft_sim->version, ft_sim->description);
|
||||||
fprintf(cp_out, "** The U. C. Berkeley CAD Group\n");
|
fprintf(cp_out, "** The U. C. Berkeley CAD Group\n");
|
||||||
|
|
@ -176,8 +180,11 @@ com_version(wordlist *wl)
|
||||||
fprintf(cp_out, "******\n");
|
fprintf(cp_out, "******\n");
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
s = wl_flatten(wl);
|
s = wl_flatten(wl);
|
||||||
|
|
||||||
if (!strncmp(s, "-s", 2) || !strncmp(s, "-S", 2) ) {
|
if (!strncmp(s, "-s", 2) || !strncmp(s, "-S", 2) ) {
|
||||||
|
|
||||||
fprintf(cp_out, "******\n");
|
fprintf(cp_out, "******\n");
|
||||||
fprintf(cp_out, "** %s-%s\n", ft_sim->simulator,
|
fprintf(cp_out, "** %s-%s\n", ft_sim->simulator,
|
||||||
ft_sim->version);
|
ft_sim->version);
|
||||||
|
|
@ -187,6 +194,7 @@ com_version(wordlist *wl)
|
||||||
if (Spice_Build_Date != NULL && *Spice_Build_Date != 0)
|
if (Spice_Build_Date != NULL && *Spice_Build_Date != 0)
|
||||||
fprintf(cp_out, "** Creation Date: %s\n", Spice_Build_Date);
|
fprintf(cp_out, "** Creation Date: %s\n", Spice_Build_Date);
|
||||||
fprintf(cp_out, "******\n");
|
fprintf(cp_out, "******\n");
|
||||||
|
|
||||||
} else if (!strncmp(s, "-f", 2) || !strncmp(s, "-F", 2) ) {
|
} else if (!strncmp(s, "-f", 2) || !strncmp(s, "-F", 2) ) {
|
||||||
|
|
||||||
fprintf(cp_out, "******\n");
|
fprintf(cp_out, "******\n");
|
||||||
|
|
@ -249,15 +257,18 @@ com_version(wordlist *wl)
|
||||||
fprintf(cp_out, "******\n");
|
fprintf(cp_out, "******\n");
|
||||||
|
|
||||||
} else if (!eq(ft_sim->version, s)) {
|
} else if (!eq(ft_sim->version, s)) {
|
||||||
|
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"Note: rawfile is version %s (current version is %s)\n",
|
"Note: rawfile is version %s (current version is %s)\n",
|
||||||
wl->wl_word, ft_sim->version);
|
wl->wl_word, ft_sim->version);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tfree(s);
|
tfree(s);
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
byemesg(void)
|
byemesg(void)
|
||||||
{
|
{
|
||||||
|
|
@ -268,8 +279,7 @@ byemesg(void)
|
||||||
stifle_history(cp_maxhistlength);
|
stifle_history(cp_maxhistlength);
|
||||||
write_history(history_file);
|
write_history(history_file);
|
||||||
}
|
}
|
||||||
#endif /* defined(HAVE_GNUREADLINE) || defined(HAVE_BSDEDITLINE) */
|
#endif
|
||||||
|
|
||||||
printf("%s-%s done\n", ft_sim->simulator, ft_sim->version);
|
printf("%s-%s done\n", ft_sim->simulator, ft_sim->version);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue