2011-07-21 10:56:39

by Slawomir Bochenski

Subject: [PATCH obexd] Fix finding mime driver by type

IrOBEX specification chap. 2.2.3 states that the Type header is an ASCII
null-terminated string which values are case insensitive (as it is also
defined by RFC 1521).
---
src/mimetype.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/mimetype.c b/src/mimetype.c
index 078d97c..4e3573c 100644
--- a/src/mimetype.c
+++ b/src/mimetype.c
@@ -135,7 +135,14 @@ static struct obex_mime_type_driver *find_driver(const uint8_t *target,
if (memncmp0(who, who_size, driver->who, driver->who_size))
continue;

- if (g_strcmp0(mimetype, driver->mimetype) == 0)
+ if (mimetype == NULL || driver->mimetype == NULL) {
+ if (mimetype == driver->mimetype)
+ return driver;
+ else
+ continue;
+ }
+
+ if (g_ascii_strcasecmp(mimetype, driver->mimetype) == 0)
return driver;
}

--
1.7.4.1

2011-07-27 11:52:35

by Johan Hedberg

Subject: Re: [PATCH obexd] Fix finding mime driver by type

Hi Slawek,

On Thu, Jul 21, 2011, Slawomir Bochenski wrote:
> IrOBEX specification chap. 2.2.3 states that the Type header is an ASCII
> null-terminated string which values are case insensitive (as it is also
> defined by RFC 1521).
> ---
> src/mimetype.c | 9 ++++++++-
> 1 files changed, 8 insertions(+), 1 deletions(-)

Applied. Thanks.

Johan

2011-07-21 11:53:16

by Luiz Augusto von Dentz

Subject: Re: [PATCH obexd] Fix finding mime driver by type

Hi,

On Thu, Jul 21, 2011 at 2:07 PM, Slawomir Bochenski <[email protected]> wrote:
> On Thu, Jul 21, 2011 at 12:56 PM, Slawomir Bochenski <[email protected]> wrote:
>> IrOBEX specification chap. 2.2.3 states that the Type header is an ASCII
>> null-terminated string which values are case insensitive (as it is also
>> defined by RFC 1521).
>
> s/which/whose/
>
> --

Nice catch, ack.

--
Luiz Augusto von Dentz

2011-07-21 11:07:12

by Slawomir Bochenski

Subject: Re: [PATCH obexd] Fix finding mime driver by type

On Thu, Jul 21, 2011 at 12:56 PM, Slawomir Bochenski <[email protected]> wrote:
> IrOBEX specification chap. 2.2.3 states that the Type header is an ASCII
> null-terminated string which values are case insensitive (as it is also
> defined by RFC 1521).

s/which/whose/

--
Slawomir Bochenski