ahill/shadow
1
0
Fork 0
mirror of https://github.com/shadow-maint/shadow.git synced 2026-01-26 14:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/tcbfuncs.c: rmdir_leading(): Create string just once

Browse Source 
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar 2024-11-16 22:20:16 +01:00 committed by Serge Hallyn
parent 4cf430b309
commit 6a2e15c73b
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/tcbfuncs.c
View File

@ -26,6 +26,7 @@
#include "shadowlog_internal.h"
#include "string/sprintf/aprintf.h"
#include "string/strcmp/streq.h"
#include "string/strcmp/strprefix.h"
#include "string/strerrno.h"
@ -257,38 +258,32 @@ static shadowtcb_status unlink_suffs (const char *user)
static shadowtcb_status
rmdir_leading(const char *relpath)
{
char *ind, *dir, *path;
char *ind, *path, *p;
shadowtcb_status ret = SHADOWTCB_SUCCESS;
path = strdup(relpath);
path = aprintf(TCB_DIR "/%s", relpath);
if (path == NULL)
goto oom;
p = strprefix(path, TCB_DIR "/");
while ((ind = strrchr (path, '/'))) {
while ((ind = strrchr(p, '/'))) {
stpcpy(ind, "");
dir = aprintf(TCB_DIR "/%s", path);
if (dir == NULL)
goto free_path;
if (rmdir (dir) != 0) {
if (rmdir(path) != 0) {
if (errno != ENOTEMPTY) {
fprintf (shadow_logfd,
_("%s: Cannot remove directory %s: %s\n"),
shadow_progname, dir, strerrno());
shadow_progname, path, strerrno());
ret = SHADOWTCB_FAILURE;
}
free (dir);
break;
}
free (dir);
}
free(path);
return ret;
free_path:
free(path);
oom:
OUT_OF_MEMORY;
return SHADOWTCB_FAILURE;