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:05:53 +0000 |
commit | bd94ab11bbb6501013ed27ecb22685664816986c (patch) | |
tree | d152166eeb0b1d939f9f529ceb75c9dc4a472c9f /meta/recipes-connectivity/connman/connman | |
parent | 38042ed8586b3abe427af33debc2402caeca52cb (diff) | |
download | openembedded-core-contrib-bd94ab11bbb6501013ed27ecb22685664816986c.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
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 @@ -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); |