1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From 7007ef32a959ac4717c19339a24fd90a68638a19 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei@gherzan.ro>
Date: Tue, 17 Jul 2012 16:07:17 +0300
Subject: [PATCH V3 2/2] storage.c: If there is no d_type support use
fstatat()
This is useful for filesystems where d_type is always DT_UNKNOWN.
In this case use fstatat() function.
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Upstream-Status: Submitted
---
src/storage.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
Index: git/src/storage.c
===================================================================
--- git.orig/src/storage.c
+++ git/src/storage.c
@@ -193,7 +193,6 @@ gchar **connman_storage_get_services()
switch (d->d_type) {
case DT_DIR:
- case DT_UNKNOWN:
/*
* If the settings file is not found, then
* assume this directory is not a services dir.
@@ -203,6 +202,25 @@ gchar **connman_storage_get_services()
ret = stat(str, &buf);
g_free(str);
if (ret < 0)
+ continue;
+
+ g_string_append_printf(result, "%s/", d->d_name);
+ break;
+ case DT_UNKNOWN:
+ /*
+ * If there is no d_type support use fstatat()
+ * to check if directory
+ */
+ ret = fstatat(dirfd(dir), d->d_name, &buf, 0);
+ if (ret < 0)
+ continue;
+ if (!(buf.st_mode & S_IFDIR))
+ continue;
+ str = g_strdup_printf("%s/%s/settings", STORAGEDIR,
+ d->d_name);
+ ret = stat(str, &buf);
+ g_free(str);
+ if (ret < 0)
continue;
g_string_append_printf(result, "%s/", d->d_name);
|
