Auto-type the output file if necessary, using the filename extension.

Remove some unsupported input formats from the list of filename extensions.

Use case-insensitive comparisons for MIME media types.

Disable debug printfs in PDFio.

Author: michaelrsweet

tools/ipptransform.c

@@ -203,7 +203,8 @@ main(int  argc,				// I - Number of command-line args
 		*resolutions,		// pwg-raster-document-resolution-supported
 		*sheet_back,		// pwg-raster-document-sheet-back
 		*types,			// pwg-raster-document-type-supported
-		*opt;			// Option character
+		*opt,			// Option character
+		*ext;			// Filename extension
   size_t	num_files = 0;		// Number of files
   xform_document_t files[1000];		// Files to convert
   size_t	num_options = 0;	// Number of options
@@ -304,6 +305,20 @@ main(int  argc,				// I - Number of command-line args
 	        usage(1);
 	      }
 
+              if (!output_type && (ext = strrchr(argv[i], '.')) != NULL)
+              {
+                if (!strcasecmp(ext, ".pcl"))
+                  output_type = "application/vnd.hp-PCL";
+                else if (!strcasecmp(ext, ".pdf"))
+                  output_type = "application/pdf";
+                else if (!strcasecmp(ext, ".ps"))
+                  output_type = "application/postscript";
+                else if (!strcasecmp(ext, ".pwg"))
+                  output_type = "image/pwg-raster";
+                else if (!strcasecmp(ext, ".urf"))
+                  output_type = "image/urf";
+              }
+
 	      if (!freopen(argv[i], "w", stdout))
 	      {
 	        cupsLangPrintf(stderr, _("%s: Unable to open '%s': %s"), Prefix, argv[i], strerror(errno));
@@ -412,23 +427,19 @@ main(int  argc,				// I - Number of command-line args
 
       if (!files[num_files].format)
       {
-	if ((opt = strrchr(argv[i], '.')) != NULL)
+	if ((ext = strrchr(argv[i], '.')) != NULL)
 	{
-	  if (!strcmp(opt, ".jpg") || !strcmp(opt, ".jpeg"))
+	  if (!strcasecmp(ext, ".jpg") || !strcasecmp(ext, ".jpeg"))
 	    files[num_files].format = "image/jpeg";
-	  else if (!strcmp(opt, ".pcl"))
-	    files[num_files].format = "application/vnd.hp-PCL";
-	  else if (!strcmp(opt, ".pdf"))
+	  else if (!strcasecmp(ext, ".pdf"))
 	    files[num_files].format = "application/pdf";
-	  else if (!strcmp(opt, ".png"))
+	  else if (!strcasecmp(ext, ".png"))
 	    files[num_files].format = "image/png";
-	  else if (!strcmp(opt, ".pxl"))
-	    files[num_files].format = "application/vnd.hp-PCLXL";
-	  else if (!strcmp(opt, ".pwg"))
+	  else if (!strcasecmp(ext, ".pwg"))
 	    files[num_files].format = "image/pwg-raster";
-	  else if (!strcmp(opt, ".c") || !strcmp(opt, ".c++") || !strcmp(opt, ".cpp") || !strcmp(opt, ".cxx") || !strcmp(opt, ".h") || !strcmp(opt, ".hpp") || !strcmp(opt, ".m") || !strcmp(opt, ".md") || !strcmp(opt, ".py") || !strcmp(opt, ".rst") || !strcmp(opt, ".swift") || !strcmp(opt, ".txt"))
+	  else if (!strcasecmp(ext, ".c") || !strcasecmp(ext, ".c++") || !strcasecmp(ext, ".cpp") || !strcasecmp(ext, ".cxx") || !strcasecmp(ext, ".h") || !strcasecmp(ext, ".hpp") || !strcasecmp(ext, ".m") || !strcasecmp(ext, ".md") || !strcasecmp(ext, ".pl") || !strcasecmp(ext, ".py") || !strcasecmp(ext, ".rst") || !strcasecmp(ext, ".swift") || !strcasecmp(ext, ".txt"))
 	    files[num_files].format = "text/plain";
-	  else if (!strcmp(opt, ".urf"))
+	  else if (!strcasecmp(ext, ".urf"))
 	    files[num_files].format = "image/urf";
 	}
       }

tools/pdfio-private.h

@@ -1,7 +1,7 @@
 //
 // Private header file for PDFio.
 //
-// Copyright © 2021-2022 by Michael R Sweet.
+// Copyright © 2021-2023 by Michael R Sweet.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -10,18 +10,15 @@
 #ifndef PDFIO_PRIVATE_H
 #  define PDFIO_PRIVATE_H
 
-//
-// Include necessary headers...
-//
+#  ifdef DEBUG				// Disable PDFio debug printfs
+#    undef DEBUG
+#  endif // DEBUG
 
 #  ifdef _WIN32
-/*
- * Disable bogus VS warnings/errors...
- */
-
-#    define _CRT_SECURE_NO_WARNINGS
+#    define _CRT_SECURE_NO_WARNINGS	// Disable bogus VS warnings/errors...
 #  endif // _WIN32
 
+
 #  include "pdfio.h"
 #  include <stdarg.h>
 #  include <stdint.h>
@@ -32,18 +29,7 @@
 #  ifdef _WIN32
 #    include <io.h>
 #    include <direct.h>
-
-/*
- * Microsoft renames the POSIX functions to _name, and introduces
- * a broken compatibility layer using the original names.  As a result,
- * random crashes can occur when, for example, strdup() allocates memory
- * from a different heap than used by malloc() and free().
- *
- * To avoid moronic problems like this, we #define the POSIX function
- * names to the corresponding non-standard Microsoft names.
- */
-
-#    define access	_access
+#    define access	_access		// Map standard POSIX/C99 names
 #    define close	_close
 #    define fileno	_fileno
 #    define lseek	_lseek
@@ -56,12 +42,7 @@
 #    define unlink	_unlink
 #    define vsnprintf	_vsnprintf
 #    define write	_write
-
-/*
- * Map various parameters for POSIX...
- */
-
-#    define F_OK	00
+#    define F_OK	00		// POSIX parameters/flags
 #    define W_OK	02
 #    define R_OK	04
 #    define O_RDONLY	_O_RDONLY
@@ -71,7 +52,7 @@
 #    define O_BINARY	_O_BINARY
 #  else // !_WIN32
 #    include <unistd.h>
-#    define O_BINARY	0
+#    define O_BINARY	0		// Used on Windows for binary files...
 #  endif // _WIN32
 #  include <string.h>
 #  include <ctype.h>
@@ -411,4 +392,5 @@ extern void		_pdfioValueDelete(_pdfio_value_t *v) _PDFIO_INTERNAL;
 extern _pdfio_value_t	*_pdfioValueRead(pdfio_file_t *pdf, pdfio_obj_t *obj, _pdfio_token_t *ts, _pdfio_value_t *v, size_t depth) _PDFIO_INTERNAL;
 extern bool		_pdfioValueWrite(pdfio_file_t *pdf, pdfio_obj_t *obj, _pdfio_value_t *v, off_t *length) _PDFIO_INTERNAL;
 
+
 #endif // !PDFIO_PRIVATE_H