Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try $TMPDIR before resorting to _PATH_TMP.

This commit is contained in:
kleink 1999-07-21 17:56:34 +00:00
parent e9ac36eda7
commit 03f1e83295
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/disklabel/disklabel.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disklabel.c,v 1.73 1999/06/04 19:02:34 is Exp $ */
/* $NetBSD: disklabel.c,v 1.74 1999/07/21 17:56:34 kleink Exp $ */
/*
* Copyright (c) 1987, 1993
@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
static char sccsid[] = "@(#)disklabel.c 8.4 (Berkeley) 5/4/95";
/* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */
#else
__RCSID("$NetBSD: disklabel.c,v 1.73 1999/06/04 19:02:34 is Exp $");
__RCSID("$NetBSD: disklabel.c,v 1.74 1999/07/21 17:56:34 kleink Exp $");
#endif
#endif /* not lint */
@ -103,7 +103,7 @@ extern char *__progname;
static char *dkname;
static char *specname;
static char tmpfil[] = _PATH_TMP;
static char tmpfil[MAXPATHLEN];
static char namebuf[BBSIZE], *np = namebuf;
static struct disklabel lab;
@ -1253,8 +1253,12 @@ edit(lp, f)
{
int first, ch, fd;
struct disklabel label;
const char *tmpdir;
FILE *fp;
if ((tmpdir = getenv("TMPDIR")) == NULL)
tmpdir = _PATH_TMP;
(void)snprintf(tmpfil, sizeof (tmpfil), "%s/%s", tmpdir, TMPFILE);
if ((fd = mkstemp(tmpfil)) == -1 || (fp = fdopen(fd, "w")) == NULL) {
warn("%s", tmpfil);
return (1);

5
sbin/disklabel/pathnames.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pathnames.h,v 1.6 1995/03/18 14:54:43 cgd Exp $ */
/* $NetBSD: pathnames.h,v 1.7 1999/07/21 17:56:34 kleink Exp $ */
/*
* Copyright (c) 1989, 1993
@ -38,5 +38,4 @@
#include <paths.h>
#define _PATH_BOOTDIR "/usr/mdec"
#undef _PATH_TMP
#define _PATH_TMP "/tmp/EdDk.aXXXXXX"
#define TMPFILE "EdDk.aXXXXXX"