aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sbin/bsdlabel/bsdlabel.c2
-rw-r--r--sbin/bsdlabel/pathnames.h5
-rw-r--r--sbin/disklabel/disklabel.c2
-rw-r--r--sbin/disklabel/pathnames.h5
4 files changed, 6 insertions, 8 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index 8e579da784a1..3918ff921e1c 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -113,7 +113,7 @@ struct disklabel * getvirginlabel __P((void));
char *dkname;
char *specname;
-char tmpfil[] = _PATH_TMP;
+char tmpfil[] = PATH_TMPFILE;
char namebuf[BBSIZE], *np = namebuf;
struct disklabel lab;
diff --git a/sbin/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h
index a24bdefe68d1..1b734e61e5db 100644
--- a/sbin/bsdlabel/pathnames.h
+++ b/sbin/bsdlabel/pathnames.h
@@ -30,11 +30,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)pathnames.h 8.1 (Berkeley) 6/5/93
+ * $FreeBSD$
*/
#include <paths.h>
#define _PATH_BOOTDIR "/boot"
-#undef _PATH_TMP
-#define _PATH_TMP "/tmp/EdDk.aXXXXXX"
+#define PATH_TMPFILE "/tmp/dlblXXXXXXXXXX"
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 8e579da784a1..3918ff921e1c 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -113,7 +113,7 @@ struct disklabel * getvirginlabel __P((void));
char *dkname;
char *specname;
-char tmpfil[] = _PATH_TMP;
+char tmpfil[] = PATH_TMPFILE;
char namebuf[BBSIZE], *np = namebuf;
struct disklabel lab;
diff --git a/sbin/disklabel/pathnames.h b/sbin/disklabel/pathnames.h
index a24bdefe68d1..1b734e61e5db 100644
--- a/sbin/disklabel/pathnames.h
+++ b/sbin/disklabel/pathnames.h
@@ -30,11 +30,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)pathnames.h 8.1 (Berkeley) 6/5/93
+ * $FreeBSD$
*/
#include <paths.h>
#define _PATH_BOOTDIR "/boot"
-#undef _PATH_TMP
-#define _PATH_TMP "/tmp/EdDk.aXXXXXX"
+#define PATH_TMPFILE "/tmp/dlblXXXXXXXXXX"