[PATCH] obex: Use user's cache dir as a default root

[PATCH] obex: Use user's cache dir as a default root

[Bastien Nocera]

It's per-user, so we won't try to overwrite somebody else's
files in /tmp when that happens. It's also (unless we have a
particularly bizarre setup) on the same partition as the destination
folder which means we can atomically move the file to the destination
with a unique filename.
---
 obexd/src/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/obexd/src/main.c b/obexd/src/main.c
index 61a06b2..2f7d723 100644
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -50,8 +50,6 @@
 #include "obexd.h"
 #include "server.h"
 
-#define DEFAULT_ROOT_PATH "/tmp"
-
 #define DEFAULT_CAP_FILE CONFIGDIR "/capability.xml"
 
 static GMainLoop *main_loop = NULL;
@@ -285,8 +283,10 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 
-	if (option_root == NULL)
-		option_root = g_strdup(DEFAULT_ROOT_PATH);
+	if (option_root == NULL) {
+		option_root = g_build_filename(g_get_user_cache_dir(), "obexd", NULL);
+		g_mkdir_with_parents(option_root, 0700);
+	}
 
 	if (option_root[0] != '/') {
 		char *old_root = option_root, *home = getenv("HOME");
-- 
1.8.4.2

Re: [PATCH] obex: Use user's cache dir as a default root

[Luiz Augusto von Dentz]

Hi Bastien,

On Sun, Nov 10, 2013 at 4:24 PM, Bastien Nocera <hadess@hadess.net> wrote:
>
> It's per-user, so we won't try to overwrite somebody else's
> files in /tmp when that happens. It's also (unless we have a
> particularly bizarre setup) on the same partition as the destination
> folder which means we can atomically move the file to the destination
> with a unique filename.
> ---
>  obexd/src/main.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/obexd/src/main.c b/obexd/src/main.c
> index 61a06b2..2f7d723 100644
> --- a/obexd/src/main.c
> +++ b/obexd/src/main.c
> @@ -50,8 +50,6 @@
>  #include "obexd.h"
>  #include "server.h"
>
> -#define DEFAULT_ROOT_PATH "/tmp"
> -
>  #define DEFAULT_CAP_FILE CONFIGDIR "/capability.xml"
>
>  static GMainLoop *main_loop = NULL;
> @@ -285,8 +283,10 @@ int main(int argc, char *argv[])
>                 exit(EXIT_FAILURE);
>         }
>
> -       if (option_root == NULL)
> -               option_root = g_strdup(DEFAULT_ROOT_PATH);
> +       if (option_root == NULL) {
> +               option_root = g_build_filename(g_get_user_cache_dir(), "obexd", NULL);
> +               g_mkdir_with_parents(option_root, 0700);
> +       }
>
>         if (option_root[0] != '/') {
>                 char *old_root = option_root, *home = getenv("HOME");
> --
> 1.8.4.2

Pushed, thanks.


-- 
Luiz Augusto von Dentz