comparison libpurple/util.c @ 18147:5653692dcf79

Use dynamically allocated strings for the user_dir caching. Do we need to free these strings at libpurple uninit? If so, I can throw in a purple_util_uninit() function.

18144:1a282f3d8057

	char *webdata;
	unsigned long len;
	unsigned long data_len;
};

static char custom_home_dir[MAXPATHLEN];
static char home_dir[MAXPATHLEN] = "";

PurpleMenuAction *
purple_menu_action_new(const char *label, PurpleCallback callback, gpointer data,
                     GList *children)
{

/* Returns the argument passed to -c IFF it was present, or ~/.purple. */
const char *
purple_user_dir(void)
{
	if (custom_home_dir != NULL && *custom_home_dir) {
		strcpy ((char*) &home_dir, (char*) &custom_home_dir);
	} else if (!*home_dir) {
		const gchar *hd = purple_home_dir();

		if (hd) {
			g_strlcpy((char*) &home_dir, hd, sizeof(home_dir));
			g_strlcat((char*) &home_dir, G_DIR_SEPARATOR_S ".purple",
					sizeof(home_dir));
		}
	}

	return home_dir;
}

void purple_util_set_user_dir(const char *dir)
{
	if (dir != NULL && strlen(dir) > 0) {
		g_strlcpy((char*) &custom_home_dir, dir,
				sizeof(custom_home_dir));
	}
}

int purple_build_dir (const char *path, int mode)
{
#if GLIB_CHECK_VERSION(2,8,0)

18147:5653692dcf79

	char *webdata;
	unsigned long len;
	unsigned long data_len;
};

static char *custom_user_dir = NULL;
static char *home_dir = NULL;

PurpleMenuAction *
purple_menu_action_new(const char *label, PurpleCallback callback, gpointer data,
                     GList *children)
{

/* Returns the argument passed to -c IFF it was present, or ~/.purple. */
const char *
purple_user_dir(void)
{
	if (custom_user_dir != NULL)
		return custom_user_dir;
	else if (!home_dir)
		home_dir = g_build_filename(purple_home_dir(), ".purple", NULL);

	return home_dir;
}

void purple_util_set_user_dir(const char *dir)
{
	g_free(custom_user_dir);

	if (dir != NULL && *dir)
		custom_user_dir = g_strdup(dir);
	else
		custom_user_dir = NULL;
}

int purple_build_dir (const char *path, int mode)
{
#if GLIB_CHECK_VERSION(2,8,0)