From: "Frédéric Danis" <frederic.danis@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v5 12/15] device: Retrieve name from cache directory
Date: Thu, 18 Oct 2012 11:00:55 +0200 [thread overview]
Message-ID: <1350550858-12239-13-git-send-email-frederic.danis@linux.intel.com> (raw)
In-Reply-To: <1350550858-12239-1-git-send-email-frederic.danis@linux.intel.com>
---
src/device.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/device.c b/src/device.c
index bb0f890..5eecbb3 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1589,6 +1589,8 @@ struct btd_device *device_create(struct btd_adapter *adapter,
const bdaddr_t *src;
char srcaddr[18], alias[MAX_NAME_LENGTH + 1];
uint16_t vendor, product, version;
+ char filename[PATH_MAX + 1];
+ GKeyFile *key_file;
device = g_try_malloc0(sizeof(struct btd_device));
if (device == NULL)
@@ -1616,7 +1618,28 @@ struct btd_device *device_create(struct btd_adapter *adapter,
src = adapter_get_address(adapter);
ba2str(src, srcaddr);
- read_device_name(srcaddr, address, bdaddr_type, device->name);
+ snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", srcaddr,
+ address);
+ filename[PATH_MAX] = '\0';
+ key_file = g_key_file_new();
+
+ if (g_key_file_load_from_file(key_file, filename, 0, NULL)) {
+ char *str;
+ int len;
+
+ str = g_key_file_get_string(key_file, "General", "Name", NULL);
+ if (str) {
+ len = strlen(str);
+ if (len > HCI_MAX_NAME_LENGTH)
+ str[HCI_MAX_NAME_LENGTH] = '\0';
+
+ strcpy(device->name, str);
+ g_free(str);
+ }
+ }
+
+ g_key_file_free(key_file);
+
if (read_device_alias(srcaddr, address, bdaddr_type, alias,
sizeof(alias)) == 0)
device->alias = g_strdup(alias);
--
1.7.9.5
next prev parent reply other threads:[~2012-10-18 9:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-18 9:00 [PATCH v5 00/15] Move storage config and names files to ini-file format Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 01/15] doc: Add settings storage documentation Frédéric Danis
2012-10-18 14:02 ` Daniel Wagner
2012-10-18 14:31 ` Frederic Danis
2012-10-18 9:00 ` [PATCH v5 02/15] adapter: Read name in storage at init Frédéric Danis
2012-10-18 14:04 ` Daniel Wagner
2012-10-18 14:41 ` Frederic Danis
2012-10-18 9:00 ` [PATCH v5 03/15] adaptername: Retrieve config name from adapter Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 04/15] adapter: Read device class in storage at init Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 05/15] adapter: Move pairable read to load_config() Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 06/15] adapter: Read pairable timeout in storage at init Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 07/15] adapter: Read discoverable " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 08/15] adapter: Read mode " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 09/15] adapter: Move saved config to ini-file format Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 10/15] TODO: Add entry to remove storage convertion function Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 11/15] adapter: Move storage names to cache directory Frédéric Danis
2012-10-18 9:00 ` Frédéric Danis [this message]
2012-10-18 9:00 ` [PATCH v5 13/15] dbusoob: Store device name in " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 14/15] input: Retrieve device name from " Frédéric Danis
2012-10-18 9:00 ` [PATCH v5 15/15] hcitool: Retrieve names " Frédéric Danis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350550858-12239-13-git-send-email-frederic.danis@linux.intel.com \
--to=frederic.danis@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).