CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-02-21 06:42:02 +02:00
Code Issues Projects Releases Wiki Activity

maint: tac: remove sole use of sprintf in favor of filenamecat

Browse Source 
* src/tac.c: Include filenamecat.h.
(copy_to_temp): Use filenamecat rather than xmalloc and sprintf.
Move some declarations "down" to point of initialization.
This commit is contained in:
Jim Meyering
2011-10-16 10:35:56 +02:00
parent ead96f9ede
commit 60cd4c271d
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tac.c
View File

@@ -44,6 +44,7 @@ tac -r -s '.\|
#include <regex.h>
#include "error.h"
#include "filenamecat.h"
#include "quote.h"
#include "quotearg.h"
#include "safe-read.h"
@@ -426,20 +427,15 @@ copy_to_temp (FILE **g_tmp, char **g_tempfile, int input_fd, char const *file)
{
static char *template = NULL;
static char const *tempdir;
char *tempfile;
FILE *tmp;
int fd;
if (template == NULL)
{
char const * const Template = "%s/tacXXXXXX";
char const * const Template = "tacXXXXXX";
tempdir = getenv ("TMPDIR");
if (tempdir == NULL)
tempdir = DEFAULT_TMPDIR;
/* Subtract 2 for `%s' and add 1 for the trailing NUL byte. */
template = xmalloc (strlen (tempdir) + strlen (Template) - 2 + 1);
sprintf (template, Template, tempdir);
template = file_name_concat (tempdir, Template, NULL);
}
/* FIXME: there's a small window between a successful mkstemp call
@@ -451,8 +447,8 @@ copy_to_temp (FILE **g_tmp, char **g_tempfile, int input_fd, char const *file)
FIXME: clean up upon fatal signal. Don't block them, in case
$TMPFILE is a remote file system. */
tempfile = template;
fd = mkstemp (template);
char *tempfile = template;
int fd = mkstemp (template);
if (fd < 0)
{
error (0, errno, _("cannot create temporary file in %s"),
@@ -460,7 +456,7 @@ copy_to_temp (FILE **g_tmp, char **g_tempfile, int input_fd, char const *file)
return false;
}
tmp = fdopen (fd, (O_BINARY ? "w+b" : "w+"));
FILE *tmp = fdopen (fd, (O_BINARY ? "w+b" : "w+"));
if (! tmp)
{
error (0, errno, _("cannot open %s for writing"), quote (tempfile));