From: deraadt <deraadt@openbsd.org>
Date: Fri, 4 Apr 1997 18:41:25 +0000 (+0000)
Subject: when mktemp() is hard to fix, use 10 X
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6c93ddcf4c0525a3dd60a895d909e19e6be9f563;p=openbsd

when mktemp() is hard to fix, use 10 X
---

diff --git a/bin/df/df.c b/bin/df/df.c
index 307fe8df0ec..cd5ce73c468 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: df.c,v 1.7 1996/12/24 20:04:14 deraadt Exp $	*/
+/*	$OpenBSD: df.c,v 1.8 1997/04/04 18:41:25 deraadt Exp $	*/
 /*	$NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $	*/
 
 /*
@@ -49,7 +49,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)df.c	8.7 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: df.c,v 1.7 1996/12/24 20:04:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: df.c,v 1.8 1997/04/04 18:41:25 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -136,7 +136,7 @@ main(argc, argv)
 			} else if (S_ISBLK(stbuf.st_mode)) {
 				if ((mntpt = getmntpt(*argv)) == 0) {
 					/* XXX can be DOS'd, not very important */
-					mntpt = mktemp(strdup("/tmp/df.XXXXXX"));
+					mntpt = mktemp(strdup("/tmp/df.XXXXXXXXXX"));
 					mdev.fspec = *argv;
 					if (mkdir(mntpt, DEFFILEMODE) != 0) {
 						warn("%s", mntpt);
diff --git a/libexec/mail.local/mail.local.c b/libexec/mail.local/mail.local.c
index a1d38550953..e216ba3ed83 100644
--- a/libexec/mail.local/mail.local.c
+++ b/libexec/mail.local/mail.local.c
@@ -39,7 +39,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)mail.local.c	5.6 (Berkeley) 6/19/91";*/
-static char rcsid[] = "$Id: mail.local.c,v 1.14 1997/03/29 02:59:56 millert Exp $";
+static char rcsid[] = "$Id: mail.local.c,v 1.15 1997/04/04 18:41:27 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -231,7 +231,7 @@ baditem(path)
 
 	if (unlink(path) == 0)
 		return;
-	snprintf(npath, sizeof npath, "%s/XXXXXXXXX", _PATH_MAILDIR);
+	snprintf(npath, sizeof npath, "%s/mailXXXXXXXXXX", _PATH_MAILDIR);
 	if (mktemp(npath) == NULL)
 		return;
 	if (rename(path, npath) != -1)
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index dd5bc976f30..dc7f0d3dff5 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pathnames.h,v 1.3 1996/08/22 00:35:02 deraadt Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.4 1997/04/04 18:41:29 deraadt Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.6 1995/09/29 00:27:55 cgd Exp $	*/
 
 /*
@@ -50,7 +50,7 @@
 #endif
 
 #if defined(unix) || defined(__NetBSD__) || defined(__OpenBSD__)
-#define _PATH_DIVNAME	"/tmp/m4.0XXXXXX"	/* unix diversion files */
+#define _PATH_DIVNAME	"/tmp/m4.0XXXXXXXXXX"	/* unix diversion files */
 #define UNIQUE		8			/* unique char location */
 #endif
 
diff --git a/usr.bin/oldrdist/main.c b/usr.bin/oldrdist/main.c
index d063103e98a..a4cd0a3f80f 100644
--- a/usr.bin/oldrdist/main.c
+++ b/usr.bin/oldrdist/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.6 1996/09/16 16:38:28 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.7 1997/04/04 18:41:31 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: main.c,v 1.6 1996/09/16 16:38:28 millert Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.7 1997/04/04 18:41:31 deraadt Exp $";
 #endif /* not lint */
 
 #include "defs.h"
@@ -53,7 +53,7 @@ static char *rcsid = "$OpenBSD: main.c,v 1.6 1996/09/16 16:38:28 millert Exp $";
  */
 
 char	*distfile = NULL;
