Enable fc-cat to print out old-style cache info when given a directory
name.
This commit is contained in:
parent
8c0d692125
commit
12f46c42fa
|
@ -1,3 +1,9 @@
|
||||||
|
2006-02-17 Patrick Lam <plam@mit.edu>
|
||||||
|
* fc-cat/fc-cat.c (main):
|
||||||
|
|
||||||
|
Enable fc-cat to print out old-style cache info when given a
|
||||||
|
directory name.
|
||||||
|
|
||||||
2006-02-16 Patrick Lam <plam@mit.edu>
|
2006-02-16 Patrick Lam <plam@mit.edu>
|
||||||
* src/fccache.c (FcDirCacheHasCurrentArch):
|
* src/fccache.c (FcDirCacheHasCurrentArch):
|
||||||
|
|
||||||
|
|
|
@ -377,6 +377,16 @@ bail2:
|
||||||
return FcFalse;
|
return FcFalse;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FcBool
|
||||||
|
FcFileIsDir (const FcChar8 *file)
|
||||||
|
{
|
||||||
|
struct stat statb;
|
||||||
|
|
||||||
|
if (stat ((const char *) file, &statb) != 0)
|
||||||
|
return FcFalse;
|
||||||
|
return S_ISDIR(statb.st_mode);
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
main (int argc, char **argv)
|
main (int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
@ -410,7 +420,21 @@ main (int argc, char **argv)
|
||||||
if (i >= argc)
|
if (i >= argc)
|
||||||
usage (argv[0]);
|
usage (argv[0]);
|
||||||
|
|
||||||
if ((name_buf = FcCacheFileRead (fs, dirs, argv[i])) != 0)
|
if (FcFileIsDir ((const FcChar8 *)argv[i]))
|
||||||
|
{
|
||||||
|
char * dummy_name = (char *)FcStrPlus ((FcChar8 *)argv[i],
|
||||||
|
(FcChar8 *)"/dummy");
|
||||||
|
if (!FcDirScanConfig (fs, dirs, 0, 0,
|
||||||
|
(const FcChar8 *)argv[i], FcFalse, 0))
|
||||||
|
fprintf (stderr, "couldn't load font dir %s\n", argv[i]);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* sorry, we can't tell you where the cache file is. */
|
||||||
|
FcCachePrintSet (fs, dirs, dummy_name);
|
||||||
|
FcStrFree ((FcChar8 *)dummy_name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if ((name_buf = FcCacheFileRead (fs, dirs, argv[i])) != 0)
|
||||||
FcCachePrintSet (fs, dirs, name_buf);
|
FcCachePrintSet (fs, dirs, name_buf);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue