Compare commits

..

4 Commits
1.0.4 ... 1.0.2

16 changed files with 73 additions and 181 deletions

View File

@ -2,11 +2,6 @@ SVN trunk (to become libburn-1.0.4.pl00.tar.gz)
===============================================================================
- no novelties yet
libburn-1.0.4.pl00.tar.gz Thu Mar 3 2011
===============================================================================
* Bug fix: Read-only file descriptors were classified as write-only pseudo
drives
libburn-1.0.2.pl00.tar.gz Wed Feb 23 2011
===============================================================================
* Removed compilation obstacles on Solaris 9.

View File

@ -117,9 +117,9 @@ test_structest_CPPFLAGS = -Ilibburn
test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
test_structest_SOURCES = test/structest.c
## cdrskin construction site - ts A60816 - B10310
## cdrskin construction site - ts A60816 - B10116
cdrskin_cdrskin_CPPFLAGS = -Ilibburn
cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_1_0_4
cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_1_0_2
# cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
# ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking

15
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-1.0.4.pl00.tar.gz
http://files.libburnia-project.org/releases/libburn-1.0.2.pl00.tar.gz
------------------------------------------------------------------------------
@ -19,10 +19,10 @@ Copyright (C) 2002-2006 Derek Foreman and Ben Jansens
From tarball
Obtain libburn-1.0.4.pl00.tar.gz, take it to a directory of your choice and do:
Obtain libburn-1.0.2.pl00.tar.gz, take it to a directory of your choice and do:
tar xzf libburn-1.0.4.pl00.tar.gz
cd libburn-1.0.4
tar xzf libburn-1.0.2.pl00.tar.gz
cd libburn-1.0.2
./configure --prefix=/usr
make
@ -595,7 +595,7 @@ Project history as far as known to me:
abort threshold for xorriso batch mode, and increased that threshold for
xorriso dialog mode.
- Wed Feb 23 2011 release 1.0.2:
- Wed 23 2011 release 1.0.2:
libisofs fixes several bugs and introduces the capability to copy files
inside the ISO filesystem.
libburn removed a compilation obstacle on Solaris 9 and improved recognition
@ -603,11 +603,6 @@ Project history as far as known to me:
libisoburn and xorriso fix bugs and make use of the new libisofs capability.
xorriso improves its mkisofs emulation.
- Thu Mar 10 2011 release 1.0.4:
Several bugs were fixed in the libraries and in the mkisofs emulation of
xorriso. This emulation xorrisofs has now an own man page and info document.
------------------------------------------------------------------------------
This program is free software; you can redistribute it and/or modify

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-1.0.4.pl00.tar.gz
http://scdbackup.sourceforge.net/cdrskin-1.0.2.pl00.tar.gz
Copyright (C) 2006-2011 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-1.0.4.pl00.tar.gz, take it to a directory of your choice and do:
Obtain cdrskin-1.0.2.pl00.tar.gz, take it to a directory of your choice and do:
tar xzf cdrskin-1.0.4.pl00.tar.gz
cd cdrskin-1.0.4
tar xzf cdrskin-1.0.2.pl00.tar.gz
cd cdrskin-1.0.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="1.0.4"
skin_release="1.0.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="1.0.5"
skin_release="1.0.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 "1.0.4"
#define Cdrskin_prog_versioN "1.0.2"
#endif
/** The official libburn interface revision to use.
@ -101,7 +101,7 @@ or
#define Cdrskin_libburn_minoR 0
#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_1_0_4
#define Cdrskin_libburn_versioN "1.0.4"
#ifdef Cdrskin_libburn_1_0_2
#define Cdrskin_libburn_versioN "1.0.2"
#define Cdrskin_libburn_from_pykix_svN 1
#endif /* Cdrskin_libburn_1_0_4 */
#endif /* Cdrskin_libburn_1_0_2 */
#ifdef Cdrskin_libburn_1_0_5
#define Cdrskin_libburn_versioN "1.0.5"
#ifdef Cdrskin_libburn_1_0_3
#define Cdrskin_libburn_versioN "1.0.3"
#define Cdrskin_libburn_from_pykix_svN 1
/* Place novelty switch macros here.
@ -153,29 +153,29 @@ or
*/
#endif /* Cdrskin_libburn_1_0_5 */
#endif /* Cdrskin_libburn_1_0_3 */
#ifndef Cdrskin_libburn_versioN
#define Cdrskin_libburn_1_0_5
#define Cdrskin_libburn_versioN "1.0.5"
#define Cdrskin_libburn_1_0_2
#define Cdrskin_libburn_versioN "1.0.2"
#define Cdrskin_libburn_from_pykix_svN 1
#endif
#ifdef Cdrskin_libburn_1_0_4
#ifdef Cdrskin_libburn_1_0_2
#undef Cdrskin_libburn_majoR
#undef Cdrskin_libburn_minoR
#undef Cdrskin_libburn_micrO
#define Cdrskin_libburn_majoR 1
#define Cdrskin_libburn_minoR 0
#define Cdrskin_libburn_micrO 4
#define Cdrskin_libburn_micrO 2
#endif
#ifdef Cdrskin_libburn_1_0_5
#ifdef Cdrskin_libburn_1_0_3
#undef Cdrskin_libburn_majoR
#undef Cdrskin_libburn_minoR
#undef Cdrskin_libburn_micrO
#define Cdrskin_libburn_majoR 1
#define Cdrskin_libburn_minoR 0
#define Cdrskin_libburn_micrO 5
#define Cdrskin_libburn_micrO 3
#endif

