Changeset 4345 for toilet/trunkTweet

Timestamp:

Feb 9, 2010, 12:34:05 AM (12 years ago)

Author:

Sam Hocevar

Message:

Search for missing fonts in the current directory (Fixes #40) and display
an error message in case of failure.

Location:

toilet/trunk

Files:

• doc/toilet.1.in (modified) (1 diff)
• src/figlet.c (modified) (1 diff)

toilet/trunk/doc/toilet.1.in

@@ -57 +57 @@
 files stored in the
 .B @datarootdir@/figlet
+directory. Fonts are looked first in the font directory, then in the current
 directory. There is also a special built-in font called
 .I term

toilet/trunk/src/figlet.c

@@ -43 +43 @@
     snprintf(path, 2047, "%s/%s", cx->dir, cx->font);
     if(caca_canvas_set_figfont(cx->cv, path))
-        return -1;
+    {
+        snprintf(path, 2047, "./%s", cx->font);
+        if(caca_canvas_set_figfont(cx->cv, path))
+        {
+            fprintf(stderr, "error: could not load font %s\n", cx->font);
+            return -1;
+        }
+    }
 
     cx->feed = feed_figlet;