More svn:properties changes.

[thirdparty/cups.git] / scheduler / testmime.c

diff --git a/scheduler/testmime.c b/scheduler/testmime.c
index bd65fc77056634dd9e8a8a8dcee0a221f17b6079..196d1211f50f63282aa144256394f0eebc1e1619 100644 (file)
--- a/scheduler/testmime.c
+++ b/scheduler/testmime.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testmime.c 5051 2006-02-02 16:13:16Z mike $"
+ * "$Id$"
  *
  *   MIME test program for the Common UNIX Printing System (CUPS).
  *
@@ -98,6 +98,8 @@ main(int  argc,                               /* I - Number of command-line args */
       if (src)
        printf("%s: %s/%s%s\n", argv[i], src->super, src->type,
               compression ? " (gzipped)" : "");
+      else if ((src = mimeType(mime, "application", "octet-stream")) != NULL)
+       printf("%s: application/octet-stream\n", argv[i]);
       else
       {
        printf("%s: unknown\n", argv[i]);
@@ -111,7 +113,7 @@ main(int  argc,                             /* I - Number of command-line args */
       sscanf(argv[i], "%15[^/]/%31s", super, type);
       dst = mimeType(mime, super, type);
 
-      filters = mimeFilter(mime, src, dst, &cost, 10);
+      filters = mimeFilter(mime, src, dst, &cost);
 
       if (!filters)
       {
@@ -158,7 +160,8 @@ main(int  argc,                             /* I - Number of command-line args */
             filter->dst->super, filter->dst->type,
             filter->filter, filter->cost);
 
-    type_dir(mime, "..");
+    type_dir(mime, "../doc");
+    type_dir(mime, "../man");
   }
 
   return (0);
@@ -280,6 +283,9 @@ type_dir(mime_t     *mime,          /* I - MIME database */
 
   while ((dent = cupsDirRead(dir)) != NULL)
   {
+    if (dent->filename[0] == '.')
+      continue;
+
     snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->filename);
 
     if (S_ISDIR(dent->fileinfo.st_mode))
@@ -295,7 +301,7 @@ type_dir(mime_t     *mime,          /* I - MIME database */
       printf("%s: %s/%s%s\n", filename, filetype->super, filetype->type,
              compression ? " (compressed)" : "");
 
-      filters = mimeFilter(mime, filetype, pstype, &cost, 10);
+      filters = mimeFilter(mime, filetype, pstype, &cost);
 
       if (!filters)
        puts("    No filters to convert application/vnd.cups-postscript.");
@@ -325,5 +331,5 @@ type_dir(mime_t     *mime,          /* I - MIME database */
 
 
 /*
- * End of "$Id: testmime.c 5051 2006-02-02 16:13:16Z mike $".
+ * End of "$Id$".
  */