xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply (most) debian patches

Browse Source 
Apply debian patch 02-encryption
Apply debian patch 03-dvdrom
Apply a modified version of patch 05-help-dialog
Apply debian patch 08-fix-gnu-make-detection
Apply debian patch 10-use-non-size-specific-icon-and-add-keywords-to-desktop-file
Apply debian patch 12-fix-spelling-of-up-to
Apply debian patch 13-fix-missing-language-field-in-po-files
Apply a modified version of debian patch 14-make-builds-reproducible
Apply debian patch 17-fix-all-but-deprecated-api-warnings
Apply a modified version of debian patch 18-update-copyright-in-about-dialog
Apply debian patch 19-show-text-files-with-abs-path
Apply debian patch 22-fix-hurd-i386-ftbfs
Apply debian patch 23-add-bdrom-support
Apply debian patch 25-fix-man-pages
Apply debian patch 27-allow-opening-in-browser-again
Apply debian patch 28-pdftex-reproducibility
Apply debian patch 29-fix-more-typos
Apply debian patch 30-hurd-kfreebsd-ftbfs
Apply debian patch 31-improve-hurd-and-kfreebsd-support
Apply debian patch 33-honour-LDFLAGS
Apply debian patch 34-gcc8-format-security.patch
Apply debian patch 35-archived-homepage
Apply debian patch 36-fix-parallelism
This commit is contained in:
Stéphane Lesimple
2020-08-19 18:48:20 +02:00
parent 99b27b982a
commit 38defdf7aa
39 changed files with 630 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scsi-layer.c
View File

@@ -31,7 +31,9 @@
static int query_type(DeviceHandle*, int);
static gint64 query_size(Image*);
#if 0
static int query_copyright(DeviceHandle*);
#endif
static int read_dvd_sector(DeviceHandle*, unsigned char*, int, int);
static int read_cd_sector(DeviceHandle*, unsigned char*, int, int);
@@ -908,6 +910,11 @@ static int query_dvd(DeviceHandle *dh, int probe_only)
break;
}
if(layer_type & 0x01)
{ dh->typeDescr = g_strdup("DVD-ROM");
break;
}
if(layer_type & 0x06) /* strange thing: (re-)writeable but neither plus nor dash */
{ dh->typeDescr = g_strdup("DVD-ROM (fake)");
dh->subType = DVD;
@@ -1022,7 +1029,7 @@ static int query_bd(DeviceHandle *dh, int probe_only)
if(!strncmp((char*)&buf[4+8], "BDO", 3))
{ dh->typeDescr = g_strdup("BD-ROM");
dh->subType = UNSUPPORTED;
dh->subType = BD;
}
if(!strncmp((char*)&buf[4+8], "BDW", 3))
@@ -1644,6 +1651,7 @@ reset_mode_page:
* Find out whether we are allowed to create an image from the DVD.
*/
#if 0
static int query_copyright(DeviceHandle *dh)
{ Sense sense;
AlignedBuffer *ab = CreateAlignedBuffer(2048);
@@ -1704,6 +1712,7 @@ static int query_copyright(DeviceHandle *dh)
return result;
}
#endif
/*
* See whether a sector lies within the user area.
@@ -1996,12 +2005,13 @@ static gint64 query_size(Image *image)
*/
gint64 CurrentMediumSize(int get_blank_size)
{ Image *image;
{
#if defined(SYS_UNKNOWN) || defined(SYS_HURD)
return 0;
#else
Image *image;
gint64 size;
#ifdef SYS_UNKNOWN
return 0;
#endif
image = OpenImageFromDevice(Closure->device);
if(!image) return 0;
@@ -2042,6 +2052,7 @@ gint64 CurrentMediumSize(int get_blank_size)
CloseImage(image);
return size;
#endif
}
/***
@@ -2456,7 +2467,7 @@ int ReadSectors(DeviceHandle *dh, unsigned char *buf, gint64 s, int nsectors)
if(Closure->readRaw && dh->rawBuffer)
recommended_attempts = dh->rawBuffer->recommendedAttempts;
if(status) /* current try was unsucessful */
if(status) /* current try was unsuccessful */
{ int last_key, last_asc, last_ascq;
#ifndef CLI
@@ -2704,12 +2715,13 @@ Image* OpenImageFromDevice(char *device)
return NULL;
}
}
/*
if(dh->mainType == DVD && query_copyright(dh))
{ CloseImage(image);
Stop(_("This software does not support encrypted media.\n"));
return NULL;
}
*/
/* Create the bitmap of simulated defects */