Compare commits

..

4 Commits

18 changed files with 84 additions and 263 deletions

View File

@ -112,7 +112,7 @@ test_structest_SOURCES = test/structest.c
## cdrskin construction site - ts A60816 - B00611
cdrskin_cdrskin_CPPFLAGS = -Ilibburn
cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_8_4
cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_8_2
# cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
# ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking

18
README
View File

@ -11,7 +11,7 @@ Still containing parts of Libburn. By Derek Foreman <derek@signalmarketing.com>
and Ben Jansens <xor@orodu.net>
Copyright (C) 2002-2006 Derek Foreman and Ben Jansens
http://files.libburnia-project.org/releases/libburn-0.8.4.pl00.tar.gz
http://files.libburnia-project.org/releases/libburn-0.8.2.pl00.tar.gz
------------------------------------------------------------------------------
@ -19,10 +19,10 @@ Copyright (C) 2002-2006 Derek Foreman and Ben Jansens
From tarball
Obtain libburn-0.8.4.pl00.tar.gz, take it to a directory of your choice and do:
Obtain libburn-0.8.2.pl00.tar.gz, take it to a directory of your choice and do:
tar xzf libburn-0.8.4.pl00.tar.gz
cd libburn-0.8.4
tar xzf libburn-0.8.2.pl00.tar.gz
cd libburn-0.8.2
./configure --prefix=/usr
make
@ -527,16 +527,6 @@ Project history as far as known to me:
- 11 Jun 2010 libburn-0.8.2 now works on Solaris.
- 14 Jun 2010 By release 0.5.8.pl00 of libisoburn, xorriso becomes a public C
language API of libisoburn. The emulations of mkisofs and cdrecord have
been enhanced.
- Tue Jun 29 2010 Version 0.6.34 of libisofs provides new features about
hiding file names from directory trees.
- Wed Jun 30 2010 libburn-0.8.4 provides small improvements with system
adapters for libcdio and generic POSIX systems.
------------------------------------------------------------------------------

View File

@ -4,7 +4,7 @@
cdrskin. By Thomas Schmitt <scdbackup@gmx.net>
Integrated sub project of libburnia-project.org but also published via:
http://scdbackup.sourceforge.net/cdrskin_eng.html
http://scdbackup.sourceforge.net/cdrskin-0.8.4.pl00.tar.gz
http://scdbackup.sourceforge.net/cdrskin-0.8.2.pl00.tar.gz
Copyright (C) 2006-2010 Thomas Schmitt, provided under GPL version 2 or later.
------------------------------------------------------------------------------
@ -26,10 +26,10 @@ By using this software you agree to the disclaimer at the end of this text
Compilation, First Glimpse, Installation
Obtain cdrskin-0.8.4.pl00.tar.gz, take it to a directory of your choice and do:
Obtain cdrskin-0.8.2.pl00.tar.gz, take it to a directory of your choice and do:
tar xzf cdrskin-0.8.4.pl00.tar.gz
cd cdrskin-0.8.4
tar xzf cdrskin-0.8.2.pl00.tar.gz
cd cdrskin-0.8.2
Within that directory execute:

View File

@ -38,7 +38,7 @@ original="./libburn_svn_release.tgz"
# My changes are in $changes , mainly in $changes/cdrskin
changes="./libburn-release"
skin_release="0.8.4"
skin_release="0.8.2"
patch_level=".pl00"
skin_rev="$skin_release""$patch_level"

View File

@ -38,7 +38,7 @@ original="./libburn_svn.tgz"
# My changes are in $changes , mainly in $changes/cdrskin
changes="./libburn-develop"
skin_release="0.8.5"
skin_release="0.8.3"
patch_level=""
skin_rev="$skin_release""$patch_level"

View File

@ -88,7 +88,7 @@ or
/** The official program version */
#ifndef Cdrskin_prog_versioN
#define Cdrskin_prog_versioN "0.8.4"
#define Cdrskin_prog_versioN "0.8.2"
#endif
/** The official libburn interface revision to use.
@ -101,7 +101,7 @@ or
#define Cdrskin_libburn_minoR 8
#endif
#ifndef Cdrskin_libburn_micrO
#define Cdrskin_libburn_micrO 4
#define Cdrskin_libburn_micrO 2
#endif
@ -135,13 +135,13 @@ or
#endif /* Cdrskin_libburn_cvs_A60220_tS */
#ifdef Cdrskin_libburn_0_8_4
#define Cdrskin_libburn_versioN "0.8.4"
#ifdef Cdrskin_libburn_0_8_2
#define Cdrskin_libburn_versioN "0.8.2"
#define Cdrskin_libburn_from_pykix_svN 1
#endif /* Cdrskin_libburn_0_8_4 */
#endif /* Cdrskin_libburn_0_8_2 */
#ifdef Cdrskin_libburn_0_8_5
#define Cdrskin_libburn_versioN "0.8.5"
#ifdef Cdrskin_libburn_0_8_3
#define Cdrskin_libburn_versioN "0.8.3"
#define Cdrskin_libburn_from_pykix_svN 1
/* Place novelty switch macros here.
@ -153,29 +153,29 @@ or
*/
#endif /* Cdrskin_libburn_0_8_5 */
#endif /* Cdrskin_libburn_0_8_3 */
#ifndef Cdrskin_libburn_versioN
#define Cdrskin_libburn_0_8_4
#define Cdrskin_libburn_versioN "0.8.4"
#define Cdrskin_libburn_0_8_2
#define Cdrskin_libburn_versioN "0.8.2"
#define Cdrskin_libburn_from_pykix_svN 1
#endif
#ifdef Cdrskin_libburn_0_8_4
#ifdef Cdrskin_libburn_0_8_2
#undef Cdrskin_libburn_majoR
#undef Cdrskin_libburn_minoR
#undef Cdrskin_libburn_micrO
#define Cdrskin_libburn_majoR 0
#define Cdrskin_libburn_minoR 8
#define Cdrskin_libburn_micrO 4
#define Cdrskin_libburn_micrO 2
#endif
#ifdef Cdrskin_libburn_0_8_5
#ifdef Cdrskin_libburn_0_8_3
#undef Cdrskin_libburn_majoR
#undef Cdrskin_libburn_minoR
#undef Cdrskin_libburn_micrO
#define Cdrskin_libburn_majoR 0
#define Cdrskin_libburn_minoR 8
#define Cdrskin_libburn_micrO 5
#define Cdrskin_libburn_micrO 3
#endif

View File

@ -64,7 +64,7 @@ connected via SCSI, PATA (aka IDE, ATA), USB, or SATA.
GPL software included:<BR>
</H2>
<DL>
<DT>libburn-0.8.4</DT>
<DT>libburn-0.8.2</DT>
<DD>(founded by Derek Foreman and Ben Jansens,
developed and maintained since August 2006 by
Thomas Schmitt from team of libburnia-project.org)
@ -197,7 +197,7 @@ Standalone ISO 9660 multi-session CD/DVD/BD tool
<P>
<DL>
<DT>Download as source code (see README):</DT>
<DD><A HREF="cdrskin-0.8.4.pl00.tar.gz">cdrskin-0.8.4.pl00.tar.gz</A>
<DD><A HREF="cdrskin-0.8.2.pl00.tar.gz">cdrskin-0.8.2.pl00.tar.gz</A>
(845 KB).
</DD>
<DD>
@ -247,22 +247,25 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
<HR>
<P>
Enhancements towards previous stable version cdrskin-0.8.2.pl00:
Enhancements towards previous stable version cdrskin-0.8.0.pl00:
<UL>
<LI>
Let general POSIX system adapters ignore SIGWINCH and SIGURG if defined
</LI>
<LI>
Allowed 64 kB max output buffer size on all OSes
</LI>
<LI>A new system adapter allows to burn CD, DVD and BD on OpenSolaris</LI>
<!--
<LI>none</LI>
-->
</UL>
Bug fixes towards cdrskin-0.8.2.pl00:
Bug fixes towards cdrskin-0.8.0.pl00:
<UL>
<LI>none</LI>
<LI>
CD TOC was not read if the first track did not start at LBA 0
</LI>
<LI>
CD-ROM media got attributed random lead-in and lead-out adresses
</LI>
<LI>
SIGSEGV of experimental libcdio system adapter if drive list is empty
</LI>
<!--
<LI>none</LI>
-->
@ -272,8 +275,8 @@ Bug fixes towards cdrskin-0.8.2.pl00:
<P>
<DL>
<DT><H3>Development snapshot, version 0.8.5 :</H3></DT>
<DD>Enhancements towards current stable version 0.8.4.pl00:
<DT><H3>Development snapshot, version 0.8.3 :</H3></DT>
<DD>Enhancements towards current stable version 0.8.2.pl00:
<UL>
<LI>none yet</LI>
<!--
@ -283,7 +286,7 @@ Bug fixes towards cdrskin-0.8.2.pl00:
</UL>
</DD>
<DD>Bug fixes towards cdrskin-0.8.4.pl00:
<DD>Bug fixes towards cdrskin-0.8.2.pl00:
<UL>
<LI>none yet</LI>
<!--
@ -293,10 +296,10 @@ Bug fixes towards cdrskin-0.8.2.pl00:
</DD>
<DD>&nbsp;</DD>
<DD><A HREF="README_cdrskin_devel">README 0.8.5</A>
<DD><A HREF="cdrskin__help_devel">cdrskin_0.8.5 --help</A></DD>
<DD><A HREF="cdrskin_help_devel">cdrskin_0.8.5 -help</A></DD>
<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.8.5)</A></DD>
<DD><A HREF="README_cdrskin_devel">README 0.8.3</A>
<DD><A HREF="cdrskin__help_devel">cdrskin_0.8.3 --help</A></DD>
<DD><A HREF="cdrskin_help_devel">cdrskin_0.8.3 -help</A></DD>
<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.8.3)</A></DD>
<DD>&nbsp;</DD>
<DT>Maintainers of cdrskin unstable packages please use SVN of
<A HREF="http://libburnia-project.org"> libburnia-project.org</A></DT>
@ -316,7 +319,7 @@ admins with full system souvereignty.</DT>
<A HREF="README_cdrskin_devel">upcoming README</A> ):
</DD>
<DD>
<A HREF="cdrskin-0.8.5.tar.gz">cdrskin-0.8.5.tar.gz</A>
<A HREF="cdrskin-0.8.3.tar.gz">cdrskin-0.8.3.tar.gz</A>
(845 KB).
</DD>

