luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-13 04:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

g_get_tmp_dir(): Clean up envars

Browse Source 
On UNIX, we should only ever be looking at TMPDIR.

On Windows, we should only ever look at TEMP.

Also, clean up the documentation to better describe what is actually
happening.  The previous docs may have left someone confused about why
this function returns "/var/tmp" on Solaris, even with no TMPDIR set.

https://bugzilla.gnome.org/show_bug.cgi?id=705075
This commit is contained in:
Ryan Lortie 2013-07-29 10:00:20 -04:00
parent 05d6175ded
commit c235240905
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
glib/gutils.c
View File

@ -954,12 +954,19 @@ g_get_home_dir (void)
/** /**
* g_get_tmp_dir: * g_get_tmp_dir:
* *
* Gets the directory to use for temporary files. This is found from * Gets the directory to use for temporary files.
* inspecting the environment variables <envar>TMPDIR</envar>, *
* <envar>TMP</envar>, and <envar>TEMP</envar> in that order. If none * On UNIX, this is taken from the <envar>TMPDIR</envar> environment
* of those are defined "/tmp" is returned on UNIX and "C:\" on Windows. * variable. If the variable is not set, <literal>P_tmpdir</literal> is
* The encoding of the returned string is system-defined. On Windows, * used, as defined by the system C library. Failing that, a hard-coded
* it is always UTF-8. The return value is never %NULL or the empty string. * default of "/tmp" is returned.
*
* On Windows, the <envar>TEMP</envar> environment variable is used,
* with the root directory of the Windows installation (eg: "C:\") used
* as a default.
*
* The encoding of the returned string is system-defined. On Windows, it
* is always UTF-8. The return value is never %NULL or the empty string.
* *
* Returns: the directory to use for temporary files. * Returns: the directory to use for temporary files.
*/ */
@ -972,27 +979,16 @@ g_get_tmp_dir (void)
{ {
gchar *tmp; gchar *tmp;
tmp = g_strdup (g_getenv ("TMPDIR"));
if (tmp == NULL || *tmp == '\0')
{
g_free (tmp);
tmp = g_strdup (g_getenv ("TMP"));
}
if (tmp == NULL || *tmp == '\0')
{
g_free (tmp);
tmp = g_strdup (g_getenv ("TEMP"));
}
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
tmp = g_strdup (g_getenv ("TEMP"));
if (tmp == NULL || *tmp == '\0') if (tmp == NULL || *tmp == '\0')
{ {
g_free (tmp); g_free (tmp);
tmp = get_windows_directory_root (); tmp = get_windows_directory_root ();
} }
#else #else /* G_OS_WIN32 */
tmp = g_strdup (g_getenv ("TMPDIR"));
#ifdef P_tmpdir #ifdef P_tmpdir
if (tmp == NULL || *tmp == '\0') if (tmp == NULL || *tmp == '\0')
@ -1004,7 +1000,7 @@ g_get_tmp_dir (void)
if (k > 1 && G_IS_DIR_SEPARATOR (tmp[k - 1])) if (k > 1 && G_IS_DIR_SEPARATOR (tmp[k - 1]))
tmp[k - 1] = '\0'; tmp[k - 1] = '\0';
} }
#endif #endif /* P_tmpdir */
if (tmp == NULL || *tmp == '\0') if (tmp == NULL || *tmp == '\0')
{ {