Skip to content
Snippets Groups Projects
Commit e603320f authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/denittis/move_rm_function' into 'master'

Move rm_rf to utils.c

See merge request steam/steam-runtime-tools!110
parents e4dac4bf 9de6f8fe
No related branches found
No related tags found
1 merge request!110Move rm_rf to utils.c
Pipeline #2587 passed
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <elf.h> #include <elf.h>
#include <errno.h> #include <errno.h>
#include <ftw.h>
#include <link.h> #include <link.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
...@@ -572,3 +573,35 @@ _srt_indirect_strcmp0 (gconstpointer left, ...@@ -572,3 +573,35 @@ _srt_indirect_strcmp0 (gconstpointer left,
g_return_val_if_fail (r != NULL, 0); g_return_val_if_fail (r != NULL, 0);
return g_strcmp0 (*l, *r); return g_strcmp0 (*l, *r);
} }
static gint
ftw_remove (const gchar *path,
const struct stat *sb,
gint typeflags,
struct FTW *ftwbuf)
{
if (remove (path) < 0)
return -1;
return 0;
}
/**
* _srt_rm_rf:
* @directory: (type filename): The directory to remove.
*
* Recursively delete @directory within the same file system and
* without following symbolic links.
*
* Returns: %TRUE if the removal was successful
*/
gboolean
_srt_rm_rf (const char *directory)
{
g_return_val_if_fail (directory != NULL, FALSE);
if (nftw (directory, ftw_remove, 10, FTW_DEPTH|FTW_MOUNT|FTW_PHYS) < 0)
return FALSE;
return TRUE;
}
...@@ -47,3 +47,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (SrtObjectList, _srt_free_object_list) ...@@ -47,3 +47,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (SrtObjectList, _srt_free_object_list)
#endif #endif
G_GNUC_INTERNAL gboolean _srt_check_not_setuid (void); G_GNUC_INTERNAL gboolean _srt_check_not_setuid (void);
gboolean _srt_rm_rf (const char *directory);
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include "test-utils.h" #include "test-utils.h"
#include <steam-runtime-tools/steam-runtime-tools.h>
/** /**
* fake_home_new: * fake_home_new:
...@@ -305,7 +306,7 @@ fake_home_create_structure (FakeHome *f) ...@@ -305,7 +306,7 @@ fake_home_create_structure (FakeHome *f)
void void
fake_home_clean_up (FakeHome *f) fake_home_clean_up (FakeHome *f)
{ {
if (!rm_rf (f->home)) if (!_srt_rm_rf (f->home))
g_debug ("Unable to remove the fake home directory: %s", f->home); g_debug ("Unable to remove the fake home directory: %s", f->home);
g_free (f->home); g_free (f->home);
......
...@@ -39,7 +39,6 @@ tests = [ ...@@ -39,7 +39,6 @@ tests = [
tests_utils = [ tests_utils = [
'fake-home.c', 'fake-home.c',
'test-utils.c',
] ]
tests_dir = join_paths( tests_dir = join_paths(
......
/*
* Copyright © 2019 Collabora Ltd.
*
* SPDX-License-Identifier: MIT
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "test-utils.h"
#include <ftw.h>
#include <glib.h>
#include <stdio.h>
static gint
ftw_remove (const gchar *path,
const struct stat *sb,
gint typeflags,
struct FTW *ftwbuf)
{
if (remove (path) < 0)
return -1;
return 0;
}
/**
* rm_rf:
* @directory: (type filename): The folder to remove.
*
* Recursively delete @directory within the same file system and
* without following symbolic links.
*
* Returns: %TRUE if the removal was successful
*/
gboolean rm_rf (char *directory)
{
g_return_val_if_fail (directory != NULL, FALSE);
if (nftw (directory, ftw_remove, 10, FTW_DEPTH|FTW_MOUNT|FTW_PHYS) < 0)
return FALSE;
return TRUE;
}
\ No newline at end of file
...@@ -64,5 +64,3 @@ ...@@ -64,5 +64,3 @@
#if !GLIB_CHECK_VERSION(2, 38, 0) #if !GLIB_CHECK_VERSION(2, 38, 0)
#define g_test_skip(msg) g_test_message ("SKIP: %s", msg) #define g_test_skip(msg) g_test_message ("SKIP: %s", msg)
#endif #endif
gboolean rm_rf (char *directory);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment