From 5347005ed02069c7d0aa49dd95d57f62c70c1e74 Mon Sep 17 00:00:00 2001 From: jdolecek Date: Mon, 19 Feb 2001 15:45:45 +0000 Subject: [PATCH] resurrect old ftmp() - it supports alternative directory for temporary file, which is needed for -T support --- usr.bin/sort/files.c | 18 ++-------- usr.bin/sort/sort.c | 8 +++-- usr.bin/sort/tmp.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 18 deletions(-) create mode 100644 usr.bin/sort/tmp.c diff --git a/usr.bin/sort/files.c b/usr.bin/sort/files.c index 04fc20c43e4c..f838e6fe14fe 100644 --- a/usr.bin/sort/files.c +++ b/usr.bin/sort/files.c @@ -1,4 +1,4 @@ -/* $NetBSD: files.c,v 1.14 2001/01/18 21:02:47 jdolecek Exp $ */ +/* $NetBSD: files.c,v 1.15 2001/02/19 15:45:45 jdolecek Exp $ */ /*- * Copyright (c) 1993 @@ -40,7 +40,7 @@ #include "fsort.h" #ifndef lint -__RCSID("$NetBSD: files.c,v 1.14 2001/01/18 21:02:47 jdolecek Exp $"); +__RCSID("$NetBSD: files.c,v 1.15 2001/02/19 15:45:45 jdolecek Exp $"); __SCCSID("@(#)files.c 8.1 (Berkeley) 6/6/93"); #endif /* not lint */ @@ -362,17 +362,3 @@ geteasy(flno, top, filelist, nfiles, rec, end, dummy2) fread(rec->data, rec->length, 1, fp); return (0); } - -/* - * Return pointer to an open file stream, err out on failure. - */ -FILE * -ftmp(void) -{ - FILE *fp = tmpfile(); - - if (fp == NULL) - err(2, "tmpfile()"); - - return fp; -} diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index 32fd64d84d86..730d14174dd2 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -1,4 +1,4 @@ -/* $NetBSD: sort.c,v 1.21 2001/02/07 20:58:09 jdolecek Exp $ */ +/* $NetBSD: sort.c,v 1.22 2001/02/19 15:45:45 jdolecek Exp $ */ /*- * Copyright (c) 1993 @@ -51,7 +51,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\ #endif /* not lint */ #ifndef lint -__RCSID("$NetBSD: sort.c,v 1.21 2001/02/07 20:58:09 jdolecek Exp $"); +__RCSID("$NetBSD: sort.c,v 1.22 2001/02/19 15:45:45 jdolecek Exp $"); __SCCSID("@(#)sort.c 8.1 (Berkeley) 6/6/93"); #endif /* not lint */ @@ -82,6 +82,8 @@ int stable_sort = 1; char toutpath[_POSIX_PATH_MAX]; +const char *tmpdir; /* where temporary files should be put */ + static void cleanup __P((void)); static void onsignal __P((int)); static void usage __P((const char *)); @@ -111,6 +113,8 @@ main(argc, argv) ftpos = fldtab; fixit(&argc, argv); + if (!(tmpdir = getenv("TMPDIR"))) + tmpdir = _PATH_TMP; while ((ch = getopt(argc, argv, "bcdfik:mHno:rR:sSt:T:ux")) != -1) { switch (ch) { diff --git a/usr.bin/sort/tmp.c b/usr.bin/sort/tmp.c new file mode 100644 index 000000000000..b4f6a60558e6 --- /dev/null +++ b/usr.bin/sort/tmp.c @@ -0,0 +1,84 @@ +/* $NetBSD: tmp.c,v 1.7 2001/02/19 15:45:45 jdolecek Exp $ */ + +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Peter McIlroy. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#ifndef lint +__RCSID("$NetBSD: tmp.c,v 1.7 2001/02/19 15:45:45 jdolecek Exp $"); +__SCCSID("@(#)tmp.c 8.1 (Berkeley) 6/6/93"); +#endif /* not lint */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "sort.h" +#include "pathnames.h" + +#define _NAME_TMP "sort.XXXXXXXX" + +FILE * +ftmp() +{ + sigset_t set, oset; + FILE *fp; + int fd; + char pathb[_POSIX_PATH_MAX], *path; + + path = pathb; + (void)snprintf(path, sizeof(pathb), "%s%s%s", tmpdir, + (tmpdir[strlen(tmpdir)-1] != '/') ? "/" : "", _NAME_TMP); + + sigfillset(&set); + (void)sigprocmask(SIG_BLOCK, &set, &oset); + if ((fd = mkstemp(path)) < 0) + err(2, "mkstemp(%s)", path); + if (!(fp = fdopen(fd, "w+"))) + err(2, "fdopen(%s)", path); + (void)unlink(path); + + (void)sigprocmask(SIG_SETMASK, &oset, NULL); + return (fp); +}