Changeset 1328Tweet

Timestamp:

Nov 10, 2006, 4:38:09 PM (17 years ago)

Author:

Sam Hocevar

Message:

• Wrote manual pages for img2irc, cacaplay and cacaserver.

Location:

libcaca/trunk

Files:

• doc/Makefile.am (modified) (1 diff)
• doc/cacaplay.1 (added)
• doc/cacaserver.1 (added)
• doc/cacaview.1 (modified) (1 diff)
• doc/img2irc.1 (added)
• src/img2irc.c (modified) (3 diffs)

libcaca/trunk/doc/Makefile.am

@@ -4 +4 @@
 
 doxygen_DOX = libcaca.dox user.dox migrating.dox tutorial.dox style.dox
-man_MANS = caca-config.1 cacafire.1 cacaview.1
+man_MANS = caca-config.1 cacafire.1 cacaview.1 cacaserver.1 img2irc.1 cacaplay.1
 
 if BUILD_DOCUMENTATION

libcaca/trunk/doc/cacaview.1

@@ -51 +51 @@
 .B cacaview
 it is completely useless when run without an argument.
+.SH SEE ALSO
+img2irc(1)
 .SH AUTHOR
 This manual page was written by Sam Hocevar <sam@zoy.org>.

libcaca/trunk/src/img2irc.c

@@ -24 +24 @@
 #include "common-image.h"
 
+static void usage(int argc, char **argv)
+{
+    fprintf(stderr, "Usage: %s <image>\n", argv[0]);
+    fprintf(stderr, "       %s <image> <columns>\n", argv[0]);
+    fprintf(stderr, "       %s [-h|--help]\n", argv[0]);
+}
+
 int main(int argc, char **argv)
 {
@@ -31 +38 @@
     unsigned long int len;
     struct image *i;
-    int cols = 56, lines;
+    int cols, lines;
 
-    if(argc != 2)
+    if(argc < 2 || argc > 3)
     {
         fprintf(stderr, "%s: wrong argument count\n", argv[0]);
+        usage(argc, argv);
         return 1;
+    }
+
+    if(!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
+    {
+        fprintf(stderr, "%s: convert images to IRC file data\n", argv[0]);
+        usage(argc, argv);
+        return 0;
     }
 
@@ -55 +70 @@
 
     /* Assume a 6×10 font */
+    cols = argc == 3 ? atoi(argv[2]) : 0;
+    cols = cols ? cols : 60;
     lines = cols * i->h * 6 / i->w / 10;