[PATCH BlueZ] tools/meshctl: Fix default directory for JSON files

[PATCH BlueZ] tools/meshctl: Fix default directory for JSON files

[Inga Stotland]

This fixes the name of default directory that contains sample JSON files.
---
 tools/meshctl.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/meshctl.c b/tools/meshctl.c
index 3e1484f61..a8468b716 100644
--- a/tools/meshctl.c
+++ b/tools/meshctl.c
@@ -1913,21 +1913,20 @@ int main(int argc, char *argv[])
 	bt_shell_set_prompt(PROMPT_OFF);
 
 	if (!mesh_config_dir) {
-		bt_shell_printf("Local config directory not provided.\n");
-		mesh_config_dir = "";
-	} else {
-		bt_shell_printf("Reading prov_db.json and local_node.json from"
-				" %s\n", mesh_config_dir);
+		printf("Local config directory not provided.\n");
+		mesh_config_dir = "mesh";
 	}
 
+	printf("Reading prov_db.json and local_node.json from"
+				" %s directory\n", mesh_config_dir);
+
 	len = strlen(mesh_config_dir);
-	if (len && mesh_config_dir[len - 1] != '/') {
+
+	if (len && mesh_config_dir[len - 1] != '/')
 		extra = 1;
-		bt_shell_printf("mesh_config_dir[%d] %s\n", len,
-						&mesh_config_dir[len - 1]);
-	} else {
+	else
 		extra = 0;
-	}
+
 	mesh_local_config_filename = g_malloc(len + strlen("local_node.json")
 									+ 2);
 	if (!mesh_local_config_filename)
@@ -1956,6 +1955,7 @@ int main(int argc, char *argv[])
 
 	sprintf(mesh_prov_db_filename, "%s", mesh_config_dir);
 	len = strlen(mesh_config_dir);
+
 	if (extra)
 		sprintf(mesh_prov_db_filename + len , "%c", '/');
 
-- 
2.14.4

Re: [PATCH BlueZ] tools/meshctl: Fix default directory for JSON files

[Luiz Augusto von Dentz]

Hi Inga,

On Mon, Aug 20, 2018 at 12:30 AM, Inga Stotland <inga.stotland@intel.com> wrote:
> This fixes the name of default directory that contains sample JSON files.

Just a note regarding modifying/using files on the tree, as we
experience here it is a bad idea since once we move or it is changed
this code would have to be changed as well. Also I remember commenting
that if the configuration is changed by meshctl your tree will then
contain changes that shall not be applied, so instead of changing the
file in place Id make a default location something like
~/.config/meshctl/ and copy over the .json files there if they don't
exist, that way we avoid having to carry changes in the tree.

> ---
>  tools/meshctl.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/tools/meshctl.c b/tools/meshctl.c
> index 3e1484f61..a8468b716 100644
> --- a/tools/meshctl.c
> +++ b/tools/meshctl.c
> @@ -1913,21 +1913,20 @@ int main(int argc, char *argv[])
>         bt_shell_set_prompt(PROMPT_OFF);
>
>         if (!mesh_config_dir) {
> -               bt_shell_printf("Local config directory not provided.\n");
> -               mesh_config_dir = "";
> -       } else {
> -               bt_shell_printf("Reading prov_db.json and local_node.json from"
> -                               " %s\n", mesh_config_dir);
> +               printf("Local config directory not provided.\n");
> +               mesh_config_dir = "mesh";
>         }
>
> +       printf("Reading prov_db.json and local_node.json from"
> +                               " %s directory\n", mesh_config_dir);
> +
>         len = strlen(mesh_config_dir);
> -       if (len && mesh_config_dir[len - 1] != '/') {
> +
> +       if (len && mesh_config_dir[len - 1] != '/')
>                 extra = 1;
> -               bt_shell_printf("mesh_config_dir[%d] %s\n", len,
> -                                               &mesh_config_dir[len - 1]);
> -       } else {
> +       else
>                 extra = 0;
> -       }
> +
>         mesh_local_config_filename = g_malloc(len + strlen("local_node.json")
>                                                                         + 2);
>         if (!mesh_local_config_filename)
> @@ -1956,6 +1955,7 @@ int main(int argc, char *argv[])
>
>         sprintf(mesh_prov_db_filename, "%s", mesh_config_dir);
>         len = strlen(mesh_config_dir);
> +
>         if (extra)
>                 sprintf(mesh_prov_db_filename + len , "%c", '/');
>
> --
> 2.14.4
>



