summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>1996-09-16 02:19:37 +0000
committermillert <millert@openbsd.org>1996-09-16 02:19:37 +0000
commit5641d43a4a074418bbbaa61a7434c118afd7256b (patch)
treefb178b885c029275c444cf96c05852ff63669bd0
parentuse mkstemp correctly (diff)
downloadwireguard-openbsd-5641d43a4a074418bbbaa61a7434c118afd7256b.tar.xz
wireguard-openbsd-5641d43a4a074418bbbaa61a7434c118afd7256b.zip
_PATH_TMP -> _PATH_TMPFILE
-rw-r--r--sbin/disklabel/disklabel.c6
-rw-r--r--sbin/disklabel/pathnames.h5
-rw-r--r--usr.sbin/edquota/edquota.c4
-rw-r--r--usr.sbin/edquota/pathnames.h5
4 files changed, 9 insertions, 11 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 41112c8ef5c..e9490a2fb5b 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.c,v 1.15 1996/08/10 12:14:19 deraadt Exp $ */
+/* $OpenBSD: disklabel.c,v 1.16 1996/09/16 02:21:59 millert Exp $ */
/* $NetBSD: disklabel.c,v 1.30 1996/03/14 19:49:24 ghudson Exp $ */
/*
@@ -48,7 +48,7 @@ static char copyright[] =
/* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */
static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 1/7/94";
#else
-static char rcsid[] = "$OpenBSD: disklabel.c,v 1.15 1996/08/10 12:14:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: disklabel.c,v 1.16 1996/09/16 02:21:59 millert Exp $";
#endif
#endif /* not lint */
@@ -95,7 +95,7 @@ static char rcsid[] = "$OpenBSD: disklabel.c,v 1.15 1996/08/10 12:14:19 deraadt
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 ac7f49ad88f..5c15fbd8377 100644
--- a/sbin/disklabel/pathnames.h
+++ b/sbin/disklabel/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.2 1996/06/23 14:30:06 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.3 1996/09/16 02:21:58 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.6 1995/03/18 14:54:43 cgd Exp $ */
/*
@@ -39,5 +39,4 @@
#include <paths.h>
#define _PATH_BOOTDIR "/usr/mdec"
-#undef _PATH_TMP
-#define _PATH_TMP "/tmp/EdDk.aXXXXXX"
+#define _PATH_TMPFILE "/tmp/EdDk.aXXXXXX"
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index fde69f5d6ce..b1e2af1c6c3 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -42,7 +42,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)edquota.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: edquota.c,v 1.12 1996/09/01 01:41:44 deraadt Exp $";
+static char *rcsid = "$Id: edquota.c,v 1.13 1996/09/16 02:19:37 millert Exp $";
#endif /* not lint */
/*
@@ -67,7 +67,7 @@ static char *rcsid = "$Id: edquota.c,v 1.12 1996/09/01 01:41:44 deraadt Exp $";
char *qfname = QUOTAFILENAME;
char *qfextension[] = INITQFNAMES;
char *quotagroup = QUOTAGROUP;
-char tmpfil[] = _PATH_TMP;
+char tmpfil[] = _PATH_TMPFILE;
struct quotause {
struct quotause *next;
diff --git a/usr.sbin/edquota/pathnames.h b/usr.sbin/edquota/pathnames.h
index b524d484093..579274e387f 100644
--- a/usr.sbin/edquota/pathnames.h
+++ b/usr.sbin/edquota/pathnames.h
@@ -31,10 +31,9 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 8.1 (Berkeley) 6/6/93
- * $Id: pathnames.h,v 1.1.1.1 1995/10/18 08:47:33 deraadt Exp $
+ * $Id: pathnames.h,v 1.2 1996/09/16 02:19:38 millert Exp $
*/
#include <paths.h>
-#undef _PATH_TMP
-#define _PATH_TMP "/tmp/EdP.aXXXXX"
+#define _PATH_TMPFILE "/tmp/EdP.aXXXXX"