View File

@ -65,7 +65,7 @@ connected via SCSI, PATA (aka IDE, ATA), USB, or SATA.
GPL software included:<BR>
</H2>
<DL>
<DT>libburn-1.0.4</DT>
<DT>libburn-1.0.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)
@ -200,7 +200,7 @@ Standalone ISO 9660 multi-session CD/DVD/BD tool
<P>
<DL>
<DT>Download as source code (see README):</DT>
<DD><A HREF="cdrskin-1.0.4.pl00.tar.gz">cdrskin-1.0.4.pl00.tar.gz</A>
<DD><A HREF="cdrskin-1.0.2.pl00.tar.gz">cdrskin-1.0.2.pl00.tar.gz</A>
(870 KB).
</DD>
<DD>
@ -250,18 +250,21 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
<HR>
<P>
Enhancements towards previous stable version cdrskin-1.0.2.pl00:
Enhancements towards previous stable version cdrskin-1.0.0.pl00:
<UL>
<LI>none</LI>
<LI>
<LI>Removed compilation obstacles on Solaris 9</LI>
<LI>
Improved recognition of non-seekable stdio pseudo-drives.
</LI>
<!--
<LI>none</LI>
-->
</UL>
Bug fixes towards cdrskin-1.0.2.pl00:
Bug fixes towards cdrskin-1.0.0.pl00:
<UL>
<LI>Read-only file descriptors were classified as write-only pseudo drives</LI>
<LI>none</LI>
<!--
<LI>none</LI>
-->
@ -271,8 +274,8 @@ Bug fixes towards cdrskin-1.0.2.pl00:
<P>
<DL>
<DT><H3>Development snapshot, version 1.0.5 :</H3></DT>
<DD>Enhancements towards current stable version 1.0.4.pl00:
<DT><H3>Development snapshot, version 1.0.3 :</H3></DT>
<DD>Enhancements towards current stable version 1.0.2.pl00:
<UL>
<LI>none yet</LI>
<!--
@ -282,7 +285,7 @@ Bug fixes towards cdrskin-1.0.2.pl00:
</UL>
</DD>
<DD>Bug fixes towards cdrskin-1.0.4.pl00:
<DD>Bug fixes towards cdrskin-1.0.2.pl00:
<UL>
<LI>none yet</LI>
<!--
@ -292,10 +295,10 @@ Bug fixes towards cdrskin-1.0.2.pl00:
</DD>
<DD>&nbsp;</DD>
<DD><A HREF="README_cdrskin_devel">README 1.0.5</A>
<DD><A HREF="cdrskin__help_devel">cdrskin-1.0.5 --help</A></DD>
<DD><A HREF="cdrskin_help_devel">cdrskin-1.0.5 -help</A></DD>
<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 1.0.5)</A></DD>
<DD><A HREF="README_cdrskin_devel">README 1.0.3</A>
<DD><A HREF="cdrskin__help_devel">cdrskin-1.0.3 --help</A></DD>
<DD><A HREF="cdrskin_help_devel">cdrskin-1.0.3 -help</A></DD>
<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 1.0.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>
@ -315,7 +318,7 @@ admins with full system souvereignty.</DT>
<A HREF="README_cdrskin_devel">upcoming README</A> ):
</DD>
<DD>
<A HREF="cdrskin-1.0.5.tar.gz">cdrskin-1.0.5.tar.gz</A>
<A HREF="cdrskin-1.0.3.tar.gz">cdrskin-1.0.3.tar.gz</A>
(870 KB).
</DD>

View File

@ -1 +1 @@
#define Cdrskin_timestamP "2011.03.10.080001"
#define Cdrskin_timestamP "2011.02.23.130001"

View File

