[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Refresh xdg-user-dir-lookup.c from upstream
noreply at xfce.org
noreply at xfce.org
Fri Jun 7 04:33:48 CEST 2019
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-screensaver.
commit 9a3f5fac6589c9bc84b503d07c488bb19099c746
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Thu Jun 6 22:33:40 2019 -0400
Refresh xdg-user-dir-lookup.c from upstream
---
savers/xdg-user-dir-lookup.c | 114 ++++++++++++++++++++++++++++++++++---------
savers/xdg-user-dir-lookup.h | 6 +--
2 files changed, 93 insertions(+), 27 deletions(-)
diff --git a/savers/xdg-user-dir-lookup.c b/savers/xdg-user-dir-lookup.c
index 8fcbb77..47552b0 100644
--- a/savers/xdg-user-dir-lookup.c
+++ b/savers/xdg-user-dir-lookup.c
@@ -2,7 +2,7 @@
This file is not licenced under the GPL like the rest of the code.
Its is under the MIT license, to encourage reuse by cut-and-paste.
- Copyright (c) 2007 Red Hat, inc
+ Copyright (c) 2007 Red Hat, Inc.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
@@ -10,10 +10,10 @@
including without limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
+ subject to the following conditions:
The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
+ included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
@@ -31,29 +31,51 @@
#include "xdg-user-dir-lookup.h"
-char *
-xdg_user_dir_lookup (const char *type)
+/**
+ * xdg_user_dir_lookup_with_fallback:
+ * @type: a string specifying the type of directory
+ * @fallback: value to use if the directory isn't specified by the user
+ * @returns: a newly allocated absolute pathname
+ *
+ * Looks up a XDG user directory of the specified type.
+ * Example of types are "DESKTOP" and "DOWNLOAD".
+ *
+ * In case the user hasn't specified any directory for the specified
+ * type the value returned is @fallback.
+ *
+ * The return value is newly allocated and must be freed with
+ * free(). The return value is never NULL if @fallback != NULL, unless
+ * out of memory.
+ **/
+static char *
+xdg_user_dir_lookup_with_fallback (const char *type, const char *fallback)
{
FILE *file;
char *home_dir, *config_home, *config_file;
- char buffer[512];
+ char buffer[512];
char *user_dir;
char *p, *d;
- int len;
- int relative;
+ int len;
+ int relative;
home_dir = getenv ("HOME");
if (home_dir == NULL)
- return strdup ("/tmp");
+ goto error;
config_home = getenv ("XDG_CONFIG_HOME");
if (config_home == NULL || config_home[0] == 0) {
- config_file = malloc (strlen (home_dir) + strlen ("/.config/user-dirs.dirs") + 1);
+ config_file = (char *) malloc (strlen (home_dir) + strlen ("/.config/user-dirs.dirs") + 1);
+ if (config_file == NULL)
+ goto error;
+
strcpy (config_file, home_dir);
strcat (config_file, "/.config/user-dirs.dirs");
} else {
- config_file = malloc (strlen (config_home) + strlen ("/user-dirs.dirs") + 1);
+ config_file = (char *) malloc (strlen (config_home) + strlen ("/user-dirs.dirs") + 1);
+ if (config_file == NULL)
+ goto error;
+
strcpy (config_file, config_home);
strcat (config_file, "/user-dirs.dirs");
}
@@ -64,12 +86,11 @@ xdg_user_dir_lookup (const char *type)
goto error;
user_dir = NULL;
- while (fgets (buffer, sizeof (buffer), file))
- {
+ while (fgets (buffer, sizeof (buffer), file)) {
/* Remove newline at end */
len = strlen (buffer);
- if (len > 0 && buffer[len-1] == '\n')
- buffer[len-1] = 0;
+ if (len > 0 && buffer[len - 1] == '\n')
+ buffer[len - 1] = 0;
p = buffer;
while (*p == ' ' || *p == '\t')
@@ -108,36 +129,81 @@ xdg_user_dir_lookup (const char *type)
}
if (relative) {
- user_dir = malloc (strlen (home_dir) + 1 + strlen (p) + 1);
+ user_dir = (char *) malloc (strlen (home_dir) + 1 + strlen (p) + 1);
+ if (user_dir == NULL)
+ goto error2;
+
strcpy (user_dir, home_dir);
strcat (user_dir, "/");
} else {
- user_dir = malloc (strlen (p) + 1);
+ user_dir = (char *) malloc (strlen (p) + 1);
+ if (user_dir == NULL)
+ goto error2;
+
*user_dir = 0;
}
d = user_dir + strlen (user_dir);
- while (*p && *p != '"')
- {
- if ((*p == '\\') && (*(p+1) != 0))
+ while (*p && *p != '"') {
+ if ((*p == '\\') && (*(p + 1) != 0))
p++;
*d++ = *p++;
}
*d = 0;
}
+error2:
fclose (file);
if (user_dir)
return user_dir;
error:
+ if (fallback)
+ return strdup (fallback);
+ return NULL;
+}
+
+/**
+ * xdg_user_dir_lookup:
+ * @type: a string specifying the type of directory
+ * @returns: a newly allocated absolute pathname
+ *
+ * Looks up a XDG user directory of the specified type.
+ * Example of types are "DESKTOP" and "DOWNLOAD".
+ *
+ * The return value is always != NULL (unless out of memory),
+ * and if a directory
+ * for the type is not specified by the user the default
+ * is the home directory. Except for DESKTOP which defaults
+ * to ~/Desktop.
+ *
+ * The return value is newly allocated and must be freed with
+ * free().
+ **/
+char *
+xdg_user_dir_lookup (const char *type)
+{
+ char *dir, *home_dir, *user_dir;
+
+ dir = xdg_user_dir_lookup_with_fallback (type, NULL);
+ if (dir != NULL)
+ return dir;
+
+ home_dir = getenv ("HOME");
+
+ if (home_dir == NULL)
+ return strdup ("/tmp");
+
/* Special case desktop for historical compatibility */
- if (strcmp (type, "DESKTOP") == 0) {
- user_dir = malloc (strlen (home_dir) + strlen ("/Desktop") + 1);
+ if (strcmp(type, "DESKTOP") == 0) {
+ user_dir = (char *) malloc (strlen (home_dir) + strlen ("/Desktop") + 1);
+ if (user_dir == NULL)
+ return NULL;
+
strcpy (user_dir, home_dir);
strcat (user_dir, "/Desktop");
return user_dir;
- } else {
- return strdup (home_dir);
}
+
+ return strdup (home_dir);
}
diff --git a/savers/xdg-user-dir-lookup.h b/savers/xdg-user-dir-lookup.h
index 0b814cd..5730144 100644
--- a/savers/xdg-user-dir-lookup.h
+++ b/savers/xdg-user-dir-lookup.h
@@ -2,7 +2,7 @@
This file is not licenced under the GPL like the rest of the code.
Its is under the MIT license, to encourage reuse by cut-and-paste.
- Copyright (c) 2007 Red Hat, inc
+ Copyright (c) 2007 Red Hat, Inc.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
@@ -10,10 +10,10 @@
including without limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
+ subject to the following conditions:
The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
+ included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list