From 2313f0382cde4171cb02f46f7151a609a735cf5b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 3 Nov 2017 08:42:08 +1000 Subject: [PATCH] Revert "test: mkdir -p the udev rules and hwdb directories" recursive functions are hard... This reverts commit 8a2177b3ba18f3fd3050afa37cb194bc803ea209. --- test/litest.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/test/litest.c b/test/litest.c index 021e19f1..41b0927e 100644 --- a/test/litest.c +++ b/test/litest.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -1072,32 +1071,20 @@ litest_install_model_quirks(struct list *created_files_list) list_insert(created_files_list, &file->link); } -static inline void -mkdir_p(const char *dir) -{ - char *path = strdup(dir), - *parent = dirname(path); - - if (streq(parent, "/")) { - int rc = mkdir(dir, 0755); - - if (rc == -1 && errno != EEXIST) { - litest_abort_msg("Failed to create directory %s (%s)\n", - dir, - strerror(errno)); - } - } else { - mkdir_p(path); - } - - free(path); -} - static void litest_init_udev_rules(struct list *created_files) { - mkdir_p(UDEV_RULES_D); - mkdir_p(UDEV_HWDB_D); + int rc; + + rc = mkdir(UDEV_RULES_D, 0755); + if (rc == -1 && errno != EEXIST) + litest_abort_msg("Failed to create udev rules directory (%s)\n", + strerror(errno)); + + rc = mkdir(UDEV_HWDB_D, 0755); + if (rc == -1 && errno != EEXIST) + litest_abort_msg("Failed to create udev hwdb directory (%s)\n", + strerror(errno)); litest_install_model_quirks(created_files); litest_init_all_device_udev_rules(created_files);