picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bootctl: replace readdir() loops with FOREACH_DIRENT

Browse source
This commit is contained in:
Michal Sekletar 2016-01-31 09:41:43 +01:00
parent dcabda4155
commit e41256dcec
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/boot/bootctl.c
View file

@ -39,6 +39,7 @@
#include "alloc-util.h"
#include "blkid-util.h"
#include "dirent-util.h"
#include "efivars.h"
#include "fd-util.h"
#include "fileio.h"
@ -249,13 +250,10 @@ static int enumerate_binaries(const char *esp_path, const char *path, const char
return log_error_errno(errno, "Failed to read \"%s\": %m", p);
}
while ((de = readdir(d))) {
FOREACH_DIRENT(de, d, break) {
_cleanup_close_ int fd = -1;
_cleanup_free_ char *v = NULL;
if (de->d_name[0] == '.')
continue;
if (!endswith_no_case(de->d_name, ".efi"))
continue;
@ -614,12 +612,9 @@ static int install_binaries(const char *esp_path, bool force) {
if (!d)
return log_error_errno(errno, "Failed to open \""BOOTLIBDIR"\": %m");
while ((de = readdir(d))) {
FOREACH_DIRENT(de, d, break) {
int k;
if (de->d_name[0] == '.')
continue;
if (!endswith_no_case(de->d_name, ".efi"))
continue;
@ -797,13 +792,10 @@ static int remove_boot_efi(const char *esp_path) {
return log_error_errno(errno, "Failed to open directory \"%s\": %m", p);
}
while ((de = readdir(d))) {
FOREACH_DIRENT(de, d, break) {
_cleanup_close_ int fd = -1;
_cleanup_free_ char *v = NULL;
if (de->d_name[0] == '.')
continue;
if (!endswith_no_case(de->d_name, ".efi"))
continue;