View File

@ -1 +1 @@
#define Cdrskin_timestamP "2010.06.30.100001"
#define Cdrskin_timestamP "2010.06.11.080001"

View File

@ -8472,7 +8472,7 @@ Made number transition to 0.8.2
+ cdrskin/add_ts_changes_to_libburn_0_8_3
Updated cdrskin tarball generator
11 Jun 2010 [3253]
[]
cdrskin/changelog.txt
Documented changes and release timestamp
@ -8482,98 +8482,8 @@ Documented changes and release timestamp
* Bug fix: SIGSEGV of experimental libcdio system adapter if drive list is empty
* New system adapter for Solaris uscsi (tested on snv134, kernel 5.11)
2010.06.11.104830 [3254]
Makefile.am
configure.ac
README
libburn/libburn.h
cdrskin/cdrskin.c
cdrskin/README
cdrskin/compile_cdrskin.sh
cdrskin/cdrskin_timestamp.h
cdrskin/cdrskin_eng.html
Made number transition to 0.8.3
11 Jun 2010 [3255]
- cdrskin/add_ts_changes_to_libburn_0_8_0
- cdrskin/add_ts_changes_to_libburn_0_8_1
+ cdrskin/add_ts_changes_to_libburn_0_8_2
+ cdrskin/add_ts_changes_to_libburn_0_8_3
Updated cdrskin tarball generator
11 Jun 2010 [3256]
cdrskin/changelog.txt
Documented changes and release timestamp
11 Jun 2010 [3257]
svn move -m libburn release 0.8.2 is ready
http://svn.libburnia-project.org/libburn/branches/ZeroEightTwo
http://svn.libburnia-project.org/libburn/tags/ZeroEightTwo
------------------------------------ cycle - cdrskin-0.8.3 - 2010.06.11.104830
2010.06.13.190707 [3267]
libburn/sg-solaris.c
New less obtrusive implementation of sg_is_enumerable_adr for Solaris
2010.06.15.155423 [3272]
libburn/sg-libcdio.c
Avoided compiler warning about unused variable on non-Solaris systems
2010.06.15.155625 [3273]
libburn/os-dummy.h
libburn/os-libcdio.h
Let general POSIX system adapters ignore SIGWINCH and SIGURG if defined
2010.06.15.155739 [3274]
configure.ac
Incremented LT_CURRENT and LT_AGE of libburn
2010.06.16.082457 [3277]
libburn/os-solaris.h
libburn/os-libcdio.h
libburn/os-freebsd.h
Allowed 64 kB max output buffer size on all OSes
30 Jun 2010 [3307]
svn copy -m "Branching for libburn release 0.8.4" \
http://svn.libburnia-project.org/libburn/trunk \
http://svn.libburnia-project.org/libburn/branches/ZeroEightFour
2010.06.30.100001 [3308]
Makefile.am
configure.ac
README
libburn/libburn.h
cdrskin/cdrskin.c
cdrskin/README
cdrskin/compile_cdrskin.sh
cdrskin/cdrskin_timestamp.h
cdrskin/cdrskin_eng.html
Made number transition to 0.8.4
30 Jun 2010 [3309]
- cdrskin/add_ts_changes_to_libburn_0_8_2
- cdrskin/add_ts_changes_to_libburn_0_8_3
+ cdrskin/add_ts_changes_to_libburn_0_8_4
+ cdrskin/add_ts_changes_to_libburn_0_8_5
Updated cdrskin tarball generator
30 Jun 2010 []
cdrskin/changelog.txt
Documented changes and release timestamp
------------------------------ release - cdrskin-0.8.4.pl00 - 2010.06.30.100001
* Let general POSIX system adapters ignore SIGWINCH and SIGURG if defined
* Allowed 64 kB max output buffer size on all OSes
------------------------------------ cycle - cdrskin-0.8.5 -
------------------------------------ cycle - cdrskin-0.8.5 -
------------------------------------ cycle - cdrskin-0.8.3 -
------------------------------------ cycle - cdrskin-0.8.3 -
===============================================================================
@ -8585,8 +8495,6 @@ Documented changes and release timestamp
Locking of device files.
Unmounting.
Could need ioctl to obtain SCSI bus,target,lun from fd rather than name

