This also introduces a new FOREACH_DIRENT macro and makes use of it.
return id;
}
+static int cmp_uint16(const void *_a, const void *_b) {
+ const uint16_t *a = _a, *b = _b;
+
+ if (*a < *b)
+ return -1;
+ if (*a > *b)
+ return 1;
+
+ return 0;
+}
+
int efi_get_boot_options(uint16_t **options) {
_cleanup_closedir_ DIR *dir = NULL;
struct dirent *de;
uint16_t *list = NULL;
- int count = 0;
+ int count = 0, r;
assert(options);
if (!dir)
return -errno;
- while ((de = readdir(dir))) {
+ FOREACH_DIRENT(de, dir, r = -errno; goto fail) {
int id;
uint16_t *t;
t = realloc(list, (count + 1) * sizeof(uint16_t));
if (!t) {
- free(list);
- return -ENOMEM;
+ r = -ENOMEM;
+ goto fail;
}
list = t;
list[count ++] = id;
-
}
+ qsort(list, count, sizeof(uint16_t), cmp_uint16);
+
*options = list;
return count;
+
+fail:
+ free(list);
+ return r;
}
static int read_usec(sd_id128_t vendor, const char *name, usec_t *u) {
static int get_process_id(pid_t pid, const char *field, uid_t *uid) {
_cleanup_fclose_ FILE *f = NULL;
_cleanup_free_ char *p = NULL;
+ char line[LINE_MAX];
assert(field);
assert(uid);
if (!f)
return -errno;
- FOREACH_LINE(f, line, return -errno) {
+ FOREACH_LINE(line, f, return -errno) {
char *l;
l = strstrip(line);
int search_and_fopen(const char *path, const char *mode, const char **search, FILE **_f);
int search_and_fopen_nulstr(const char *path, const char *mode, const char *search, FILE **_f);
-#define FOREACH_LINE(f, line, on_error) \
- for (char line[LINE_MAX]; !feof(f); ) \
+#define FOREACH_LINE(line, f, on_error) \
+ for (;;) \
if (!fgets(line, sizeof(line), f)) { \
if (ferror(f)) { \
on_error; \
} \
break; \
} else
+
+#define FOREACH_DIRENT(de, d, on_error) \
+ for (errno = 0, de = readdir(d);; errno = 0, de = readdir(d)) \
+ if (!de) { \
+ if (errno != 0) { \
+ on_error; \
+ } \
+ break; \
+ } else if (ignore_file((de)->d_name)) \
+ continue; \
+ else