use 10 X for mktemp(1)

diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index 3659a1f..2a18a2a 100644 (file)
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: concatdb.sh,v 1.4 1997/01/03 23:33:48 millert Exp $
+# $OpenBSD: concatdb.sh,v 1.5 1997/04/02 08:34:59 deraadt Exp $
 #
 # Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 # All rights reserved.
@@ -32,7 +32,7 @@
 #
 # Sequence of databases is important.
 #
-# $Id: concatdb.sh,v 1.4 1997/01/03 23:33:48 millert Exp $
+# $Id: concatdb.sh,v 1.5 1997/04/02 08:34:59 deraadt Exp $
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR=/usr/libexec}; export LIBEXECDIR
@@ -58,7 +58,7 @@ case $# in
                ;;
 esac
 
-bigrams=`mktemp ${TMPDIR=/tmp}/_bigrams.XXXXXX` || exit 1
+bigrams=`mktemp ${TMPDIR=/tmp}/_bigrams.XXXXXXXXXX` || exit 1
 
 trap 'rm -f $bigrams' 0 1 2 3 5 10 15
 

diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index 37bd7cd..2da091e 100644 (file)
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $OpenBSD: mklocatedb.sh,v 1.4 1997/01/03 23:33:49 millert Exp $
+#      $OpenBSD: mklocatedb.sh,v 1.5 1997/04/02 08:35:00 deraadt Exp $
 #
 # Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 # All rights reserved.
@@ -30,7 +30,7 @@
 # 
 # usage: mklocatedb [-presort] < filelist > database
 #
-# $Id: mklocatedb.sh,v 1.4 1997/01/03 23:33:49 millert Exp $
+# $Id: mklocatedb.sh,v 1.5 1997/04/02 08:35:00 deraadt Exp $
 
 
 # The directory containing locate subprograms
@@ -58,9 +58,9 @@ case X"$1" in
        X-nosort|X-presort) sortcmd=cat; sortopt=;shift;; 
 esac
 
-bigrams=`mktemp ${TMPDIR=/tmp}/_bigrams.XXXXXX` || exit 1
+bigrams=`mktemp ${TMPDIR=/tmp}/_bigrams.XXXXXXXXXX` || exit 1
 trap 'rm -f $bigrams' 0 1 2 3 5 10 15
-filelist=`mktemp ${TMPDIR=/tmp}/_filelist.XXXXXX` || exit 1
+filelist=`mktemp ${TMPDIR=/tmp}/_filelist.XXXXXXXXXX` || exit 1
 trap 'rm -f $bigrams $filelist' 0 1 2 3 5 10 15
 
 if $sortcmd $sortopt > $filelist; then

diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index 6f4d05d..41ccb00 100644 (file)
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $OpenBSD: updatedb.sh,v 1.7 1997/01/04 01:36:01 millert Exp $
+#      $OpenBSD: updatedb.sh,v 1.8 1997/04/02 08:35:01 deraadt Exp $
 #
 # Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 # All rights reserved.
@@ -28,7 +28,7 @@
 #
 # updatedb - update locate database for local mounted filesystems
 #
-# $Id: updatedb.sh,v 1.7 1997/01/04 01:36:01 millert Exp $
+# $Id: updatedb.sh,v 1.8 1997/04/02 08:35:01 deraadt Exp $
 
 LOCATE_CONFIG="/etc/locate.rc"
 if [ -f "$LOCATE_CONFIG" -a -r "$LOCATE_CONFIG" ]; then
@@ -45,7 +45,7 @@ USAGE="Usage: $0 [--tmpdir=dir] [--fcodes=dbfile] [--searchpaths='dir1 dir2...']
 
 : ${mklocatedb=locate.mklocatedb}       # make locate database program
 : ${FCODES=/var/db/locate.database}     # the database
-: ${SEARCHPATHS="/"}           # directories to be put in the database
+: ${SEARCHPATHS="/"}                    # directories to be put in the database
 : ${PRUNEPATHS="/tmp /usr/tmp /var/tmp"} # unwanted directories
 : ${FILESYSTEMS="ffs"}                  # allowed filesystems 
 : ${find=find}
@@ -93,7 +93,7 @@ case X"$PRUNEPATHS" in
           done;;
 esac
 
-tmp=`mktemp ${TMPDIR=/tmp}/_updatedb.XXXXXX` || exit 1
+tmp=`mktemp ${TMPDIR=/tmp}/_updatedb.XXXXXXXXXX` || exit 1
 trap 'rm -rf $tmp' 0 1 2 3 5 10 15
                
 # search locally