-#define _RDIST_TMP	"rdistXXXXXX"
+#define _RDIST_TMP	"rdistXXXXXXXXXX"
 char	tempfile[sizeof _PATH_TMP + sizeof _RDIST_TMP + 1];
 char	*tempname;
 
diff --git a/usr.bin/tn3270/sys_curses/system.c b/usr.bin/tn3270/sys_curses/system.c
index 3137c43aefd..46668849160 100644
--- a/usr.bin/tn3270/sys_curses/system.c
+++ b/usr.bin/tn3270/sys_curses/system.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: system.c,v 1.3 1996/12/06 02:09:04 deraadt Exp $	*/
+/*	$OpenBSD: system.c,v 1.4 1997/04/04 18:41:33 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)system.c	4.5 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: system.c,v 1.3 1996/12/06 02:09:04 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: system.c,v 1.4 1997/04/04 18:41:33 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -643,7 +643,7 @@ char	*argv[];
 
     /* First, create verification file. */
     do {
-	keyname = mktemp(strdup("/tmp/apiXXXXXX"));
+	keyname = mktemp(strdup("/tmp/apiXXXXXXXXXX"));
 	fd = open(keyname, O_RDWR|O_CREAT|O_EXCL, IREAD|IWRITE);
     } while ((fd == -1) && (errno == EEXIST));
 
diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c
index 17c3f465b8d..3e826726c27 100644
--- a/usr.bin/xlint/xlint/xlint.c
+++ b/usr.bin/xlint/xlint/xlint.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xlint.c,v 1.4 1996/11/13 17:43:48 michaels Exp $	*/
+/*	$OpenBSD: xlint.c,v 1.5 1997/04/04 18:41:36 deraadt Exp $	*/
 /*	$NetBSD: xlint.c,v 1.3 1995/10/23 14:29:30 jpo Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: xlint.c,v 1.4 1996/11/13 17:43:48 michaels Exp $";
+static char rcsid[] = "$OpenBSD: xlint.c,v 1.5 1997/04/04 18:41:36 deraadt Exp $";
 #endif
 
 #include <sys/param.h>
@@ -303,8 +303,8 @@ main(argc, argv)
 		tmpdir = s;
 	}
 
-	cppout = xmalloc(strlen(tmpdir) + sizeof ("lint0.XXXXXX"));
-	(void)sprintf(cppout, "%slint0.XXXXXX", tmpdir);
+	cppout = xmalloc(strlen(tmpdir) + sizeof ("lint0.XXXXXXXXXX"));
+	(void)sprintf(cppout, "%slint0.XXXXXXXXXX", tmpdir);
 	if (mktemp(cppout) == NULL) {
 		warn("can't make temp");
 		terminate(-1);
@@ -556,8 +556,8 @@ fname(name, last)
 		(void)sprintf(ofn, "%.*s", (int)len, bn);
 		(void)strcat(ofn, ".ln");
 	} else {
-		ofn = xmalloc(strlen(tmpdir) + sizeof ("lint1.XXXXXX"));
-		(void)sprintf(ofn, "%slint1.XXXXXX", tmpdir);
+		ofn = xmalloc(strlen(tmpdir) + sizeof ("lint1.XXXXXXXXXX"));
+		(void)sprintf(ofn, "%slint1.XXXXXXXXXX", tmpdir);
 		if (mktemp(ofn) == NULL) {
 			warn("can't make temp");
 			terminate(-1);
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 406fad58a66..3ced574d390 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.6 1997/01/14 04:47:08 tholo Exp $	*/
+/*	$OpenBSD: main.c,v 1.7 1997/04/04 18:41:38 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.5 1996/03/19 03:21:38 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.6 1997/01/14 04:47:08 tholo Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.7 1997/04/04 18:41:38 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -66,7 +66,7 @@ char vflag;
 char *symbol_prefix;
 char *file_prefix = "y";
 char *myname = "yacc";
-char *temp_form = "yacc.XXXXXXX";
+char *temp_form = "yacc.XXXXXXXXXX";
 
 int lineno;
 int outline;
diff --git a/usr.sbin/amd/mk-amd-map/mk-amd-map.c b/usr.sbin/amd/mk-amd-map/mk-amd-map.c
index df10c4fd1ac..0333f41ea7d 100644
--- a/usr.sbin/amd/mk-amd-map/mk-amd-map.c
+++ b/usr.sbin/amd/mk-amd-map/mk-amd-map.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)mk-amd-map.c	8.1 (Berkeley) 6/28/93
- *	$Id: mk-amd-map.c,v 1.2 1997/01/15 23:43:48 millert Exp $
+ *	$Id: mk-amd-map.c,v 1.3 1997/04/04 18:41:42 deraadt Exp $
  */
 
 /*
@@ -52,7 +52,7 @@ char copyright[] = "\
 #endif /* not lint */
 
 #ifndef lint
-static char rcsid[] = "$Id: mk-amd-map.c,v 1.2 1997/01/15 23:43:48 millert Exp $";
+static char rcsid[] = "$Id: mk-amd-map.c,v 1.3 1997/04/04 18:41:42 deraadt Exp $";
 static char sccsid[] = "@(#)mk-amd-map.c	8.1 (Berkeley) 6/28/93";
 #endif /* not lint */
 
@@ -234,7 +234,7 @@ char *argv[];
 	char *map;
 	int rc = 0;
 	DBM *mapd;
-	static char maptmp[] = "dbmXXXXXX";
+	static char maptmp[] = "dbmXXXXXXXXXX";
 	char maptpag[16];
 	char *mappag;
 #ifndef USING_DB
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 5c15e12b6fb..299e37aeca1 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printjob.c,v 1.10 1996/11/03 23:24:10 millert Exp $ */
+/*	$OpenBSD: printjob.c,v 1.11 1997/04/04 18:41:44 deraadt Exp $ */
 /*	$NetBSD: printjob.c,v 1.9.4.3 1996/07/12 22:31:39 jtc Exp $	*/
 
 /*
@@ -111,7 +111,7 @@ static char	length[10] = "-l";	/* page length in lines */
 static char	logname[32];		/* user's login name */
 static char	pxlength[10] = "-y";	/* page length in pixels */
 static char	pxwidth[10] = "-x";	/* page width in pixels */
-static char	tempfile[] = "errsXXXXXX"; /* file name for filter output */
+static char	tempfile[] = "errsXXXXXXXXXX"; /* file name for filter output */
 static char	width[10] = "-w";	/* page width in static characters */
 
 static void       abortpr __P((int));
diff --git a/usr.sbin/ypserv/makedbm/makedbm.c b/usr.sbin/ypserv/makedbm/makedbm.c
index 2a80257c9c0..3f902bdb606 100644
--- a/usr.sbin/ypserv/makedbm/makedbm.c
+++ b/usr.sbin/ypserv/makedbm/makedbm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: makedbm.c,v 1.6 1997/01/17 07:14:32 millert Exp $ */
+/*	$OpenBSD: makedbm.c,v 1.7 1997/04/04 18:41:46 deraadt Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: makedbm.c,v 1.6 1997/01/17 07:14:32 millert Exp $";
+static char rcsid[] = "$OpenBSD: makedbm.c,v 1.7 1997/04/04 18:41:46 deraadt Exp $";
 #endif
 
 #include <stdio.h>
@@ -185,7 +185,7 @@ create_database(infile,database,
 	char	*p,*k,*v;
 	char	*slash;
 	DBM	*new_db;
-	static	char mapname[] = "ypdbXXXXXX";
+	static	char mapname[] = "ypdbXXXXXXXXXX";
 	char	db_mapname[MAXPATHLEN],db_outfile[MAXPATHLEN],
 		db_tempname[MAXPATHLEN];
 	char	empty_str[] = "";