View File

@ -8,7 +8,7 @@ debug_opts="-O2"
def_opts=
largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
fifo_opts=""
libvers="-DCdrskin_libburn_0_8_4"
libvers="-DCdrskin_libburn_0_8_2"
# To be used if Makefile.am uses libburn_libburn_la_CFLAGS
# burn="libburn/libburn_libburn_la-"
@ -47,15 +47,15 @@ do
libdax_audioxtr_o=
libdax_msgs_o="$burn"message.o
cleanup_src_or_obj="-DCleanup_has_no_libburn_os_H cdrskin/cleanup.c"
elif test "$i" = "-libburn_0_8_4"
elif test "$i" = "-libburn_0_8_2"
then
libvers="-DCdrskin_libburn_0_8_4"
libvers="-DCdrskin_libburn_0_8_2"
libdax_audioxtr_o="$burn"libdax_audioxtr.o
libdax_msgs_o="$burn"libdax_msgs.o
cleanup_src_or_obj="$burn"cleanup.o
elif test "$i" = "-libburn_svn"
then
libvers="-DCdrskin_libburn_0_8_5"
libvers="-DCdrskin_libburn_0_8_3"
libdax_audioxtr_o="$burn"libdax_audioxtr.o
libdax_msgs_o="$burn"libdax_msgs.o
cleanup_src_or_obj="$burn"cleanup.o
@ -109,7 +109,7 @@ do
echo "Options:"
echo " -compile_cdrfifo compile program cdrskin/cdrfifo."
echo " -compile_dewav compile program test/dewav without libburn."
echo " -libburn_0_8_4 set macro to match libburn-0.8.4"
echo " -libburn_0_8_2 set macro to match libburn-0.8.2"
echo " -libburn_svn set macro to match current libburn-SVN."
echo " -dvd_obs_64k 64 KB default size for DVD/BD writing."
echo " -use_libcdio link with -lcdio because libburn uses it."

View File

@ -1,4 +1,4 @@
AC_INIT([libburn], [0.8.4], [http://libburnia-project.org])
AC_INIT([libburn], [0.8.2], [http://libburnia-project.org])
AC_PREREQ([2.50])
dnl AC_CONFIG_HEADER([config.h])
@ -9,7 +9,7 @@ LIBBURNIA_SET_FLAGS
AM_INIT_AUTOMAKE([subdir-objects])
dnl Notes by ts A71207 - B00630 :
dnl Notes by ts A71207 - B00611 :
dnl
dnl Regrettably the meaning of the various version types was misunderstood
dnl before version 0.4.1.
@ -82,7 +82,6 @@ dnl 0.7.6 = libburn.so.4.41.0
dnl 0.7.8 = libburn.so.4.43.0
dnl 0.8.0 = libburn.so.4.45.0
dnl 0.8.2 = libburn.so.4.47.0
dnl 0.8.4 = libburn.so.4.49.0
dnl
dnl So LT_CURRENT, LT_REVISION and LT_AGE get set directly here.
dnl SONAME of the emerging library is LT_CURRENT - LT_AGE.
@ -108,7 +107,7 @@ dnl
dnl As said: Only copies. Original in libburn/libburn.h : burn_header_version_*
BURN_MAJOR_VERSION=0
BURN_MINOR_VERSION=8
BURN_MICRO_VERSION=4
BURN_MICRO_VERSION=2
BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
AC_SUBST(BURN_MAJOR_VERSION)
@ -119,14 +118,15 @@ AC_SUBST(BURN_VERSION)
dnl Libtool versioning
LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
dnl
dnl This is the release version libburn-0.8.4
dnl ts B00409
dnl This is the release version libburn-0.8.2
dnl ### This is the development version after above release version
dnl LT_CURRENT++, LT_AGE++ has not yet happened.
dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
dnl
dnl SONAME = 53 - 49 = 4 . Linux library name = libburn.so.4.49.0
LT_CURRENT=53
LT_AGE=49
dnl SONAME = 51 - 47 = 4 . Linux library name = libburn.so.4.47.0
LT_CURRENT=51
LT_AGE=47
LT_REVISION=0
LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`

View File

@ -2628,7 +2628,7 @@ void burn_version(int *major, int *minor, int *micro);
*/
#define burn_header_version_major 0
#define burn_header_version_minor 8
#define burn_header_version_micro 4
#define burn_header_version_micro 2
/** Note:
Above version numbers are also recorded in configure.ac because libtool
wants them as parameters at build time.

View File

@ -29,37 +29,12 @@
/* The number of above list items */
#define BURN_OS_SIGNAL_COUNT 16
/** The list of all signals which shall surely not be caught.
It depends on the particular signal whether it can be ignored or whether
it will lead to sudden death of the process.
Some signals are not POSIX,
but nevertheless ought to be ignored if they are defined.
*/
#ifdef SIGWINCH
#define BURN_OS_SIG_WINCH ,SIGWINCH
#define BURN_OS_SIG_WINCH_CNT 1
#else
#define BURN_OS_SIG_WINCH
#define BURN_OS_SIG_WINCH_CNT 0
#endif
#ifdef SIGURG
#define BURN_OS_SIG_URG ,SIGURG
#define BURN_OS_SIG_URG_CNT 1
#else
#define BURN_OS_SIG_URG
#define BURN_OS_SIG_URG_CNT 0
#endif
/** The combined list of all signals which shall not be caught.
*/
/** To list all signals which shall surely not be caught */
#define BURN_OS_NON_SIGNAL_MACRO_LIST \
SIGKILL, SIGCHLD, SIGSTOP BURN_OS_SIG_WINCH BURN_OS_SIG_URG
SIGKILL, SIGCHLD, SIGSTOP
/* The number of above list items */
#define BURN_OS_NON_SIGNAL_COUNT \
( 3 + BURN_OS_SIG_WINCH_CNT + BURN_OS_SIG_URG_CNT )
#define BURN_OS_NON_SIGNAL_COUNT 3
/* The maximum size for a (SCSI) i/o transaction */

View File

@ -4,8 +4,7 @@
by os.h in case of compilation for
FreeBSD with CAM
Copyright (C) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>,
provided under GPLv2+
Copyright (C) 2006 Thomas Schmitt <scdbackup@gmx.net>, provided under GPLv2+
*/
/** List of all signals which shall be caught by signal handlers and trigger
@ -42,11 +41,7 @@ SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
/* The maximum size for a (SCSI) i/o transaction */
/* Important : MUST be at least 32768 ! */
/* Older BSD info says that 32 kB is maximum. But 64 kB seems to work well
on 8-STABLE. It is by default only used with BD in streaming mode.
So older systems should still be quite safe with this buffer max size.
*/
#define BURN_OS_TRANSPORT_BUFFER_SIZE 65536
#define BURN_OS_TRANSPORT_BUFFER_SIZE 32768
/** To hold all state information of BSD device enumeration

View File

@ -29,49 +29,26 @@
/* The number of above list items */
#define BURN_OS_SIGNAL_COUNT 16
/** The list of all signals which shall surely not be caught.
It depends on the particular signal whether it can be ignored or whether
it will lead to sudden death of the process.
Some signals are not POSIX,
but nevertheless ought to be ignored if they are defined.
*/
#ifdef SIGWINCH
#define BURN_OS_SIG_WINCH ,SIGWINCH
#define BURN_OS_SIG_WINCH_CNT 1
#else
#define BURN_OS_SIG_WINCH
#define BURN_OS_SIG_WINCH_CNT 0
#endif
#ifdef SIGURG
#define BURN_OS_SIG_URG ,SIGURG
#define BURN_OS_SIG_URG_CNT 1
#else
#define BURN_OS_SIG_URG
#define BURN_OS_SIG_URG_CNT 0
#endif
/** The combined list of all signals which shall not be caught.
*/
/** To list all signals which shall surely not be caught */
#define BURN_OS_NON_SIGNAL_MACRO_LIST \
SIGKILL, SIGCHLD, SIGSTOP BURN_OS_SIG_WINCH BURN_OS_SIG_URG
SIGKILL, SIGCHLD, SIGSTOP
/* The number of above list items */
#define BURN_OS_NON_SIGNAL_COUNT \
( 3 + BURN_OS_SIG_WINCH_CNT + BURN_OS_SIG_URG_CNT )
#define BURN_OS_NON_SIGNAL_COUNT 3
/* The maximum size for a (SCSI) i/o transaction */
/* Important : MUST be at least 32768 ! */
/* My Blu-ray burner LG GGW-H20 writes junk if stream recording is combined
with buffer size 32 kB. So stream recording is allowed only with size 64k.
Older BSD info says that 32 kB is maximum. But 64 kB seems to work well
on 8-STABLE. It is by default only used with BD in streaming mode.
So older systems should still be quite safe with this buffer max size.
This makes it worth to have a special case for GNU/Linux buffer size here.
*/
/* Important : MUST be at least 32768 ! */
#ifdef __linux
#define BURN_OS_TRANSPORT_BUFFER_SIZE 65536
#else
/* (It might be risky to use 64k. FreeBSD is said to can only 32k.) */
#define BURN_OS_TRANSPORT_BUFFER_SIZE 32768
#endif
/* To hold the position of the most recently delivered address from

View File

@ -41,6 +41,8 @@ SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
/* Important : MUST be at least 32768 ! */
/* My Blu-ray burner LG GGW-H20 writes junk if stream recording is combined
with buffer size 32 kB. So stream recording is allowed only with size 64k.
>>> ??? is 64 kB ok for Solaris uscsi ?
*/
#define BURN_OS_TRANSPORT_BUFFER_SIZE 65536

View File

@ -429,11 +429,8 @@ int sg_dispose_drive(struct burn_drive *d, int flag)
int sg_give_next_adr(burn_drive_enumerator_t *idx,
char adr[], int adr_size, int initialize)
{
int ret, recursion_count = 0;
int ret, recursion_count = 0, l;
char path[4096];
#ifdef Libburn_is_on_solariS
int l;
#endif
ret = sg_give_next_adr_raw(idx, adr, adr_size, initialize);
if (ret <= 0)
@ -463,12 +460,9 @@ int sg_give_next_adr(burn_drive_enumerator_t *idx,
int scsi_enumerate_drives(void)
{
burn_drive_enumerator_t idx;
int initialize = 1, ret, i_bus_no = -1, recursion_count = 0;
int initialize = 1, ret, i_bus_no = -1, recursion_count = 0, l;
int i_host_no = -1, i_channel_no = -1, i_target_no = -1, i_lun_no = -1;
char buf[4096], target[4096];
#ifdef Libburn_is_on_solariS
int l;
#endif
while(1) {
ret = sg_give_next_adr_raw(&idx, buf, sizeof(buf), initialize);

View File

@ -717,27 +717,6 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
/** Tells wether a text is a persistent address as listed by the enumeration
functions.
*/
#ifndef NIX
int sg_is_enumerable_adr(char* path)
{
int ret;
int bus_no, target_no, lun_no;
struct stat stbuf;
if (strncmp("/dev/rdsk/", path, 10) != 0)
return 0;
ret = decode_btl_solaris(path + 10, &bus_no, &target_no, &lun_no, 0);
if (ret <= 0)
return 0;
if (stat(path, &stbuf) == -1)
return 0;
return 1;
}
#else /* ! NIX */
int sg_is_enumerable_adr(char* adr)
{
burn_drive_enumerator_t idx;
@ -757,8 +736,6 @@ int sg_is_enumerable_adr(char* adr)
sg_give_next_adr(&idx, buf, sizeof(buf), -1);
return (0);
}
#endif /* NIX */