[Debburn-changes] r804 - in cdrkit/trunk: . genisoimage

[93sam at alioth.debian.org]

Author: 93sam
Date: 2008-05-25 20:35:01 +0000 (Sun, 25 May 2008)
New Revision: 804

Modified:
   cdrkit/trunk/Changelog
   cdrkit/trunk/genisoimage/genisoimage.1
   cdrkit/trunk/genisoimage/genisoimage.c
Log:
Add command-line support for -jigdo-template-compress

Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog	2008-05-25 20:26:44 UTC (rev 803)
+++ cdrkit/trunk/Changelog	2008-05-25 20:35:01 UTC (rev 804)
@@ -3,6 +3,7 @@
   [ Steve McIntyre ]
   * genisoimage/joliet.c: Fix a potential memory corruption bug.
   * genisoimage/md5.c: Trivial cleanup
+  * genisoimage/genisoimage.[c1]: Add command-line support for -jigdo-template-compress
 
  -- Steve McIntyre <93sam at debian.org>  Mon, 25 May 2008 21:22:26 +0100
 

Modified: cdrkit/trunk/genisoimage/genisoimage.1
===================================================================
--- cdrkit/trunk/genisoimage/genisoimage.1	2008-05-25 20:26:44 UTC (rev 803)
+++ cdrkit/trunk/genisoimage/genisoimage.1	2008-05-25 20:35:01 UTC (rev 804)
@@ -806,6 +806,13 @@
 .B JIGDO NOTES
 section below for more information.
 .TP
+.BI \-jigdo\-template\-compress " algorithm
+Specify a compression algorithm to use for template date. gzip and
+bzip2 are currently supported, and gzip is the default. See the
+.B JIGDO NOTES
+section below for more information.
+.TP
+.TP
 .BI \-log\-file " log_file"
 Redirect all error, warning and informational messages to
 .I log_file

Modified: cdrkit/trunk/genisoimage/genisoimage.c
===================================================================
--- cdrkit/trunk/genisoimage/genisoimage.c	2008-05-25 20:26:44 UTC (rev 803)
+++ cdrkit/trunk/genisoimage/genisoimage.c	2008-05-25 20:35:01 UTC (rev 804)
@@ -413,6 +413,7 @@
 #define	OPTION_JT_MD5_LIST		1105
 #define	OPTION_JT_INCLUDE		1106
 #define	OPTION_JT_EXCLUDE		1107
+#define	OPTION_JT_COMPRESS_ALGO	1108
 #endif
 
 #define	OPTION_BOOTALPHA		1200
@@ -688,6 +689,8 @@
 	'\0', "PATTERN1=PATTERN2", "Pattern(s) to map paths (e.g. Debian=/mirror/debian)", ONE_DASH },
 	{{"md5-list", required_argument, NULL, OPTION_JT_MD5_LIST},
 	'\0', "FILE", "File containing MD5 sums of the files that should be checked", ONE_DASH },
+    {{"jigdo-template-compress", required_argument, NULL, OPTION_JT_COMPRESS_ALGO},
+     '\0', "ALGORITHM", "Choose to use gzip or bzip2 compression for template data; default is gzip", ONE_DASH },
 #endif
 
 #ifdef SORTING
@@ -1489,6 +1492,21 @@
 #endif
 			}
 			break;
+        case OPTION_JT_COMPRESS_ALGO:
+            if (!strcasecmp(optarg, "gzip"))
+                jte_template_compression = JTE_TEMP_GZIP;
+            else if (!strcasecmp(optarg, "bzip2"))
+                jte_template_compression = JTE_TEMP_BZIP2;
+            else
+            {
+#ifdef USE_LIBSCHILY
+                comerrno(EX_BAD, "Compression algorithm %s unknown\n", optarg);
+#else
+                fprintf(stderr, "Compression algorithm %s unknown\n", optarg);
+                exit(1);
+#endif
+            }
+            break;                
 #endif /* JIGDO_TEMPLATE */
 		case OPTION_NOBAK:
 			all_files = 0;