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

[93sam at alioth.debian.org]

Author: 93sam
Date: 2008-05-25 21:40:22 +0000 (Sun, 25 May 2008)
New Revision: 809

Modified:
   cdrkit/trunk/Changelog
   cdrkit/trunk/genisoimage/genisoimage.c
Log:
  * genisoimage: Add a patch from Ivan Shmakov. "-o -" will now write
    to stdout, as typical for command line programs. And we will try
    not to corrupt stdout by default if it's a terminal.


Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog	2008-05-25 21:36:21 UTC (rev 808)
+++ cdrkit/trunk/Changelog	2008-05-25 21:40:22 UTC (rev 809)
@@ -11,8 +11,9 @@
     layout slightly to make for easier debug.
   * genisoimage: Applied patch from Roman Rakus <rrakus at redhat.com> to
     preserve directory permissions.
-  * genisoimage: Add (some of) a patch from Ivan Shmakov. "-o -" will
-    now write to stdout, as typical for command line programs.
+  * genisoimage: Add a patch from Ivan Shmakov. "-o -" will now write
+    to stdout, as typical for command line programs. And we will try
+    not to corrupt stdout by default if it's a terminal.
 
  -- Steve McIntyre <93sam at debian.org>  Mon, 25 May 2008 21:22:26 +0100
 

Modified: cdrkit/trunk/genisoimage/genisoimage.c
===================================================================
--- cdrkit/trunk/genisoimage/genisoimage.c	2008-05-25 21:36:21 UTC (rev 808)
+++ cdrkit/trunk/genisoimage/genisoimage.c	2008-05-25 21:40:22 UTC (rev 809)
@@ -3445,6 +3445,13 @@
 			}
 			write_jt_header(jttemplate, jtjigdo);
 		}
+	} else if ((outfile == NULL)
+               && isatty (fileno (stdout))) {
+		/* FIXME: a cleaner way to override this check? */
+		fputs (("image not written to a terminal.\n"
+                "Use -o - to force the output.\n"),
+		       stderr);
+		exit (1);
 	} else {
 		discimage = stdout;