Attachment #67657 for bug #148693

View | Details | Raw Unified | Return to bug 148693
Collapse All | Expand All




    return FcTrue;
}

static FcBool
FcConfigAppFontAddDirWithCheck (FcConfig	    *config,
				const FcChar8   *dir,
				FcStrSet *processed_dirs)
{
    FcFontSet	*set;
    FcStrSet	*subdirs;

	FcStrSetDestroy (subdirs);
	return FcFalse;
    }
    FcStrSetAdd (processed_dirs, dir);
    if ((sublist = FcStrListCreate (subdirs)))
    {
	while ((subdir = FcStrListNext (sublist)))
	{
	    FcChar8 *name;
	    name = FcConfigNormalizeFontDir (config, subdir);
	    if (! name)
		name = subdir;
	    if (! FcStrSetMember (processed_dirs, name))
		FcConfigAppFontAddDirWithCheck (config, name, processed_dirs);
	}
	FcStrListDone (sublist);
    }

    return FcTrue;
}

FcBool
FcConfigAppFontAddDir (FcConfig	    *config,
		       const FcChar8   *dir)
{
    FcStrSet *processed_dirs;
    FcBool res;

    processed_dirs = FcStrSetCreate ();
    if (! processed_dirs)
	return FcFalse;

    res = FcConfigAppFontAddDirWithCheck (config, dir, processed_dirs);
    FcStrSetDestroy (processed_dirs);

    return res;
}

void
FcConfigAppFontClear (FcConfig	    *config)
{

Lines 133-138 Link Here

(-)fontconfig-2.3.93.20060210.orig/src/fcdir.c (+2 lines)
133	d_can = FcConfigNormalizeFontDir (config, dir);	133	d_can = FcConfigNormalizeFontDir (config, dir);
134	if (d_can)	134	if (d_can)
135	dir = d_can;	135	dir = d_can;
		136	else
		137	FcConfigAddFontDir (config, dir);
136		138
137	if (!force)	139	if (!force)
138	{	140	{

Return to bug 148693

Lines 1879-1887 Link Here

(-)fontconfig-2.3.93.20060210.orig/src/fccfg.c (-4 / +28 lines)
1879	return FcTrue;	1876	return FcTrue;
1880	}	1877	}
1881		1878
1882	FcBool	1879	static FcBool
1883	FcConfigAppFontAddDir (FcConfig *config,	1880	FcConfigAppFontAddDirWithCheck (FcConfig *config,
1884	const FcChar8 *dir)	1881	const FcChar8 *dir,
		1882	FcStrSet *processed_dirs)
1885	{	1883	{
1886	FcFontSet *set;	1884	FcFontSet *set;
1887	FcStrSet *subdirs;	1885	FcStrSet *subdirs;
Lines 1915-1925 Link Here
1915	FcStrSetDestroy (subdirs);	1913	FcStrSetDestroy (subdirs);
1916	return FcFalse;	1914	return FcFalse;
1917	}	1915	}
		1916	FcStrSetAdd (processed_dirs, dir);
1918	if ((sublist = FcStrListCreate (subdirs)))	1917	if ((sublist = FcStrListCreate (subdirs)))
1919	{	1918	{
1920	while ((subdir = FcStrListNext (sublist)))	1919	while ((subdir = FcStrListNext (sublist)))
1921	{	1920	{
1922	FcConfigAppFontAddDir (config, subdir);	1921	FcChar8 *name;
		1922	name = FcConfigNormalizeFontDir (config, subdir);
		1923	if (! name)
		1924	name = subdir;
		1925	if (! FcStrSetMember (processed_dirs, name))
		1926	FcConfigAppFontAddDirWithCheck (config, name, processed_dirs);
1923	}	1927	}
1924	FcStrListDone (sublist);	1928	FcStrListDone (sublist);
1925	}	1929	}
Lines 1927-1932 Link Here
1927	return FcTrue;	1931	return FcTrue;
1928	}	1932	}
1929		1933
		1934	FcBool
		1935	FcConfigAppFontAddDir (FcConfig *config,
		1936	const FcChar8 *dir)
		1937	{
		1938	FcStrSet *processed_dirs;
		1939	FcBool res;
		1940
		1941	processed_dirs = FcStrSetCreate ();
		1942	if (! processed_dirs)
		1943	return FcFalse;
		1944
		1945	res = FcConfigAppFontAddDirWithCheck (config, dir, processed_dirs);
		1946	FcStrSetDestroy (processed_dirs);
		1947
		1948	return res;
		1949	}
		1950
1930	void	1951	void
1931	FcConfigAppFontClear (FcConfig *config)	1952	FcConfigAppFontClear (FcConfig *config)
1932	{	1953	{