folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Avoid using tempnam() to produce OS component of SHOW VERSION output

Browse source
This commit is contained in:
Mark Pizzolato 2016-02-11 09:47:02 -08:00
parent 7f1291dac8
commit 5eb6750800
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scp.c
View file

@ -4377,48 +4377,36 @@ if (flag) {
char *proc_level = getenv ("PROCESSOR_LEVEL"); char *proc_level = getenv ("PROCESSOR_LEVEL");
char *proc_rev = getenv ("PROCESSOR_REVISION"); char *proc_rev = getenv ("PROCESSOR_REVISION");
char *proc_arch3264 = getenv ("PROCESSOR_ARCHITEW6432"); char *proc_arch3264 = getenv ("PROCESSOR_ARCHITEW6432");
char *tmpnam = _tempnam (NULL, "simh-ver");
char vercmd[PATH_MAX+1];
char osversion[PATH_MAX+1] = ""; char osversion[PATH_MAX+1] = "";
FILE *f; FILE *f;
sprintf (vercmd, "ver >%s", tmpnam); if ((f = _popen ("ver", "r"))) {
system (vercmd);
if ((f = fopen (tmpnam, "r"))) {
memset (osversion, 0, sizeof(osversion)); memset (osversion, 0, sizeof(osversion));
do { do {
if (NULL == fgets (osversion, sizeof(osversion)-1, f)) if (NULL == fgets (osversion, sizeof(osversion)-1, f))
break; break;
sim_trim_endspc (osversion); sim_trim_endspc (osversion);
} while (osversion[0] == '\0'); } while (osversion[0] == '\0');
fclose (f); _pclose (f);
} }
remove (tmpnam);
free (tmpnam);
fprintf (st, "\n\t\tOS: %s", osversion); fprintf (st, "\n\t\tOS: %s", osversion);
fprintf (st, "\n\t\tArchitecture: %s%s%s, Processors: %s", arch, proc_arch3264 ? " on " : "", proc_arch3264 ? proc_arch3264 : "", procs); fprintf (st, "\n\t\tArchitecture: %s%s%s, Processors: %s", arch, proc_arch3264 ? " on " : "", proc_arch3264 ? proc_arch3264 : "", procs);
fprintf (st, "\n\t\tProcessor Id: %s, Level: %s, Revision: %s", proc_id ? proc_id : "", proc_level ? proc_level : "", proc_rev ? proc_rev : ""); fprintf (st, "\n\t\tProcessor Id: %s, Level: %s, Revision: %s", proc_id ? proc_id : "", proc_level ? proc_level : "", proc_rev ? proc_rev : "");
} }
#else #else
if (1) { if (1) {
char *tmpnam = tempnam (NULL, "simh-ver");
char vercmd[2*PATH_MAX+1];
char osversion[2*PATH_MAX+1] = ""; char osversion[2*PATH_MAX+1] = "";
FILE *f; FILE *f;
sprintf (vercmd, "uname -a >%s", tmpnam); if ((f = popen ("uname -a", "r"))) {
system (vercmd);
if ((f = fopen (tmpnam, "r"))) {
memset (osversion, 0, sizeof(osversion)); memset (osversion, 0, sizeof(osversion));
do { do {
if (NULL == fgets (osversion, sizeof(osversion)-1, f)) if (NULL == fgets (osversion, sizeof(osversion)-1, f))
break; break;
sim_trim_endspc (osversion); sim_trim_endspc (osversion);
} while (osversion[0] == '\0'); } while (osversion[0] == '\0');
fclose (f); pclose (f);
} }
remove (tmpnam);
free (tmpnam);
fprintf (st, "\n\t\tOS: %s", osversion); fprintf (st, "\n\t\tOS: %s", osversion);
} }
#endif #endif