diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2013-03-04 19:17:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-07 11:14:36 +0000 |
commit | 3ab5908c4ee70f1dbdbbc58ac667a5b080518f1a (patch) | |
tree | 1ec54429e80e0f8dd1f85a6a47f2ff30e51aad19 /meta/recipes-connectivity/connman/connman | |
parent | 3be1c1251b593b7509d12245dde4ff3daec882f1 (diff) | |
download | poky-3ab5908c4ee70f1dbdbbc58ac667a5b080518f1a.tar.gz |
connman: upgrade to 1.12
- 0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch no longer needed;
fix included in package source code
(From OE-Core rev: bd94ab11bbb6501013ed27ecb22685664816986c)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman')
-rw-r--r-- | meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch b/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch deleted file mode 100644 index 7315545c26..0000000000 --- a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From 7007ef32a959ac4717c19339a24fd90a68638a19 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Gherzan <andrei@gherzan.ro> | ||
3 | Date: Tue, 17 Jul 2012 16:07:17 +0300 | ||
4 | Subject: [PATCH V3 2/2] storage.c: If there is no d_type support use | ||
5 | fstatat() | ||
6 | |||
7 | This is useful for filesystems where d_type is always DT_UNKNOWN. | ||
8 | In this case use fstatat() function. | ||
9 | |||
10 | Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> | ||
11 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
12 | Upstream-Status: Submitted | ||
13 | |||
14 | --- | ||
15 | src/storage.c | 19 +++++++++++++++++++ | ||
16 | 1 file changed, 19 insertions(+) | ||
17 | |||
18 | Index: git/src/storage.c | ||
19 | =================================================================== | ||
20 | --- git.orig/src/storage.c | ||
21 | +++ git/src/storage.c | ||
22 | @@ -193,7 +193,6 @@ gchar **connman_storage_get_services() | ||
23 | |||
24 | switch (d->d_type) { | ||
25 | case DT_DIR: | ||
26 | - case DT_UNKNOWN: | ||
27 | /* | ||
28 | * If the settings file is not found, then | ||
29 | * assume this directory is not a services dir. | ||
30 | @@ -203,6 +202,25 @@ gchar **connman_storage_get_services() | ||
31 | ret = stat(str, &buf); | ||
32 | g_free(str); | ||
33 | if (ret < 0) | ||
34 | + continue; | ||
35 | + | ||
36 | + g_string_append_printf(result, "%s/", d->d_name); | ||
37 | + break; | ||
38 | + case DT_UNKNOWN: | ||
39 | + /* | ||
40 | + * If there is no d_type support use fstatat() | ||
41 | + * to check if directory | ||
42 | + */ | ||
43 | + ret = fstatat(dirfd(dir), d->d_name, &buf, 0); | ||
44 | + if (ret < 0) | ||
45 | + continue; | ||
46 | + if (!(buf.st_mode & S_IFDIR)) | ||
47 | + continue; | ||
48 | + str = g_strdup_printf("%s/%s/settings", STORAGEDIR, | ||
49 | + d->d_name); | ||
50 | + ret = stat(str, &buf); | ||
51 | + g_free(str); | ||
52 | + if (ret < 0) | ||
53 | continue; | ||
54 | |||
55 | g_string_append_printf(result, "%s/", d->d_name); | ||