-- 
Luiz Augusto von Dentz

Re: [PATCH BlueZ] tools/meshctl: Fix default directory for JSON files

[Stotland, Inga]

SGkgTHVpeiwNCg0KT24gTW9uLCAyMDE4LTA4LTIwIGF0IDExOjAxICswMzAwLCBMdWl6IEF1Z3Vz
dG8gdm9uIERlbnR6IHdyb3RlOg0KPiBIaSBJbmdhLA0KPiANCj4gT24gTW9uLCBBdWcgMjAsIDIw
MTggYXQgMTI6MzAgQU0sIEluZ2EgU3RvdGxhbmQgPGluZ2Euc3RvdGxhbmRAaW50ZWwuDQo+IGNv
bT4gd3JvdGU6DQo+ID4gVGhpcyBmaXhlcyB0aGUgbmFtZSBvZiBkZWZhdWx0IGRpcmVjdG9yeSB0
aGF0IGNvbnRhaW5zIHNhbXBsZSBKU09ODQo+ID4gZmlsZXMuDQo+IA0KPiBKdXN0IGEgbm90ZSBy
ZWdhcmRpbmcgbW9kaWZ5aW5nL3VzaW5nIGZpbGVzIG9uIHRoZSB0cmVlLCBhcyB3ZQ0KPiBleHBl
cmllbmNlIGhlcmUgaXQgaXMgYSBiYWQgaWRlYSBzaW5jZSBvbmNlIHdlIG1vdmUgb3IgaXQgaXMg
Y2hhbmdlZA0KPiB0aGlzIGNvZGUgd291bGQgaGF2ZSB0byBiZSBjaGFuZ2VkIGFzIHdlbGwuIEFs
c28gSSByZW1lbWJlcg0KPiBjb21tZW50aW5nDQo+IHRoYXQgaWYgdGhlIGNvbmZpZ3VyYXRpb24g
aXMgY2hhbmdlZCBieSBtZXNoY3RsIHlvdXIgdHJlZSB3aWxsIHRoZW4NCj4gY29udGFpbiBjaGFu
Z2VzIHRoYXQgc2hhbGwgbm90IGJlIGFwcGxpZWQsIHNvIGluc3RlYWQgb2YgY2hhbmdpbmcgdGhl
DQo+IGZpbGUgaW4gcGxhY2UgSWQgbWFrZSBhIGRlZmF1bHQgbG9jYXRpb24gc29tZXRoaW5nIGxp
a2UNCj4gfi8uY29uZmlnL21lc2hjdGwvIGFuZCBjb3B5IG92ZXIgdGhlIC5qc29uIGZpbGVzIHRo
ZXJlIGlmIHRoZXkgZG9uJ3QNCj4gZXhpc3QsIHRoYXQgd2F5IHdlIGF2b2lkIGhhdmluZyB0byBj
YXJyeSBjaGFuZ2VzIGluIHRoZSB0cmVlLg0KPiANCj4gPiAtLS0NCj4gPiAgdG9vbHMvbWVzaGN0
bC5jIHwgMjAgKysrKysrKysrKy0tLS0tLS0tLS0NCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDEwIGlu
c2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQ0KPiA+IA0KPiA+IGRpZmYgLS1naXQgYS90b29s
cy9tZXNoY3RsLmMgYi90b29scy9tZXNoY3RsLmMNCj4gPiBpbmRleCAzZTE0ODRmNjEuLmE4NDY4
YjcxNiAxMDA2NDQNCj4gPiAtLS0gYS90b29scy9tZXNoY3RsLmMNCj4gPiArKysgYi90b29scy9t
ZXNoY3RsLmMNCj4gPiBAQCAtMTkxMywyMSArMTkxMywyMCBAQCBpbnQgbWFpbihpbnQgYXJnYywg
Y2hhciAqYXJndltdKQ0KPiA+ICAgICAgICAgYnRfc2hlbGxfc2V0X3Byb21wdChQUk9NUFRfT0ZG
KTsNCj4gPiANCj4gPiAgICAgICAgIGlmICghbWVzaF9jb25maWdfZGlyKSB7DQo+ID4gLSAgICAg
ICAgICAgICAgIGJ0X3NoZWxsX3ByaW50ZigiTG9jYWwgY29uZmlnIGRpcmVjdG9yeSBub3QNCj4g
PiBwcm92aWRlZC5cbiIpOw0KPiA+IC0gICAgICAgICAgICAgICBtZXNoX2NvbmZpZ19kaXIgPSAi
IjsNCj4gPiAtICAgICAgIH0gZWxzZSB7DQo+ID4gLSAgICAgICAgICAgICAgIGJ0X3NoZWxsX3By
aW50ZigiUmVhZGluZyBwcm92X2RiLmpzb24gYW5kDQo+ID4gbG9jYWxfbm9kZS5qc29uIGZyb20i
DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiICVzXG4iLCBtZXNoX2NvbmZp
Z19kaXIpOw0KPiA+ICsgICAgICAgICAgICAgICBwcmludGYoIkxvY2FsIGNvbmZpZyBkaXJlY3Rv
cnkgbm90IHByb3ZpZGVkLlxuIik7DQo+ID4gKyAgICAgICAgICAgICAgIG1lc2hfY29uZmlnX2Rp
ciA9ICJtZXNoIjsNCj4gPiAgICAgICAgIH0NCj4gPiANCj4gPiArICAgICAgIHByaW50ZigiUmVh
ZGluZyBwcm92X2RiLmpzb24gYW5kIGxvY2FsX25vZGUuanNvbiBmcm9tIg0KPiA+ICsgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgIiAlcyBkaXJlY3RvcnlcbiIsDQo+ID4gbWVzaF9jb25m
aWdfZGlyKTsNCj4gPiArDQo+ID4gICAgICAgICBsZW4gPSBzdHJsZW4obWVzaF9jb25maWdfZGly
KTsNCj4gPiAtICAgICAgIGlmIChsZW4gJiYgbWVzaF9jb25maWdfZGlyW2xlbiAtIDFdICE9ICcv
Jykgew0KPiA+ICsNCj4gPiArICAgICAgIGlmIChsZW4gJiYgbWVzaF9jb25maWdfZGlyW2xlbiAt
IDFdICE9ICcvJykNCj4gPiAgICAgICAgICAgICAgICAgZXh0cmEgPSAxOw0KPiA+IC0gICAgICAg
ICAgICAgICBidF9zaGVsbF9wcmludGYoIm1lc2hfY29uZmlnX2RpclslZF0gJXNcbiIsIGxlbiwN
Cj4gPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmbWVz
aF9jb25maWdfZGlyW2xlDQo+ID4gbiAtIDFdKTsNCj4gPiAtICAgICAgIH0gZWxzZSB7DQo+ID4g
KyAgICAgICBlbHNlDQo+ID4gICAgICAgICAgICAgICAgIGV4dHJhID0gMDsNCj4gPiAtICAgICAg
IH0NCj4gPiArDQo+ID4gICAgICAgICBtZXNoX2xvY2FsX2NvbmZpZ19maWxlbmFtZSA9IGdfbWFs
bG9jKGxlbiArDQo+ID4gc3RybGVuKCJsb2NhbF9ub2RlLmpzb24iKQ0KPiA+ICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAN
Cj4gPiAgICAgICsgMik7DQo+ID4gICAgICAgICBpZiAoIW1lc2hfbG9jYWxfY29uZmlnX2ZpbGVu
YW1lKQ0KPiA+IEBAIC0xOTU2LDYgKzE5NTUsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAq
YXJndltdKQ0KPiA+IA0KPiA+ICAgICAgICAgc3ByaW50ZihtZXNoX3Byb3ZfZGJfZmlsZW5hbWUs
ICIlcyIsIG1lc2hfY29uZmlnX2Rpcik7DQo+ID4gICAgICAgICBsZW4gPSBzdHJsZW4obWVzaF9j
b25maWdfZGlyKTsNCj4gPiArDQo+ID4gICAgICAgICBpZiAoZXh0cmEpDQo+ID4gICAgICAgICAg
ICAgICAgIHNwcmludGYobWVzaF9wcm92X2RiX2ZpbGVuYW1lICsgbGVuICwgIiVjIiwgJy8nKTsN
Cj4gPiANCj4gPiAtLQ0KPiA+IDIuMTQuNA0KPiA+IA0KDQpUaGFua3MgZm9yIHRoZSBmZWVkYmFj
ay4gSSBhZ3JlZS4NClNlbnQgcGF0Y2ggc2V0IHYyLg0KDQpSZWdhcmRzLA0KSW5nYQ==