@ -9163,93 +9163,17 @@ Made number transition to 1.0.2
+ cdrskin/add_ts_changes_to_libburn_1_0_3
Updated cdrskin tarball generator
23 Feb 2011 [3607]
23 Feb 2011 []
ChangeLog
cdrskin/changelog.txt
Documented changes and release timestamp
------------------------------ release - cdrskin-1.0.2.pl00 - 2011.02.23.130001
* Removed compilation obstacles on Solaris 9.
* Improved recognition of non-seekable stdio pseudo-drives.
------------------------------------ cycle - cdrskin-1.0.2 -
2011.02.23.193502 [3611]
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 1.0.3
23 Feb 2011 [3612]
- cdrskin/add_ts_changes_to_libburn_1_0_0
- cdrskin/add_ts_changes_to_libburn_1_0_1
+ cdrskin/add_ts_changes_to_libburn_1_0_2
+ cdrskin/add_ts_changes_to_libburn_1_0_3
Updated cdrskin tarball generator
23 Feb 2011 [3613]
ChangeLog
cdrskin/changelog.txt
Documented changes and release timestamp
------------------------------------ cycle - cdrskin-1.0.3 - 2011.02.23.193502
23 Feb 2011 [3614]
svn move -m libburn release 1.0.2 is ready
http://svn.libburnia-project.org/libburn/branches/1.0.2
http://svn.libburnia-project.org/libburn/tags/1.0.2
2011.02.23.195650 [3615]
libburn/libdax_msgs.h
Registered new error code
2011.02.24.191718 [3619]
libburn/async.c
Corrected a flaw found by George Danchev with cpp
2011.03.01.144625 [3625]
libburn/drive.c
Bug fix: Read-only file descriptors were classified as write-only pseudo drives
svn copy -m Branching for libburn release 1.0.4
http://svn.libburnia-project.org/libburn/trunk
http://svn.libburnia-project.org/libburn/branches/1.0.4
2011.03.10.080001 [3651]
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 1.0.4
10 Mar 2011 [3652]
- cdrskin/add_ts_changes_to_libburn_1_0_2
- cdrskin/add_ts_changes_to_libburn_1_0_3
+ cdrskin/add_ts_changes_to_libburn_1_0_4
+ cdrskin/add_ts_changes_to_libburn_1_0_5
Updated cdrskin tarball generator
[]
ChangeLog
cdrskin/changelog.txt
Documented changes and release timestamp
------------------------------ release - cdrskin-1.0.4.pl00 - 2011.03.10.080001
* Bug fix: Read-only file descriptors were classified as write-only pseudo drives
------------------------------------ cycle - cdrskin-1.0.5 -
------------------------------------ cycle - cdrskin-1.0.5 -
------------------------------------ cycle - cdrskin-1.0.3 -
------------------------------------ cycle - cdrskin-1.0.3 -
@ -9262,8 +9186,6 @@ Important: When adding a public API function then add its name to file
TODO
===============================================================================
Introduce drive role 4= stdio-drive, random access, read-only
Let DVD-R DAO allocate exact track sizes (not divisible by 16 blocks)

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_1_0_4"
libvers="-DCdrskin_libburn_1_0_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_1_0_4"
elif test "$i" = "-libburn_1_0_2"
then
libvers="-DCdrskin_libburn_1_0_4"
libvers="-DCdrskin_libburn_1_0_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_1_0_5"
libvers="-DCdrskin_libburn_1_0_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_1.0.4 set macro to match libburn-1.0.4"
echo " -libburn_1_0_2 set macro to match libburn-1.0.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], [1.0.4], [http://libburnia-project.org])
AC_INIT([libburn], [1.0.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 - B10310 :
dnl Notes by ts A71207 - B10116 :
dnl
dnl Regrettably the meaning of the various version types was misunderstood
dnl before version 0.4.1.
@ -88,7 +88,6 @@ dnl 0.8.8 = libburn.so.4.53.0
dnl 0.9.0 = libburn.so.4.55.0
dnl 1.0.0 = libburn.so.4.57.0
dnl 1.0.2 = libburn.so.4.59.0
dnl 1.0.4 = libburn.so.4.61.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.
@ -114,7 +113,7 @@ dnl
dnl As said: Only copies. Original in libburn/libburn.h : burn_header_version_*
BURN_MAJOR_VERSION=1
BURN_MINOR_VERSION=0
BURN_MICRO_VERSION=4
BURN_MICRO_VERSION=2
BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
AC_SUBST(BURN_MAJOR_VERSION)
@ -125,14 +124,14 @@ 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-1.0.4
dnl This is the release version libburn-1.0.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 = 65 - 61 = 4 . Linux library name = libburn.so.4.61.0
LT_CURRENT=65
LT_AGE=61
dnl SONAME = 63 - 59 = 4 . Linux library name = libburn.so.4.59.0
LT_CURRENT=63
LT_AGE=59
LT_REVISION=0
LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`

View File

@ -355,7 +355,7 @@ void burn_disc_erase(struct burn_drive *drive, int fast)
/* a ssert(!find_worker(drive)); */
if((drive == NULL)) {
libdax_msgs_submit(libdax_messenger, -1,
libdax_msgs_submit(libdax_messenger, drive->global_index,
0x00020104,
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
"NULL pointer caught in burn_disc_erase", 0, 0);

View File

@ -1360,13 +1360,12 @@ int burn_drive__fd_from_special_adr(char *adr)
return fd;
}
/* @param flag bit0= accept read-only files and return 2 in this case
*/
static int burn_drive__is_rdwr(char *fname, int *stat_ret,
struct stat *stbuf_ret,
off_t *read_size_ret, int flag)
{
int fd, is_rdwr = 1, ret, getfl_ret, st_ret, mask;
int fd, is_rdwr = 1, ret, getfl_ret, st_ret;
struct stat stbuf;
off_t read_size = 0;
@ -1388,18 +1387,8 @@ static int burn_drive__is_rdwr(char *fname, int *stat_ret,
}
if (is_rdwr && fd >= 0) {
getfl_ret = fcntl(fd, F_GETFL);
/*
fprintf(stderr, "LIBBURN_DEBUG: burn_drive__is_rdwr: getfl_ret = %lX , O_RDWR = %lX , & = %lX , O_RDONLY = %lX\n", (unsigned long) getfl_ret, (unsigned long) O_RDWR, (unsigned long) (getfl_ret & O_RDWR), (unsigned long) O_RDONLY);
*/
mask = O_RDWR | O_WRONLY | O_RDONLY;
if (getfl_ret == -1 || (getfl_ret & mask) != O_RDWR)
if (getfl_ret == -1 || (getfl_ret & O_RDWR) != O_RDWR)
is_rdwr = 0;
if ((flag & 1) && getfl_ret != -1 &&
(getfl_ret & mask) == O_RDONLY)
is_rdwr = 2;
}
if (stat_ret != NULL)
*stat_ret = st_ret;
@ -1426,7 +1415,7 @@ int burn_drive_grab_dummy(struct burn_drive_info *drive_infos[], char *fname)
if (fname[0] != 0) {
is_rdwr = burn_drive__is_rdwr(fname, &stat_ret, &stbuf,
&read_size, 1);
&read_size, 0);
if (stat_ret == -1 || is_rdwr) {
ret = burn_os_stdio_capacity(fname, &size);
if (ret == -1) {
@ -1444,14 +1433,9 @@ int burn_drive_grab_dummy(struct burn_drive_info *drive_infos[], char *fname)
errno, 0);
return 0;
}
if (fname[0] != 0) {
/* >>> as soon as new role 4 is introduced:
if (is_rdwr == 2) role = 4; else
*/
if (fname[0] != 0)
role = 2;
} else
else
role = 0;
} else {
if(S_ISDIR(stbuf.st_mode) || !allow_role_3) {
@ -2710,12 +2694,7 @@ int burn_drive_equals_adr(struct burn_drive *d1, char *adr2_in, int role2)
fd = burn_drive__fd_from_special_adr(adr2);
if (fd != -1)
exact_role_matters = 1;
ret = burn_drive__is_rdwr(adr2, NULL, NULL, NULL, 1);
/* >>> as soon as new role 4 is introduced:
if (ret == 2) role2 = 4; else
*/
ret = burn_drive__is_rdwr(adr2, NULL, NULL, NULL, 0);
if (ret == 1)
role2 = 2;
else
@ -2729,11 +2708,11 @@ int burn_drive_equals_adr(struct burn_drive *d1, char *adr2_in, int role2)
conv_ret2 = burn_drive_convert_fs_adr(adr2, conv_adr2);
if (!exact_role_matters) {
/* roles >= 2 have the same name space and object
/* roles 2 and 3 have the same name space and object
interpretation */
if (role1 >= 2)
if (role1 == 3)
role1 = 2;
if (role2 >= 2)
if (role2 == 3)
role2 = 2;
}

View File

@ -2692,7 +2692,7 @@ void burn_version(int *major, int *minor, int *micro);
*/
#define burn_header_version_major 1
#define burn_header_version_minor 0
#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

@ -565,7 +565,6 @@ Range "scdbackup" : 0x00020000 to 0x0002ffff
0x0002017d (FATAL,HIGH) = Invalid file descriptor with stdio pseudo-drive
0x0002017e (FAILURE,HIGH) = Failed to close track, session, or disc
0x0002017f (FAILURE,HIGH) = Failed to synchronize drive cache
0x00020180 (FAILURE,HIGH) = Premature end of input encountered
libdax_audioxtr:
0x00020200 (SORRY,HIGH) = Cannot open audio source file