ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wall: use xmkstemp for temporary file 

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2012-02-29 15:59:42 +01:00
parent 6b79eb38ba
commit a000bbb613
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
term-utils/Makefile.am
View File

@ -51,7 +51,7 @@ endif
if BUILD_WALL
usrbin_exec_PROGRAMS += wall
wall_SOURCES = wall.c ttymsg.c ttymsg.h $(top_srcdir)/lib/strutils.c
wall_SOURCES = wall.c ttymsg.c ttymsg.h $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c
dist_man_MANS += wall.1
wall_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
wall_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)

19
term-utils/wall.c
View File

@ -66,6 +66,7 @@
#include "pathnames.h"
#include "carefulputc.h"
#include "c.h"
#include "fileutils.h"
#define IGNOREUSER "sleeper"
#define WRITE_TIME_OUT 300 /* in seconds */
@ -188,24 +189,15 @@ makemsg(char *fname, size_t *mbufsize, int print_banner)
struct stat sbuf;
time_t now;
FILE *fp;
int fd;
char *p, *whom, *where, *hostname, *lbuf, *tmpname, *tmpenv, *mbuf;
char *p, *whom, *where, *hostname, *lbuf, *tmpname, *mbuf;
long line_max;
hostname = xmalloc(sysconf(_SC_HOST_NAME_MAX) + 1);
line_max = sysconf(_SC_LINE_MAX);
lbuf = xmalloc(line_max);
tmpname = xmalloc(PATH_MAX);
tmpenv = getenv("TMPDIR");
if ((tmpenv))
snprintf(tmpname, PATH_MAX, "%s/%s.XXXXXX", tmpenv,
program_invocation_short_name);
else
snprintf(tmpname, PATH_MAX, "%s/%s.XXXXXX", _PATH_TMP,
program_invocation_short_name);
if (!(fd = mkstemp(tmpname)) || !(fp = fdopen(fd, "r+")))
err(EXIT_FAILURE, _("can't open temporary file %s"), tmpname);
if ((fp = xmkstemp(&tmpname)) == NULL)
err(EXIT_FAILURE, _("can't open temporary file"));
unlink(tmpname);
free(tmpname);
@ -280,7 +272,7 @@ makemsg(char *fname, size_t *mbufsize, int print_banner)
free(lbuf);
rewind(fp);
if (fstat(fd, &sbuf))
if (fstat(fileno(fp), &sbuf))
err(EXIT_FAILURE, _("fstat failed"));
*mbufsize = (size_t) sbuf.st_size;
@ -289,7 +281,6 @@ makemsg(char *fname, size_t *mbufsize, int print_banner)
if (fread(mbuf, 1, *mbufsize, fp) != *mbufsize)
err(EXIT_FAILURE, _("fread failed"));
close(fd);
fclose(fp);
return mbuf;
}