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

(-)fontconfig-2.3.93.20060220.orig/fc-cat/fc-cat.c (-1 / +10 lines)
Lines 396-401 Link Here
396
    FcFontSet	*fs = FcFontSetCreate();
396
    FcFontSet	*fs = FcFontSetCreate();
397
    FcStrSet    *dirs = FcStrSetCreate();
397
    FcStrSet    *dirs = FcStrSetCreate();
398
    char	*name_buf;
398
    char	*name_buf;
399
    FcConfig	*config;
399
400
400
#if HAVE_GETOPT_LONG
401
#if HAVE_GETOPT_LONG
401
    while ((c = getopt_long (argc, argv, "fsVv?", longopts, NULL)) != -1)
402
    while ((c = getopt_long (argc, argv, "fsVv?", longopts, NULL)) != -1)
Lines 417-422 Link Here
417
    i = 1;
418
    i = 1;
418
#endif
419
#endif
419
420
421
    config = FcInitLoadConfig ();
422
    if (!config)
423
    {
424
	fprintf (stderr, "%s: Can't init font config library\n", argv[0]);
425
	return 1;
426
    }
427
    FcConfigSetCurrent (config);
428
    
420
    if (i >= argc)
429
    if (i >= argc)
421
        usage (argv[0]);
430
        usage (argv[0]);
422
431
Lines 425-431 Link Here
425
        char * dummy_name = (char *)FcStrPlus ((FcChar8 *)argv[i], 
434
        char * dummy_name = (char *)FcStrPlus ((FcChar8 *)argv[i], 
426
                                               (FcChar8 *)"/dummy");
435
                                               (FcChar8 *)"/dummy");
427
        if (!FcDirScanConfig (fs, dirs, 0, 0, 
436
        if (!FcDirScanConfig (fs, dirs, 0, 0, 
428
                              (const FcChar8 *)argv[i], FcFalse, 0))
437
                              (const FcChar8 *)argv[i], FcFalse, config))
429
            fprintf (stderr, "couldn't load font dir %s\n", argv[i]);
438
            fprintf (stderr, "couldn't load font dir %s\n", argv[i]);
430
        else
439
        else
431
        {
440
        {

Return to bug 152453