Commit f5bea1e6 authored by Behdad Esfahbod's avatar Behdad Esfahbod

Remove blanks support from fc-scan

parent 8f4c4d27
......@@ -52,7 +52,6 @@
#define _GNU_SOURCE
#include <getopt.h>
static const struct option longopts[] = {
{"ignore-blanks", 0, 0, 'b'},
{"format", 1, 0, 'f'},
{"version", 0, 0, 'V'},
{"help", 0, 0, 'h'},
......@@ -70,21 +69,19 @@ usage (char *program, int error)
{
FILE *file = error ? stderr : stdout;
#if HAVE_GETOPT_LONG
fprintf (file, "usage: %s [-Vbh] [-f FORMAT] [--ignore-blanks] [--format FORMAT] [--version] [--help] font-file...\n",
fprintf (file, "usage: %s [-Vh] [-f FORMAT] [--format FORMAT] [--version] [--help] font-file...\n",
program);
#else
fprintf (file, "usage: %s [-Vbh] [-f FORMAT] font-file...\n",
fprintf (file, "usage: %s [-Vh] [-f FORMAT] font-file...\n",
program);
#endif
fprintf (file, "Scan font files and directories, and print resulting pattern(s)\n");
fprintf (file, "\n");
#if HAVE_GETOPT_LONG
fprintf (file, " -b, --ignore-blanks ignore blanks to compute languages\n");
fprintf (file, " -f, --format=FORMAT use the given output format\n");
fprintf (file, " -V, --version display font config version and exit\n");
fprintf (file, " -h, --help display this help and exit\n");
#else
fprintf (file, " -b (ignore-blanks) ignore blanks to compute languages\n");
fprintf (file, " -f FORMAT (format) use the given output format\n");
fprintf (file, " -V (version) display font config version and exit\n");
fprintf (file, " -h (help) display this help and exit\n");
......@@ -97,9 +94,7 @@ main (int argc, char **argv)
{
FcChar8 *format = NULL;
int i;
int ignore_blanks = 0;
FcFontSet *fs;
FcBlanks *blanks = NULL;
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
......@@ -110,9 +105,6 @@ main (int argc, char **argv)
#endif
{
switch (c) {
case 'b':
ignore_blanks = 1;
break;
case 'f':
format = (FcChar8 *) strdup (optarg);
break;
......@@ -135,22 +127,20 @@ main (int argc, char **argv)
usage (argv[0], 1);
fs = FcFontSetCreate ();
if (!ignore_blanks)
blanks = FcConfigGetBlanks (NULL);
for (; i < argc; i++)
{
const FcChar8 *file = (FcChar8*) argv[i];
if (!FcFileIsDir (file))
FcFileScan (fs, NULL, NULL, blanks, file, FcTrue);
FcFileScan (fs, NULL, NULL, NULL, file, FcTrue);
else
{
FcStrSet *dirs = FcStrSetCreate ();
FcStrList *strlist = FcStrListCreate (dirs);
do
{
FcDirScan (fs, dirs, NULL, blanks, file, FcTrue);
FcDirScan (fs, dirs, NULL, NULL, file, FcTrue);
}
while ((file = FcStrListNext (strlist)));
FcStrListDone (strlist);
......
......@@ -62,12 +62,8 @@ manpage.1: manpage.sgml
<cmdsynopsis>
<command>&dhpackage;</command>
<arg><option>-Vbh</option></arg>
<arg><option>-Vh</option></arg>
<sbr>
<group>
<arg><option>-b</option></arg>
<arg><option>--ignore-blanks</option></arg>
</group>
<group>
<arg><option>-f</option> <option><replaceable>format</replaceable></option></arg>
<arg><option>--format</option> <option><replaceable>format</replaceable></option></arg>
......@@ -94,14 +90,6 @@ manpage.1: manpage.sgml
options is included below.</para>
<variablelist>
<varlistentry>
<term><option>-b</option>
<option>--ignore-blanks</option>
</term>
<listitem>
<para>Ignore blanks to compute languages</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-f</option>
<option>--format</option>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment