Attachment 137890 Details for Bug 105398 – xdg-user-dirs-update: give priority to $HOME

[patch] xdg-user-dirs-update: give priority to $HOME

xdg-user-dirs-update-give-priority-to-HOME.patch (text/plain), 1.12 KB, created by Marco Trevisan (Treviño) on 2018-03-08 14:00:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Trevisan (Treviño)

Created: 2018-03-08 14:00:05 UTC

Size: 1.12 KB

patch

obsolete

>From 498c2da84a0353d2455ce7b8ed71614f78612f72 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
>Date: Thu, 8 Mar 2018 14:52:14 +0100
>Subject: [PATCH] xdg-user-dirs-update: give priority to $HOME
>
>---
> xdg-user-dirs-update.c | 22 +++++++++++++++-------
> 1 file changed, 15 insertions(+), 7 deletions(-)
>
>diff --git a/xdg-user-dirs-update.c b/xdg-user-dirs-update.c
>index 0924a1e..6a99db0 100644
>--- a/xdg-user-dirs-update.c
>+++ b/xdg-user-dirs-update.c
>@@ -277,18 +277,26 @@ get_home_dir (void)
> {
>   struct passwd *pw;
>   static char *home_dir = NULL;
>+  const char *home_env;
> 
>   if (home_dir != NULL)
>     return home_dir;
> 
>-  setpwent ();
>-  pw = getpwuid (getuid ());
>-  endpwent ();
>-  
>-  if (pw && pw->pw_dir)
>-    home_dir = strdup (pw->pw_dir);
>+  home_env = getenv ("HOME");
>+
>+  if (home_env && *home_env)
>+    {
>+      home_dir = strdup (home_env);
>+    }
>   else
>-    home_dir = getenv ("HOME");
>+    {
>+      setpwent ();
>+      pw = getpwuid (getuid ());
>+      endpwent ();
>+
>+      if (pw && pw->pw_dir)
>+	home_dir = strdup (pw->pw_dir);
>+    }
> 
>   return home_dir;
> }
>-- 
>2.7.4

Actions: View | Splinter Review

Attachments on bug 105398: 137890

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.