Re: Please unblock dvdisaster 0.70.3-2
On Mon, Mar 05, 2007 at 01:17:32AM +0100, Daniel Baumann wrote:
> please unblock dvdisaster 0.70.3-2, it fixes #405757, debdiff is attached.
Unblocked, though the diff includes gratuitous whitespace changes:
> +diff -Naur dvdisaster-0.70.3.orig/udf.c dvdisaster-0.70.3/udf.c
> +--- dvdisaster-0.70.3.orig/udf.c 2006-12-10 17:58:35.000000000 +0000
> ++++ dvdisaster-0.70.3/udf.c 2007-01-17 09:39:58.000000000 +0000
> +@@ -181,25 +181,28 @@
> + gint64 header_modulo;
> + int read_count = 0;
> + int answered_continue = FALSE;
> ++ int warning_shown = FALSE;
> +
> + /*** Quick search at fixed offsets relative to ISO filesystem */
> +
> +- if(!max_sectors && dh->isoInfo)
> +- { gint64 iso_size = dh->isoInfo->volumeSize;
> +-
> +- /* Iso size is correct; look for root sector at +2 */
> +-
> +- if(try_sector(dh, iso_size, &eh) == HEADER_FOUND)
> +- { Verbose("Root sector search at +0 successful\n");
> +- return eh;
> +- }
> ++ if(!max_sectors)
> ++ { if(dh->isoInfo)
> ++ { gint64 iso_size = dh->isoInfo->volumeSize;
> ++
> ++ /* Iso size is correct; look for root sector at +2 */
> ++
> ++ if(try_sector(dh, iso_size, &eh) == HEADER_FOUND)
> ++ { Verbose("Root sector search at +0 successful\n");
> ++ return eh;
> ++ }
> +
> +- /* Strange stuff. Sometimes the iso size is increased by 150
> +- sectors by the burning software. */
> ++ /* Strange stuff. Sometimes the iso size is increased by 150
> ++ sectors by the burning software. */
> +
> +- if(try_sector(dh, iso_size-150, &eh) == HEADER_FOUND)
> +- { Verbose("Root sector search at -150 successful\n");
> +- return eh;
> ++ if(try_sector(dh, iso_size-150, &eh) == HEADER_FOUND)
> ++ { Verbose("Root sector search at -150 successful\n");
> ++ return eh;
> ++ }
> + }
> +
> + return NULL;
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
vorlon@debian.org http://www.debian.org/
Reply to: