Changeset 14336 for trunk/libtransmission/platform.c

Timestamp:

Sep 21, 2014, 6:05:14 PM (6 years ago)

Author:

jordan

Message:

(trunk) #4160: mike.dld patch: 4160-07-env.patch

File:

• trunk/libtransmission/platform.c (modified) (10 diffs)

trunk/libtransmission/platform.c

@@ -248 +248 @@
   if (!home)
     {
-      home = tr_strdup (getenv ("HOME"));
+      home = tr_env_get_string ("HOME", NULL);
 
       if (!home)
@@ -321 +321 @@
   if (!s)
     {
-      if ((s = getenv ("TRANSMISSION_HOME")))
-        {
-          s = tr_strdup (s);
-        }
-      else
+      s = tr_env_get_string ("TRANSMISSION_HOME", NULL);
+
+      if (s == NULL)
         {
 #ifdef __APPLE__
@@ -338 +336 @@
           s = tr_buildPath (buf, appname, NULL);
 #else
-          if ((s = getenv ("XDG_CONFIG_HOME")))
-            s = tr_buildPath (s, appname, NULL);
+          if ((s = tr_env_get_string ("XDG_CONFIG_HOME", NULL)))
+            {
+              s = tr_buildPath (s, appname, NULL);
+              tr_free (s);
+            }
           else
-            s = tr_buildPath (getHomeDir (), ".config", appname, NULL);
+            {
+              s = tr_buildPath (getHomeDir (), ".config", appname, NULL);
+            }
 #endif
         }
@@ -356 +359 @@
   if (user_dir == NULL)
     {
-      const char * config_home;
+      char * config_home;
       char * config_file;
       char * content;
@@ -362 +365 @@
 
       /* figure out where to look for user-dirs.dirs */
-      config_home = getenv ("XDG_CONFIG_HOME");
+      config_home = tr_env_get_string ("XDG_CONFIG_HOME", NULL);
       if (config_home && *config_home)
         config_file = tr_buildPath (config_home, "user-dirs.dirs", NULL);
       else
         config_file = tr_buildPath (getHomeDir (), ".config", "user-dirs.dirs", NULL);
+      tr_free (config_home);
 
       /* read in user-dirs.dirs and look for the download dir entry */
@@ -429 +433 @@
   if (!s)
     {
-      if ((s = getenv ("CLUTCH_HOME")))
-        {
-          s = tr_strdup (s);
-        }
-      else if ((s = getenv ("TRANSMISSION_WEB_HOME")))
-        {
-          s = tr_strdup (s);
-        }
-      else
+      s = tr_env_get_string ("CLUTCH_HOME", NULL);
+      if (s == NULL)
+        s = tr_env_get_string ("TRANSMISSION_WEB_HOME", NULL);
+      if (s == NULL)
         {
 
@@ -523 +522 @@
 
           tr_list *candidates = NULL, *l;
-          const char * tmp;
+          char * tmp;
 
           /* XDG_DATA_HOME should be the first in the list of candidates */
-          tmp = getenv ("XDG_DATA_HOME");
+          tmp = tr_env_get_string ("XDG_DATA_HOME", NULL);
           if (tmp && *tmp)
             {
-              tr_list_append (&candidates, tr_strdup (tmp));
+              tr_list_append (&candidates, tmp);
             }
           else
@@ -535 +534 @@
               char * dhome = tr_buildPath (getHomeDir (), ".local", "share", NULL);
               tr_list_append (&candidates, dhome);
+              tr_free (tmp);
             }
 
@@ -540 +540 @@
           {
             const char * pkg = PACKAGE_DATA_DIR;
-            const char * xdg = getenv ("XDG_DATA_DIRS");
+            char * xdg = tr_env_get_string ("XDG_DATA_DIRS", NULL);
             const char * fallback = "/usr/local/share:/usr/share";
             char * buf = tr_strdup_printf ("%s:%s:%s", (pkg?pkg:""), (xdg?xdg:""), fallback);
+            tr_free (xdg);
             tmp = buf;
             while (tmp && *tmp)
@@ -551 +552 @@
                     if ((end - tmp) > 1)
                       tr_list_append (&candidates, tr_strndup (tmp, end - tmp));
-                    tmp = end + 1;
+                    tmp = (char *) end + 1;
                   }
                 else if (tmp && *tmp)