mirror of
https://github.com/sudo-project/sudo.git
synced 2025-08-22 09:57:41 +00:00
Move eventlog_free() into its own file.
This commit is contained in:
parent
dba37768bb
commit
f399c449ad
1
MANIFEST
1
MANIFEST
@ -104,6 +104,7 @@ include/sudo_util.h
|
|||||||
install-sh
|
install-sh
|
||||||
lib/eventlog/Makefile.in
|
lib/eventlog/Makefile.in
|
||||||
lib/eventlog/eventlog.c
|
lib/eventlog/eventlog.c
|
||||||
|
lib/eventlog/eventlog_free.c
|
||||||
lib/eventlog/logwrap.c
|
lib/eventlog/logwrap.c
|
||||||
lib/eventlog/regress/logwrap/check_wrap.c
|
lib/eventlog/regress/logwrap/check_wrap.c
|
||||||
lib/eventlog/regress/logwrap/check_wrap.in
|
lib/eventlog/regress/logwrap/check_wrap.in
|
||||||
|
@ -82,7 +82,7 @@ SHELL = @SHELL@
|
|||||||
|
|
||||||
TEST_PROGS = check_wrap
|
TEST_PROGS = check_wrap
|
||||||
|
|
||||||
LIBEVENTLOG_OBJS = eventlog.lo logwrap.lo
|
LIBEVENTLOG_OBJS = eventlog.lo eventlog_free.lo logwrap.lo
|
||||||
|
|
||||||
IOBJS = $(LIBEVENTLOG_OBJS:.lo=.i)
|
IOBJS = $(LIBEVENTLOG_OBJS:.lo=.i)
|
||||||
|
|
||||||
@ -213,6 +213,18 @@ eventlog.i: $(srcdir)/eventlog.c $(incdir)/compat/stdbool.h \
|
|||||||
$(CC) -E -o $@ $(CPPFLAGS) $<
|
$(CC) -E -o $@ $(CPPFLAGS) $<
|
||||||
eventlog.plog: eventlog.i
|
eventlog.plog: eventlog.i
|
||||||
rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/eventlog.c --i-file $< --output-file $@
|
rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/eventlog.c --i-file $< --output-file $@
|
||||||
|
eventlog_free.lo: $(srcdir)/eventlog_free.c $(incdir)/compat/stdbool.h \
|
||||||
|
$(incdir)/sudo_compat.h $(incdir)/sudo_debug.h \
|
||||||
|
$(incdir)/sudo_eventlog.h $(incdir)/sudo_queue.h \
|
||||||
|
$(incdir)/sudo_util.h $(top_builddir)/config.h
|
||||||
|
$(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/eventlog_free.c
|
||||||
|
eventlog_free.i: $(srcdir)/eventlog_free.c $(incdir)/compat/stdbool.h \
|
||||||
|
$(incdir)/sudo_compat.h $(incdir)/sudo_debug.h \
|
||||||
|
$(incdir)/sudo_eventlog.h $(incdir)/sudo_queue.h \
|
||||||
|
$(incdir)/sudo_util.h $(top_builddir)/config.h
|
||||||
|
$(CC) -E -o $@ $(CPPFLAGS) $<
|
||||||
|
eventlog_free.plog: eventlog_free.i
|
||||||
|
rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/eventlog_free.c --i-file $< --output-file $@
|
||||||
logwrap.lo: $(srcdir)/logwrap.c $(incdir)/compat/stdbool.h \
|
logwrap.lo: $(srcdir)/logwrap.c $(incdir)/compat/stdbool.h \
|
||||||
$(incdir)/sudo_compat.h $(incdir)/sudo_debug.h \
|
$(incdir)/sudo_compat.h $(incdir)/sudo_debug.h \
|
||||||
$(incdir)/sudo_eventlog.h $(incdir)/sudo_queue.h \
|
$(incdir)/sudo_eventlog.h $(incdir)/sudo_queue.h \
|
||||||
|
@ -1256,43 +1256,6 @@ eventlog_alert(const struct eventlog *evlog, int flags,
|
|||||||
debug_return_bool(ret);
|
debug_return_bool(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Free the strings in a struct eventlog.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
eventlog_free(struct eventlog *evlog)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
debug_decl(eventlog_free, SUDO_DEBUG_UTIL);
|
|
||||||
|
|
||||||
if (evlog != NULL) {
|
|
||||||
free(evlog->iolog_path);
|
|
||||||
free(evlog->command);
|
|
||||||
free(evlog->cwd);
|
|
||||||
free(evlog->runchroot);
|
|
||||||
free(evlog->runcwd);
|
|
||||||
free(evlog->rungroup);
|
|
||||||
free(evlog->runuser);
|
|
||||||
free(evlog->submithost);
|
|
||||||
free(evlog->submituser);
|
|
||||||
free(evlog->submitgroup);
|
|
||||||
free(evlog->ttyname);
|
|
||||||
if (evlog->argv != NULL) {
|
|
||||||
for (i = 0; evlog->argv[i] != NULL; i++)
|
|
||||||
free(evlog->argv[i]);
|
|
||||||
free(evlog->argv);
|
|
||||||
}
|
|
||||||
if (evlog->envp != NULL) {
|
|
||||||
for (i = 0; evlog->envp[i] != NULL; i++)
|
|
||||||
free(evlog->envp[i]);
|
|
||||||
free(evlog->envp);
|
|
||||||
}
|
|
||||||
free(evlog);
|
|
||||||
}
|
|
||||||
|
|
||||||
debug_return;
|
|
||||||
}
|
|
||||||
|
|
||||||
static FILE *
|
static FILE *
|
||||||
eventlog_stub_open_log(int type, const char *logfile)
|
eventlog_stub_open_log(int type, const char *logfile)
|
||||||
{
|
{
|
||||||
|
73
lib/eventlog/eventlog_free.c
Normal file
73
lib/eventlog/eventlog_free.c
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
/*
|
||||||
|
* SPDX-License-Identifier: ISC
|
||||||
|
*
|
||||||
|
* Copyright (c) 2020 Todd C. Miller <Todd.Miller@sudo.ws>
|
||||||
|
*
|
||||||
|
* Permission to use, copy, modify, and distribute this software for any
|
||||||
|
* purpose with or without fee is hereby granted, provided that the above
|
||||||
|
* copyright notice and this permission notice appear in all copies.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||||
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||||
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||||
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||||
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||||
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||||
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
*
|
||||||
|
* Sponsored in part by the Defense Advanced Research Projects
|
||||||
|
* Agency (DARPA) and Air Force Research Laboratory, Air Force
|
||||||
|
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This is an open source non-commercial project. Dear PVS-Studio, please check it.
|
||||||
|
* PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include "sudo_compat.h"
|
||||||
|
#include "sudo_debug.h"
|
||||||
|
#include "sudo_eventlog.h"
|
||||||
|
#include "sudo_util.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Free the strings in a struct eventlog.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
eventlog_free(struct eventlog *evlog)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
debug_decl(eventlog_free, SUDO_DEBUG_UTIL);
|
||||||
|
|
||||||
|
if (evlog != NULL) {
|
||||||
|
free(evlog->iolog_path);
|
||||||
|
free(evlog->command);
|
||||||
|
free(evlog->cwd);
|
||||||
|
free(evlog->runchroot);
|
||||||
|
free(evlog->runcwd);
|
||||||
|
free(evlog->rungroup);
|
||||||
|
free(evlog->runuser);
|
||||||
|
free(evlog->submithost);
|
||||||
|
free(evlog->submituser);
|
||||||
|
free(evlog->submitgroup);
|
||||||
|
free(evlog->ttyname);
|
||||||
|
if (evlog->argv != NULL) {
|
||||||
|
for (i = 0; evlog->argv[i] != NULL; i++)
|
||||||
|
free(evlog->argv[i]);
|
||||||
|
free(evlog->argv);
|
||||||
|
}
|
||||||
|
if (evlog->envp != NULL) {
|
||||||
|
for (i = 0; evlog->envp[i] != NULL; i++)
|
||||||
|
free(evlog->envp[i]);
|
||||||
|
free(evlog->envp);
|
||||||
|
}
|
||||||
|
free(evlog);
|
||||||
|
}
|
||||||
|
|
||||||
|
debug_return;
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user