d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use mkstemp rather than mktemp to prevent a small race.

Browse Source 
Obtained from: OpenBSD
This commit is contained in:
Warner Losh 1997-03-24 05:44:28 +00:00
parent 7d951713e8
commit 722ceb3f84
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sbin/bsdlabel/bsdlabel.c
View File

@ -800,36 +800,36 @@ edit(lp, f)
struct disklabel *lp;
int f;
{
register int c;
register int c, fd;
struct disklabel label;
FILE *fd;
FILE *fp;
(void) mktemp(tmpfil);
fd = fopen(tmpfil, "w");
if (fd == NULL) {
if ((fd = mkstemp(tmpfil)) == -1 ||
(fp = fdopen(fd, "w")) == NULL) {
fprintf(stderr, "%s: Can't create\n", tmpfil);
return (1);
}
(void)fchmod(fileno(fd), 0600);
display(fd, lp);
fclose(fd);
display(fp, lp);
fclose(fp);
for (;;) {
if (!editit())
break;
fd = fopen(tmpfil, "r");
if (fd == NULL) {
fp = fopen(tmpfil, "r");
if (fp == NULL) {
fprintf(stderr, "%s: Can't reopen for reading\n",
tmpfil);
break;
}
bzero((char *)&label, sizeof(label));
if (getasciilabel(fd, &label)) {
if (getasciilabel(fp, &label)) {
*lp = label;
if (writelabel(f, bootarea, lp) == 0) {
fclose(fp);
(void) unlink(tmpfil);
return (0);
}
}
fclose(fp);
printf("re-edit the label? [y]: "); fflush(stdout);
c = getchar();
if (c != EOF && c != (int)'\n')

22
sbin/disklabel/disklabel.c
View File

@ -800,36 +800,36 @@ edit(lp, f)
struct disklabel *lp;
int f;
{
register int c;
register int c, fd;
struct disklabel label;
FILE *fd;
FILE *fp;
(void) mktemp(tmpfil);
fd = fopen(tmpfil, "w");
if (fd == NULL) {
if ((fd = mkstemp(tmpfil)) == -1 ||
(fp = fdopen(fd, "w")) == NULL) {
fprintf(stderr, "%s: Can't create\n", tmpfil);
return (1);
}
(void)fchmod(fileno(fd), 0600);
display(fd, lp);
fclose(fd);
display(fp, lp);
fclose(fp);
for (;;) {
if (!editit())
break;
fd = fopen(tmpfil, "r");
if (fd == NULL) {
fp = fopen(tmpfil, "r");
if (fp == NULL) {
fprintf(stderr, "%s: Can't reopen for reading\n",
tmpfil);
break;
}
bzero((char *)&label, sizeof(label));
if (getasciilabel(fd, &label)) {
if (getasciilabel(fp, &label)) {
*lp = label;
if (writelabel(f, bootarea, lp) == 0) {
fclose(fp);
(void) unlink(tmpfil);
return (0);
}
}
fclose(fp);
printf("re-edit the label? [y]: "); fflush(stdout);
c = getchar();
if (c != EOF && c != (int)'\n')