2017-03-31 11:03:57

by Konrad Zapalowicz

Subject: [PATCH] core: replace sizeof(filename) with PATH_MAX

From: Konrad Zapałowicz <[email protected]>

This commit replaces sizeof(filename) with PATH_MAX to match the common
scheme which is used in other places.

Signed-off-by: Konrad Zapałowicz <[email protected]>
---
src/adapter.c | 2 +-
src/shared/util.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 3dac7d6..3935460 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -7107,7 +7107,7 @@ static void store_csrk(struct btd_adapter *adapter, const bdaddr_t *peer,

ba2str(peer, device_addr);

- snprintf(filename, sizeof(filename), STORAGEDIR "/%s/%s/info",
+ snprintf(filename, PATH_MAX, STORAGEDIR "/%s/%s/info",
adapter_dir(adapter), device_addr);

key_file = g_key_file_new();
diff --git a/src/shared/util.c b/src/shared/util.c
index 7878552..4b59fad 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -117,7 +117,7 @@ unsigned char util_get_dt(const char *parent, const char *name)
char filename[PATH_MAX];
struct stat st;

- snprintf(filename, sizeof(filename), "%s/%s", parent, name);
+ snprintf(filename, PATH_MAX, "%s/%s", parent, name);
if (lstat(filename, &st) == 0 && S_ISDIR(st.st_mode))
return DT_DIR;

--
2.7.4

2017-03-31 14:44:34

by Konrad Zapalowicz

Subject: [PATCH v2] core: replace sizeof(filename) with PATH_MAX

From: Konrad Zapałowicz <[email protected]>

This commit replaces sizeof(filename) with PATH_MAX to match the common
scheme which is used in other places.
---
src/adapter.c | 2 +-
src/shared/util.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 3dac7d6..3935460 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -7107,7 +7107,7 @@ static void store_csrk(struct btd_adapter *adapter, const bdaddr_t *peer,

ba2str(peer, device_addr);

- snprintf(filename, sizeof(filename), STORAGEDIR "/%s/%s/info",
+ snprintf(filename, PATH_MAX, STORAGEDIR "/%s/%s/info",
adapter_dir(adapter), device_addr);

key_file = g_key_file_new();
diff --git a/src/shared/util.c b/src/shared/util.c
index 7878552..4b59fad 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -117,7 +117,7 @@ unsigned char util_get_dt(const char *parent, const char *name)
char filename[PATH_MAX];
struct stat st;

- snprintf(filename, sizeof(filename), "%s/%s", parent, name);
+ snprintf(filename, PATH_MAX, "%s/%s", parent, name);
if (lstat(filename, &st) == 0 && S_ISDIR(st.st_mode))
return DT_DIR;

--
2.7.4

2017-03-31 14:15:47

by Konrad Zapalowicz

Subject: Re: [PATCH] core: replace sizeof(filename) with PATH_MAX

On 03/31, Von Dentz, Luiz wrote:
> Hi Konrad,
>
> On Fri, Mar 31, 2017 at 2:32 PM, Konrad Zapalowicz
> <[email protected]> wrote:
> > On 03/31, Bastien Nocera wrote:
> >> On Fri, 2017-03-31 at 13:03 +0200, Konrad Zapalowicz wrote:
> >> > From: Konrad Zapałowicz <[email protected]>
> >> >
> >> > This commit replaces sizeof(filename) with PATH_MAX to match the
> >> > common
> >> > scheme which is used in other places.
> >>
> >> I wonder why g_strdup_printf() isn't used instead. Would allow ignoring
> >> PATH_MAX.
> >
> > I guess it is because it is easier. With g_strdup_printf() one would
> > have to take care about freeing memory. This is not a case with having
> > filename as an atomatic variable.
>
> Patch looks fine, but we don't use Signed-off-by in userspace tree

Ok, will resend.

Thanks,
K

2017-03-31 14:00:21

by Von Dentz, Luiz

Subject: Re: [PATCH] core: replace sizeof(filename) with PATH_MAX

Hi Konrad,

On Fri, Mar 31, 2017 at 2:32 PM, Konrad Zapalowicz
<[email protected]> wrote:
> On 03/31, Bastien Nocera wrote:
>> On Fri, 2017-03-31 at 13:03 +0200, Konrad Zapalowicz wrote:
>> > From: Konrad Zapa=C5=82owicz <[email protected]>
>> >
>> > This commit replaces sizeof(filename) with PATH_MAX to match the
>> > common
>> > scheme which is used in other places.
>>
>> I wonder why g_strdup_printf() isn't used instead. Would allow ignoring
>> PATH_MAX.
>
> I guess it is because it is easier. With g_strdup_printf() one would
> have to take care about freeing memory. This is not a case with having
> filename as an atomatic variable.

Patch looks fine, but we don't use Signed-off-by in userspace tree.

2017-03-31 11:32:18

by Konrad Zapalowicz

Subject: Re: [PATCH] core: replace sizeof(filename) with PATH_MAX

On 03/31, Bastien Nocera wrote:
> On Fri, 2017-03-31 at 13:03 +0200, Konrad Zapalowicz wrote:
> > From: Konrad Zapałowicz <[email protected]>
> >
> > This commit replaces sizeof(filename) with PATH_MAX to match the
> > common
> > scheme which is used in other places.
>
> I wonder why g_strdup_printf() isn't used instead. Would allow ignoring
> PATH_MAX.

I guess it is because it is easier. With g_strdup_printf() one would
have to take care about freeing memory. This is not a case with having
filename as an atomatic variable.

2017-03-31 11:21:29

by Bastien Nocera

Subject: Re: [PATCH] core: replace sizeof(filename) with PATH_MAX

On Fri, 2017-03-31 at 13:03 +0200, Konrad Zapalowicz wrote:
> From: Konrad Zapałowicz <[email protected]>
>
> This commit replaces sizeof(filename) with PATH_MAX to match the
> common
> scheme which is used in other places.

I wonder why g_strdup_printf() isn't used instead. Would allow ignoring
PATH_MAX.

2017-04-03 11:08:24

by Luiz Augusto von Dentz

Subject: Re: [PATCH v2] core: replace sizeof(filename) with PATH_MAX

Hi Konrad,

On Fri, Mar 31, 2017 at 5:44 PM, Konrad Zapalowicz
<[email protected]> wrote:
> From: Konrad Zapa=C5=82owicz <[email protected]>
>
> This commit replaces sizeof(filename) with PATH_MAX to match the common
> scheme which is used in other places.
> ---
> src/adapter.c | 2 +-
> src/shared/util.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/adapter.c b/src/adapter.c
> index 3dac7d6..3935460 100644
> --- a/src/adapter.c
> +++ b/src/adapter.c
> @@ -7107,7 +7107,7 @@ static void store_csrk(struct btd_adapter *adapter,=
const bdaddr_t *peer,
>
> ba2str(peer, device_addr);
>
> - snprintf(filename, sizeof(filename), STORAGEDIR "/%s/%s/info",
> + snprintf(filename, PATH_MAX, STORAGEDIR "/%s/%s/info",
> adapter_dir(adapter), device_addr=
);
>
> key_file =3D g_key_file_new();
> diff --git a/src/shared/util.c b/src/shared/util.c
> index 7878552..4b59fad 100644
> --- a/src/shared/util.c
> +++ b/src/shared/util.c
> @@ -117,7 +117,7 @@ unsigned char util_get_dt(const char *parent, const c=
har *name)
> char filename[PATH_MAX];
> struct stat st;
>
> - snprintf(filename, sizeof(filename), "%s/%s", parent, name);
> + snprintf(filename, PATH_MAX, "%s/%s", parent, name);
> if (lstat(filename, &st) =3D=3D 0 && S_ISDIR(st.st_mode))
> return DT_DIR;
>
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth=
" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

Applied, thanks.

--=20
Luiz Augusto von Dentz