system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 10:48:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

tzcode: Silence warnings.

Browse source 
* Ignore failure to remove our temp file.
* Avoid a minor memory leak in the -D case.

Reported by:	Coverity (CID 1502534, 1502535, 1502538)
MFC after:	1 week
Sponsored by:	Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D38038
This commit is contained in:
Dag-Erling Smørgrav 2023-01-13 16:05:36 +01:00
parent 55572cff58
commit 2aad7570f4
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
contrib/tzcode/zic.c
View file

@ -661,7 +661,7 @@ close_file(FILE *stream, char const *dir, char const *name,
name ? name : "", name ? ": " : "",
e);
if (tempname)
remove(tempname);
(void)remove(tempname);
exit(EXIT_FAILURE);
}
}
@ -1418,7 +1418,7 @@ rename_dest(char *tempname, char const *name)
if (tempname) {
if (rename(tempname, name) != 0) {
int rename_errno = errno;
remove(tempname);
(void)remove(tempname);
fprintf(stderr, _("%s: rename to %s/%s: %s\n"),
progname, directory, name, strerror(rename_errno));
exit(EXIT_FAILURE);
@ -3933,6 +3933,14 @@ mp = _("time zone abbreviation differs from POSIX standard");
static void
mkdirs(char const *argname, bool ancestors)
{
/*
* If -D was specified, do not create directories. A subsequent
* file operation will fail and produce an appropriate error
* message.
*/
if (Dflag)
return;
char *name = estrdup(argname);
char *cp = name;
@ -3943,13 +3951,6 @@ mkdirs(char const *argname, bool ancestors)
it can use slashes to separate the already-existing
ancestor prefix from the to-be-created subdirectories. */
/*
* If -D was specified, do not create directories. A subsequent
* file operation will fail and produce an appropriate error
* message.
*/
if (Dflag)
return;
/* Do not mkdir a root directory, as it must exist. */
while (*cp == '/')
cp++;