[Debburn-changes] r314 - in nonameyet/branches/cleanup: .
3rd-party/dirsplit cdda2wav cdrecord debian doc doc/READMEs
doc/cdda2wav doc/mkisofs include libdeflt libedc libhfs_iso
libparanoia libscg libschily libunls mkisofs mkisofs/diag
readcd rscsi scgcheck
Eduard Bloch
blade at costa.debian.org
Fri Sep 15 14:36:42 UTC 2006
Author: blade
Date: 2006-09-15 14:35:58 +0000 (Fri, 15 Sep 2006)
New Revision: 314
Added:
nonameyet/branches/cleanup/doc/DOC-OVERVIEW
nonameyet/branches/cleanup/doc/mkisofs/README
nonameyet/branches/cleanup/doc/mkisofs/README.releasenotes
nonameyet/branches/cleanup/doc/plattforms/
nonameyet/branches/cleanup/doc/wodim/
nonameyet/branches/cleanup/include/test_SYS_UNION_WAIT.c
nonameyet/branches/cleanup/include/test_UNION_WAIT.c
nonameyet/branches/cleanup/libedc/CMakeLists.txt
nonameyet/branches/cleanup/mkisofs/endianconv.h
Removed:
nonameyet/branches/cleanup/doc/READMEs/README.DiskT at 2
nonameyet/branches/cleanup/doc/READMEs/README.WORM
nonameyet/branches/cleanup/doc/READMEs/README.cdrw
nonameyet/branches/cleanup/doc/READMEs/README.clone
nonameyet/branches/cleanup/doc/READMEs/README.compile
nonameyet/branches/cleanup/doc/READMEs/README.install
nonameyet/branches/cleanup/doc/READMEs/README.mkisofs
nonameyet/branches/cleanup/doc/READMEs/README.raw
nonameyet/branches/cleanup/doc/READMEs/README.volmgt
nonameyet/branches/cleanup/doc/READMEs/plattforms/
nonameyet/branches/cleanup/doc/mkisofs/README
nonameyet/branches/cleanup/mkisofs/endian.h
Modified:
nonameyet/branches/cleanup/3rd-party/dirsplit/dirsplit.1
nonameyet/branches/cleanup/Changelog
nonameyet/branches/cleanup/FAQ
nonameyet/branches/cleanup/Makefile
nonameyet/branches/cleanup/TODO
nonameyet/branches/cleanup/VERSION
nonameyet/branches/cleanup/cdda2wav/CMakeLists.txt
nonameyet/branches/cleanup/cdda2wav/cdda2mp3
nonameyet/branches/cleanup/cdda2wav/cdda2ogg
nonameyet/branches/cleanup/cdda2wav/cdda2ogg.1
nonameyet/branches/cleanup/cdda2wav/cdda2wav.1
nonameyet/branches/cleanup/cdda2wav/list_audio_tracks.1
nonameyet/branches/cleanup/cdda2wav/pitchplay.1
nonameyet/branches/cleanup/cdda2wav/readmult.1
nonameyet/branches/cleanup/cdrecord/CMakeLists.txt
nonameyet/branches/cleanup/cdrecord/cdrecord.c
nonameyet/branches/cleanup/cdrecord/cdrecord.h
nonameyet/branches/cleanup/cdrecord/drv_mmc.c
nonameyet/branches/cleanup/cdrecord/wodim.1
nonameyet/branches/cleanup/debian/README.ATAPI.setup
nonameyet/branches/cleanup/debian/README.Debian
nonameyet/branches/cleanup/debian/cdrkit-doc.install
nonameyet/branches/cleanup/debian/changelog
nonameyet/branches/cleanup/doc/READMEs/README
nonameyet/branches/cleanup/doc/READMEs/README.cdplus
nonameyet/branches/cleanup/doc/READMEs/README.cdtext
nonameyet/branches/cleanup/doc/READMEs/README.copy
nonameyet/branches/cleanup/doc/READMEs/README.multi
nonameyet/branches/cleanup/doc/READMEs/README.verify
nonameyet/branches/cleanup/doc/cdda2wav/README
nonameyet/branches/cleanup/doc/mkisofs/README.graft_dirs
nonameyet/branches/cleanup/doc/mkisofs/README.mkhybrid
nonameyet/branches/cleanup/doc/mkisofs/README.rootinfo
nonameyet/branches/cleanup/doc/mkisofs/README.session
nonameyet/branches/cleanup/include/CMakeLists.txt
nonameyet/branches/cleanup/include/xconfig.h.in
nonameyet/branches/cleanup/libdeflt/CMakeLists.txt
nonameyet/branches/cleanup/libedc/README
nonameyet/branches/cleanup/libhfs_iso/CMakeLists.txt
nonameyet/branches/cleanup/libhfs_iso/README
nonameyet/branches/cleanup/libparanoia/CMakeLists.txt
nonameyet/branches/cleanup/libscg/CMakeLists.txt
nonameyet/branches/cleanup/libschily/CMakeLists.txt
nonameyet/branches/cleanup/libunls/CMakeLists.txt
nonameyet/branches/cleanup/mkisofs/CMakeLists.txt
nonameyet/branches/cleanup/mkisofs/apple.c
nonameyet/branches/cleanup/mkisofs/apple_driver.8
nonameyet/branches/cleanup/mkisofs/boot-alpha.c
nonameyet/branches/cleanup/mkisofs/boot-hppa.c
nonameyet/branches/cleanup/mkisofs/boot-mips.c
nonameyet/branches/cleanup/mkisofs/boot-mipsel.c
nonameyet/branches/cleanup/mkisofs/diag/isodebug.8
nonameyet/branches/cleanup/mkisofs/diag/isoinfo.8
nonameyet/branches/cleanup/mkisofs/endian.c
nonameyet/branches/cleanup/mkisofs/fnmatch.c
nonameyet/branches/cleanup/mkisofs/jte.c
nonameyet/branches/cleanup/mkisofs/mac_label.c
nonameyet/branches/cleanup/mkisofs/mkisofs.8
nonameyet/branches/cleanup/readcd/CMakeLists.txt
nonameyet/branches/cleanup/readcd/readcd.1
nonameyet/branches/cleanup/rscsi/CMakeLists.txt
nonameyet/branches/cleanup/scgcheck/CMakeLists.txt
nonameyet/branches/cleanup/scgcheck/scgcheck.1
Log:
Merge with trunk (r313)
Modified: nonameyet/branches/cleanup/3rd-party/dirsplit/dirsplit.1
===================================================================
--- nonameyet/branches/cleanup/3rd-party/dirsplit/dirsplit.1 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/3rd-party/dirsplit/dirsplit.1 2006-09-15 14:35:58 UTC (rev 314)
@@ -24,3 +24,4 @@
.SH AUTHOR
\fBdirsplit\fR is created by Eduard Bloch (blade at debian.org) and is licensed
under the GPLv2.
+
Modified: nonameyet/branches/cleanup/Changelog
===================================================================
--- nonameyet/branches/cleanup/Changelog 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/Changelog 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,14 +1,30 @@
cdrkit (1.0pre5) UNRELEASED; urgency=low
- [ Christian Fromme ]
- * big cleanup, phase I, getting rid from Cstyle function definitions in
- applications
[ Eduard Bloch ]
* added better check for capability.h and FATAL_ERROR if it's missing on Linux
* wodim.1 updates, ie. moved suid howto to README.suidroot, Linux bashing to
README.linux, more notes about non-root usage (corrections by Peter)
* config parser rewrite; more user-friendly, flexibel, tolerant now
+ * more carefull description of the role of previous developer and his own
+ project
+ * fixed libmagic detection
+ * rewrote README.mkisofs, README.win32
+ * better track numbers extraction command in cdda2ogg/cdda2mp3
+ * reenabled (forgotten) support for libedc
+ [ Modestas Vainius ]
+ * dropped . from the include path and fixed mkisofs source to use the local
+ headers
+
+ [ Christian Fromme ]
+ * big cleanup, phase I, getting rid from Cstyle function definitions in
+ applications
+ * detailed review and correction of author related data in manpages and
+ README files
+
+ [ Peter Samuelson, Tollef Fog Heen ]
+ * typo and grammar fixes in mkisofs.8
+
-- Eduard Bloch <blade at debian.org> Wed, 6 Sep 2006 22:05:30 +0200
[ Eduard Bloch ]
Modified: nonameyet/branches/cleanup/FAQ
===================================================================
--- nonameyet/branches/cleanup/FAQ 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/FAQ 2006-09-15 14:35:58 UTC (rev 314)
@@ -5,3 +5,10 @@
A: It is not a forest troll and not a winner of the inpronounceability
contest. It was simply the next alternative to wom (Writes Optical Media)
which was unfortunately already used by other software products.
+
+Q: Are there additional depedencies, compared to cdrtools?
+A: Yes. Libcap is required on Linux plattform. Libmagic is needed to support
+content-based creator/type tables with HFS (optional). Libiconv is needed to
+support iconv-based filename converstion, eg. from UTF-8 ins Joliet's UCS-2
+unicode (optional, on plattform where iconv is not already included in the libc
+system library).
Modified: nonameyet/branches/cleanup/Makefile
===================================================================
--- nonameyet/branches/cleanup/Makefile 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/Makefile 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,16 +1,18 @@
+all: build/Makefile
ifneq ($(CFLAGS),)
-EXTRA_CMAKE_FLAGS += -DCMAKE_C_FLAGS="$(CFLAGS)"
+ cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
endif
-
-all: build/Makefile
$(MAKE) -C build $(MAKE_FLAGS) all
DISTNAME=cdrkit-$(shell cat VERSION)
build/Makefile:
@-mkdir build 2>/dev/null
- cd build && cmake .. $(EXTRA_CMAKE_FLAGS)
+ cd build && cmake ..
+ifneq ($(CFLAGS),)
+ cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
+endif
cmakepurge:
rm -rf install_manifest.txt progress.make CMakeFiles CMakeCache.txt cmake_install.cmake
@@ -24,6 +26,9 @@
rm -rf build
%: build/Makefile
+ifneq ($(CFLAGS),)
+ cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
+endif
$(MAKE) -C build $(MAKE_FLAGS) $@
ifneq ($(PREFIX),)
Modified: nonameyet/branches/cleanup/TODO
===================================================================
--- nonameyet/branches/cleanup/TODO 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/TODO 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,13 +1,22 @@
- Check the readmes. Drop obsolete instructions. (assigned to: ???)
+ - check libparanoia, we may link dynamicaly with it. Quality? Portability?
+ - POSIX checks for sys/wait.h rather than pure existence check
+ - proper getnameinfo/inet_ntoa checks, see include/CMakeLists.txt
+ - find out why spawn.c breaks in WAIT_H while the WAIT_UNION check works quite well on sys/wait.h. See include/CMakeLists.txt comments.
+ - rewrite or drop fconv.c, it does not compile on AIX, missing isnan symbol. Or link libm, as alternative.
- check notes in help output, drop advisories, notes about future plans...
- some cdda2wav defined moved from the ueber-long command line to lconfig.h ,
make them configurable. Implement generation of cdda2wav/lconfig.h or just
replace with cmake macros (assigned to: ???)
- - add better detection for various functions. Eg. correct checks for have_soundcard, have_mlockall and have_wait_h for cygwin. (volunteers?)
+ - add better detection for various functions. Eg. correct checks for have_soundcard, have_mlockall for cygwin. (volunteers?)
- see http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=cdrkit and try to solve upstream related problems
- find and eliminate remaining ".mk" ".mk*" files (where? cleanup branch)
- Can we rename the 'cdrecord' directory into 'wodim'?
- That may be hard on the build system, this could be the best time
- to change it.
+ That may be hard on the build system, this could be the best time to change
+ it. (No, it isn't hard. Just needs a good moment to settle down everything and
+ then rename. EB.)
+ - implement -stream-file-name. Then close #157962
+
+
Modified: nonameyet/branches/cleanup/VERSION
===================================================================
--- nonameyet/branches/cleanup/VERSION 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/VERSION 2006-09-15 14:35:58 UTC (rev 314)
@@ -1 +1 @@
-1.0pre4
+1.0pre5
Modified: nonameyet/branches/cleanup/cdda2wav/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/cdda2wav/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdda2wav/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
PROJECT (CDDA2WAV)
-INCLUDE_DIRECTORIES(../include ../cdrecord . ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../cdrecord ${CMAKE_BINARY_DIR})
include(../include/AddScgBits.cmake)
FIND_FILE (HAVE_SYS_SOUNDCARD_H sys/soundcard.h)
@@ -11,12 +11,16 @@
ADD_DEFINITIONS(-DHAVE_LINUX_SOUNDCARD_H)
ENDIF(HAVE_LINUX_SOUNDCARD_H)
+LIST(APPEND LIBS schily deflt paranoia)
+IF (WIN32)
+ LIST(APPEND LIBS winmm)
+ENDIF (WIN32)
+
LINK_DIRECTORIES(../libschily ../libscg ../libdeflt ../libparanoia)
ADD_EXECUTABLE (cdda2wav aifc.c aiff.c base64.c cd_misc.c cdda2wav.c defaults.c getnum.c interface.c ioctl.c md5c.c modes.c raw.c resample.c ringbuff.c scsi_cdr.c scsi_cmds.c scsi_scan.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
-TARGET_LINK_LIBRARIES(cdda2wav ${SCG_LIBS} schily deflt paranoia)
+TARGET_LINK_LIBRARIES(cdda2wav ${SCG_LIBS} ${LIBS})
SET_TARGET_PROPERTIES(cdda2wav PROPERTIES SKIP_BUILD_RPATH TRUE)
-
INSTALL(TARGETS cdda2wav DESTINATION bin)
INSTALL(PROGRAMS pitchplay readmult cdda2mp3 cdda2ogg DESTINATION bin)
INSTALL(FILES cdda2ogg.1 cdda2wav.1 pitchplay.1 readmult.1 list_audio_tracks.1 DESTINATION share/man/man1)
Modified: nonameyet/branches/cleanup/cdda2wav/cdda2mp3
===================================================================
--- nonameyet/branches/cleanup/cdda2wav/cdda2mp3 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdda2wav/cdda2mp3 2006-09-15 14:35:58 UTC (rev 314)
@@ -42,7 +42,7 @@
if [ -z "$LIST" ] ; then
echo Looking for available tracks...
- LIST="$($CDDA2WAV -v trackid -t -1 2>&1|grep T:|cut -f1 -d.|cut -f2 -d:)"
+ LIST="$( cdda2wav -J -vtoc -H 2>&1 | sed -e 's/^[^\ ].*//; s/\.([^)]*)/ /g;s/,//g;')"
if [ -z "$LIST" ] ; then
echo "ERROR: No valid audio tracks detected"
exit 1
Modified: nonameyet/branches/cleanup/cdda2wav/cdda2ogg
===================================================================
--- nonameyet/branches/cleanup/cdda2wav/cdda2ogg 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdda2wav/cdda2ogg 2006-09-15 14:35:58 UTC (rev 314)
@@ -43,14 +43,14 @@
if [ -z "$LIST" ] ; then
echo Looking for available tracks...
- LIST="$($CDDA2WAV -v trackid -t -1 2>&1|grep T:|cut -f1 -d.|cut -f2 -d:)"
+ LIST="$( cdda2wav -J -vtoc -H 2>&1 | sed -e 's/^[^\ ].*//; s/\.([^)]*)/ /g;s/,//g;')"
if [ -z "$LIST" ] ; then
echo "ERROR: No valid audio tracks detected"
exit 1
fi
fi
-echo Fetching `echo $LIST | wc -w` tracks in $CDDA_DEVICE, encoding with $MP_CODER.
+echo Fetching `echo $LIST | wc -w` tracks from $CDDA_DEVICE, encoding with $MP_CODER.
echo Cancel with Ctrl-C, watch out for error messages.
for TRACK in $LIST ; do
Modified: nonameyet/branches/cleanup/cdda2wav/cdda2ogg.1
===================================================================
--- nonameyet/branches/cleanup/cdda2wav/cdda2ogg.1 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdda2wav/cdda2ogg.1 2006-09-15 14:35:58 UTC (rev 314)
@@ -85,6 +85,28 @@
.BR cdda2wav (1)
.SH "AUTHOR"
.PP
+This manpage describes the program implementation of
+.B
+cdda2ogg
+as shipped by the cdrkit distribution. See
+.B
+http://alioth.debian.org/projects/debburn/
+for details. It is a spinoff from the original program distributed by the cdrtools project. However, the cdrtools developers are no longer involved in the development of this spinoff and therefore shall not be made responsible for any problem caused by it. Do not try to get support for this program by contacting the original authors.
+.PP
+If you have support questions, send them to
+.PP
+.B
+debburn-devel at lists.alioth.debian.org
+.br
+.PP
+If you have definitely found a bug, send a mail to this list or to
+.PP
+.B
+submit at bugs.debian.org
+.br
+.PP
+writing at least a short description into the Subject and "Package: cdrkit" into the first line of the mail body.
+.PP
This manual page was written by Eduard Bloch
(blade at debian.org) for the
.B "Debian GNU/Linux system (but may be used by others). Permission is granted
Modified: nonameyet/branches/cleanup/cdda2wav/cdda2wav.1
===================================================================
--- nonameyet/branches/cleanup/cdda2wav/cdda2wav.1 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdda2wav/cdda2wav.1 2006-09-15 14:35:58 UTC (rev 314)
@@ -951,5 +951,27 @@
Libparanoia contributed by Monty (Christopher Montgomery) xiphmont at mit.edu.
.SH AUTHOR
Heiko Eissfeldt heiko at colossus.escape.de
+.PP
+This manpage describes the program implementation of
+.B
+cdda2wav
+as shipped by the cdrkit distribution. See
+.B
+http://alioth.debian.org/projects/debburn/
+for details. It is a spinoff from the original program distributed by the cdrtools project. However, the cdrtools developers are no longer involved in the development of this spinoff and therefore shall not be made responsible for any problem caused by it. Do not try to get support for this program by contacting the original authors.
+.PP
+If you have support questions, send them to
+.PP
+.B
+debburn-devel at lists.alioth.debian.org
+.br
+.PP
+If you have definitely found a bug, send a mail to this list or to
+.PP
+.B
+submit at bugs.debian.org
+.br
+.PP
+writing at least a short description into the Subject and "Package: cdrkit" into the first line of the mail body.
.SH DATE
-11 Sep 2002
+11 Sep 2006
Modified: nonameyet/branches/cleanup/cdda2wav/list_audio_tracks.1
===================================================================
--- nonameyet/branches/cleanup/cdda2wav/list_audio_tracks.1 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdda2wav/list_audio_tracks.1 2006-09-15 14:35:58 UTC (rev 314)
@@ -21,6 +21,28 @@
\fBcdda2was\fP was written by Joerg Schilling <js at cs\&.tu-berlin\&.de> and
others.
.PP
+This manpage describes the program implementation of
+.B
+list_audio_tracks
+as shipped by the cdrkit distribution. See
+.B
+http://alioth.debian.org/projects/debburn/
+for details. It is a spinoff from the original program distributed by the cdrtools project. However, the cdrtools developers are no longer involved in the development of this spinoff and therefore shall not be made responsible for any problem caused by it. Do not try to get support for this program by contacting the original authors.
+.PP
+If you have support questions, send them to
+.PP
+.B
+debburn-devel at lists.alioth.debian.org
+.br
+.PP
+If you have definitely found a bug, send a mail to this list or to
+.PP
+.B
+submit at bugs.debian.org
+.br
+.PP
+writing at least a short description into the Subject and "Package: cdrkit" into the first line of the mail body.
+.PP
This manual page was written by Oleksandr Moskalenko
<malex at tagancha\&.org>, for
the Debian GNU/Linux system\&. It may be used by other distributions
Modified: nonameyet/branches/cleanup/cdda2wav/pitchplay.1
===================================================================
--- nonameyet/branches/cleanup/cdda2wav/pitchplay.1 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdda2wav/pitchplay.1 2006-09-15 14:35:58 UTC (rev 314)
@@ -28,6 +28,28 @@
.PP
\fBcdda2was\fP was written by Joerg Schilling <js at cs\&.tu-berlin\&.de> and
others.
+.PP
+This manpage describes the program implementation of
+.B
+pitchplay
+as shipped by the cdrkit distribution. See
+.B
+http://alioth.debian.org/projects/debburn/
+for details. It is a spinoff from the original program distributed by the cdrtools project. However, the cdrtools developers are no longer involved in the development of this spinoff and therefore shall not be made responsible for any problem caused by it. Do not try to get support for this program by contacting the original authors.
+.PP
+If you have support questions, send them to
+.PP
+.B
+debburn-devel at lists.alioth.debian.org
+.br
+.PP
+If you have definitely found a bug, send a mail to this list or to
+.PP
+.B
+submit at bugs.debian.org
+.br
+.PP
+writing at least a short description into the Subject and "Package: cdrkit" into the first line of the mail body.
.PP
This manual page was written by Oleksandr Moskalenko
<malex at tagancha\&.org>, for
Modified: nonameyet/branches/cleanup/cdda2wav/readmult.1
===================================================================
--- nonameyet/branches/cleanup/cdda2wav/readmult.1 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdda2wav/readmult.1 2006-09-15 14:35:58 UTC (rev 314)
@@ -20,6 +20,29 @@
.PP
\fBcdda2was\fP was written by Joerg Schilling <js at cs\&.tu-berlin\&.de> and
others.
+.PP
+This describes the program as shipped with cdrkit, see
+This manpage describes the program implementation of
+.B
+readmult
+as shipped by the cdrkit distribution. See
+.B
+http://alioth.debian.org/projects/debburn/
+for details. It is a spinoff from the original program distributed by the cdrtools project. However, the cdrtools developers are no longer involved in the development of this spinoff and therefore shall not be made responsible for any problem caused by it. Do not try to get support for this program by contacting the original authors.
+.PP
+If you have support questions, send them to
+.PP
+.B
+debburn-devel at lists.alioth.debian.org
+.br
+.PP
+If you have definitely found a bug, send a mail to this list or to
+.PP
+.B
+submit at bugs.debian.org
+.br
+.PP
+writing at least a short description into the Subject and "Package: cdrkit" into the first line of the mail body.
.PP
This manual page was written by Oleksandr Moskalenko
<malex at tagancha\&.org>, for
Modified: nonameyet/branches/cleanup/cdrecord/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/cdrecord/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdrecord/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
PROJECT (CDRECORD)
-INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libedc ${CMAKE_BINARY_DIR})
INCLUDE(../include/AddScgBits.cmake)
AUX_SOURCE_DIRECTORY(. CDRECORD_SRCS)
@@ -13,9 +13,12 @@
MESSAGE(FATAL_ERROR "Error: found a Linux system but no libcap header. Install libcap-dev.")
endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CAPTEST)
-LINK_DIRECTORIES(../libschily ../libscg ../libdeflt)
+LINK_DIRECTORIES(../libschily ../libscg ../libdeflt ../libedc)
+
+ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC)
+
ADD_EXECUTABLE (wodim ${CDRECORD_SRCS})
-TARGET_LINK_LIBRARIES(wodim ${SCG_LIBS} schily deflt ${CAPLINK})
+TARGET_LINK_LIBRARIES(wodim ${SCG_LIBS} schily deflt libedc ${CAPLINK})
SET_TARGET_PROPERTIES(wodim PROPERTIES SKIP_BUILD_RPATH TRUE)
INSTALL(TARGETS wodim DESTINATION bin)
Modified: nonameyet/branches/cleanup/cdrecord/cdrecord.c
===================================================================
--- nonameyet/branches/cleanup/cdrecord/cdrecord.c 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdrecord/cdrecord.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -320,6 +320,9 @@
"Copyright (C) 2006 cdrkit maintainers, (C) 1994-2006 Joerg Schilling\n\n"
);
+ if(strcmp(av[0], "cdrecord") == 0)
+ strcpy(av[0], "wodim");
+
#ifdef __EMX__
/* This gives wildcard expansion with Non-Posix shells with EMX */
_wildcard(&argc, &argv);
Modified: nonameyet/branches/cleanup/cdrecord/cdrecord.h
===================================================================
--- nonameyet/branches/cleanup/cdrecord/cdrecord.h 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdrecord/cdrecord.h 2006-09-15 14:35:58 UTC (rev 314)
@@ -112,7 +112,7 @@
* start writing.
*/
#ifndef MIN_GRACE_TIME
-#define MIN_GRACE_TIME 0 /* 3 seconds */
+#define MIN_GRACE_TIME 0 /* changed to 0, there is no point in forcing it in this application. Fix your volume management if it breaks because it could not read the medium. */
#endif
#ifndef GRACE_TIME
#define GRACE_TIME 9 /* 9 seconds */
Modified: nonameyet/branches/cleanup/cdrecord/drv_mmc.c
===================================================================
--- nonameyet/branches/cleanup/cdrecord/drv_mmc.c 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdrecord/drv_mmc.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -60,7 +60,7 @@
#include <scg/scsireg.h>
#include <scg/scsitransp.h>
-#include <scsimmc.h>
+#include "scsimmc.h"
#include "mmcvendor.h"
#include "cdrecord.h"
Modified: nonameyet/branches/cleanup/cdrecord/wodim.1
===================================================================
--- nonameyet/branches/cleanup/cdrecord/wodim.1 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/cdrecord/wodim.1 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,3 +1,5 @@
+.\" @(#)wodim.1 06/09/10 Copyright 2006 Cdrkit maintainers
+.\" derived from:
.\" @(#)cdrecord.1 1.106 06/02/09 Copyright 1996 J. Schilling
.\"
.\" This program is free software; you can redistribute it and/or modify
@@ -63,12 +65,12 @@
.I device
is the device file offered by the operating system to access the recorder. On
.I Linux
-systems it is usualy
+systems it is usually
.IR /dev/hd...
for IDE/ATAPI based devices and
.IR /dev/sg...
for SCSI based defices. Note that sg... devices represent the access trough the
-SCSI GENERIC interface and therefore the differ from the device files generaly
+SCSI GENERIC interface and therefore the differ from the device files generally
used to open block devices (/dev/scd... or /dev/sr...).
.PP
In any case, the user running
@@ -703,7 +705,7 @@
than 8 MB to write a CD at a speed less than 20x from an image on a
local file system on an idle machine, your machine is either underpowered,
has hardware problems or is mis-configured.
-If you like to write DVDs or to write CDs at higher speed, it makes sense
+If you like to write DVDs or CDs at higher speed, it makes sense
to use at least 16\ MB for the FIFO.
.sp
On old and small machines, you need to be more careful with the FIFO size.
@@ -788,7 +790,8 @@
.BI gracetime= #
Set the grace time before starting to write to
.IR # " seconds.
-Values below 2 seconds are not allowed.
+Values below 2 seconds are not recommended to give the kernel or volume
+management a chance to learn the new state.
.TP
.BI timeout= #
Set the default SCSI command timeout value to
@@ -2346,7 +2349,7 @@
.SH AUTHORS
.B wodim
-is currently maintained as part of the cdrkit project by its developers. Most of the code and this manual page was originaly written by:
+is currently maintained as part of the cdrkit project by its developers. Most of the code and this manual page was originally written by:
.PP
.nf
Joerg Schilling
Modified: nonameyet/branches/cleanup/debian/README.ATAPI.setup
===================================================================
--- nonameyet/branches/cleanup/debian/README.ATAPI.setup 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/debian/README.ATAPI.setup 2006-09-15 14:35:58 UTC (rev 314)
@@ -27,7 +27,7 @@
cdrom group ("adduser user cdrom") and let the user completely logout and
re-login.
Note: with certain kernel versions wodim can fail with this message:
-"cdrecord: Operation not permitted. Cannot send SCSI cmd via ioctl"
+"wodim: Operation not permitted. Cannot send SCSI cmd via ioctl"
In this case it still does need the suid bit - please send patches if you have
identified the reason of that problem.
Modified: nonameyet/branches/cleanup/debian/README.Debian
===================================================================
--- nonameyet/branches/cleanup/debian/README.Debian 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/debian/README.Debian 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,10 +1,12 @@
cdrkit for Debian
----------------
-cdrkit is Cd Recording Kit, a collection of applications related
-to creation of optical disk media on unixoid platforms. It is heavily based on
-the cdrtools package (partially developed and maintained by Joerg Schilling
-<schilling at fokus.gmd.de> before), however it is maintained independently now.
+cdrkit is Cd Recording Kit, a collection of applications related to creation
+of optical disk media on unixoid platforms. It is a spinoff from the original
+program distributed by the cdrtools project. However, the cdrtools developers
+are no longer involved in the development of this spinoff and therefore shall
+not be made responsible for any problem caused by it.
+Do not try to get support for this program by contacting the original authors.
If you want to report Bugs please read the following:
Modified: nonameyet/branches/cleanup/debian/cdrkit-doc.install
===================================================================
--- nonameyet/branches/cleanup/debian/cdrkit-doc.install 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/debian/cdrkit-doc.install 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,4 +1,3 @@
doc/* usr/share/doc/cdrkit-doc/
3rd-party/zisofs_tools/README usr/share/doc/cdrkit-doc/zisofs
-ABOUT usr/share/doc/cdrkit-doc/
-START usr/share/doc/cdrkit-doc/
+ABOUT FORK FAQ usr/share/doc/cdrkit-doc/
Modified: nonameyet/branches/cleanup/debian/changelog
===================================================================
--- nonameyet/branches/cleanup/debian/changelog 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/debian/changelog 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,3 +1,13 @@
+cdrkit (5:1.0~pre5-2) unstable; urgency=low
+
+ * New upstream source snapshot
+ + typos in wodim.1 fixes, thanks to J. Alto (closes: #386898)
+ + enabled libedc support (closes: #387429)
+ * fixed installation of FAQ and FORK files (closes: #386735)
+ * remove . from the include list, patch by Modestas Vainius (closes: 358497)
+
+ -- Eduard Bloch <blade at debian.org> Tue, 12 Sep 2006 11:16:34 +0200
+
cdrkit (5:1.0~pre4-1) unstable; urgency=low
[ Peter Samuelson ]
Copied: nonameyet/branches/cleanup/doc/DOC-OVERVIEW (from rev 313, nonameyet/trunk/doc/DOC-OVERVIEW)
===================================================================
--- nonameyet/branches/cleanup/doc/DOC-OVERVIEW (rev 0)
+++ nonameyet/branches/cleanup/doc/DOC-OVERVIEW 2006-09-15 14:35:58 UTC (rev 314)
@@ -0,0 +1,35 @@
+This is the documentation collection of the cdrkit package
+
+It has been derived from the cdrtools package maintained by
+Joerg Schilling. However, other maintainers work on this
+spinoff of the documentation.
+
+Keep in mind that cdrkit is not cdrtools when you read the
+documentation. Some details may be void in context of
+cdrkit.
+
+Contents:
+
+ANNOUNCEMENTs : directory containing AN* files with release
+ notes from old cdrtools releases
+
+READMEs : contains HOWTOs and instructions relevant to
+ various tasks, especially such where multiple
+ programs are involved
+
+wodim : contains README files relevant for the work with the
+ wodim application (writting data) and details specific
+ to its usage
+
+mkisofs : documentation for work with the mkisofs, a
+ ISO9660 filesystem creator. See mkisofs/README for
+ details.
+
+cdda2wav : contains documentation for the CD audio
+ extraction utility cdda2wav. See cdda2wav/README for
+ details.
+
+plattforms : contains notes about portability to different
+ plattforms
+
+
Modified: nonameyet/branches/cleanup/doc/READMEs/README
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README 2006-09-15 14:35:58 UTC (rev 314)
@@ -5,9 +5,10 @@
attached below.
Most of the installation instructions mentioned below are void in context of
-cdrkit. Don't rely on them. Read the INSTALL file to learn to install cdrkit.
+cdrkit. Don't rely on them. Read the INSTALL file for instructions on how to
+install cdrkit.
-Many of compatibility and portability descriptions below are void in context of
+Many compatibility and portability descriptions below are void in context of
cdrkit. Cdrkit is less portable than cdrtools and may support fewer devices.
Cdrkit maintainers encourage to submit results from users of non-Linux
platforms.
@@ -17,6 +18,16 @@
The same applies to most README.<topic> files found in this directory.
+Wodim has been successfully tested on the following drives:
+
+BENQ DVD DD DW1640
+Philips CDD 3610
+Lite-ON LTR-24102B
+
+It seems that all drives manufactured in this millenium are MMC compliant and
+therefore they should be supported by wodim. When problems appear, you may have
+found a firmware bug in this drive. Try upgrading the firmware in this case.
+
-- Eduard Bloch <blade at debian.org> Wed, 06 Sep 2006 18:08:08 +0200
# @(#)README 1.25 02/12/25 Copyright 1996-2002 J. Schilling
Deleted: nonameyet/branches/cleanup/doc/READMEs/README.DiskT at 2
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.DiskT at 2 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.DiskT at 2 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,63 +0,0 @@
-New driveropts= option "tattoofile=". Use together with -checkdrive
-to write an image of the right size to disk.
-
- DiskT at 2 hints:
-
- In order to have "DISKTATTOO" listed in the "Driver flags",
- the disk currently inserted must be usable for the DiskT at 2 feature.
- This means that there needs to be enough space on it.
-
- You need an B&W image with 3744 pixels per line
-
- Best start with a 3744 x 320 pixel image.
- The correct size may be retrieved with
- cdrecord driveropts=tattooinfo -checkdrive
-
- To get RAW image data:
-
- - Take 'xv' and save the image in PBM/PGM/PPM (raw) mode
-
- - use a binary aware (must support unlimited linelength)
- editor such as 'ved' and remove the header lines.
- These lines look like:
-
- P5
- # CREATOR: XV Version 3.10a Rev: 12/29/94 (PNG patch 1.2)
- # CREATOR: XV Version 3.10a Rev: 12/29/94 (PNG patch 1.2)
- 3744 144
- 255
-
- Now you should have (in case of the file above) a file that
- has exactly 539136 Bytes.
-
- - Note that the tattoo image must be left to right flipped
- (a mirror image).
-
-From a hint from "E. Robert Bogusta" <rob23 at tmr.com>:
-
-Take an image, and do:
-
- djpeg myface.jpg | ppmtopgm | pnmflip -lr |
- pnmscale -xsi 3744 -ysi 320 | sed '1,/255/d' >myface.tattoo
-
-So:
- djpeg extracts ppm from a jpeg. Use your favorite other way of getting
-this far is you wish.
-
- ppmtopgm changes color to grey scale
-
- pnmflip -lr flips left to right, the small image is faster
-
- pnmscale makes it 3644x320 regardless of starting size. This may make it
-look really odd on the CD if it doesn't start off the right size. More on
-this after I try it.
-
- sed strips from the first line to the line containing 255, which is the
-last header line.
-
-Note that it would be better to use the actual height of the applicable image instead
-of the maximum value of 320 and it would be even more correct to create an
-image that has the right width/height ratio for the target on CD in order
-get an undistorted view of the image on CD.
-
-For best visibility, use black text on light background.
Deleted: nonameyet/branches/cleanup/doc/READMEs/README.WORM
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.WORM 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.WORM 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,10 +0,0 @@
-CD-R drives are anything but WORM drives, but older drives identify themselves
-as WORM drives.
-A Worm drive is able to write each sector once at any time without preparation.
-A CD-R drives is not and never will be able to do this.
-However some old drives identify as WORM drives.
-
-For this reason the SCSI-3 standard tells CD-R drives simply CD drives
-with multi media extensions.
-
-
Modified: nonameyet/branches/cleanup/doc/READMEs/README.cdplus
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.cdplus 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.cdplus 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
-Cdrecord allows you to create multi-session CD's with all
-supported drives. Cdrecord comes with a hacked mkisofs
+wodim allows you to create multi-session CD's with all
+supported drives. wodim comes with a hacked mkisofs
that allows you to that on even on systems that don't support
a sectorsize 2048 Bytes (e.g. SGI IRIX and old versions of Solaris)
or systems that don't support raw device access (e.g. OS/2 W95/W98/WNT).
@@ -20,11 +20,11 @@
This first audio session may be written in TAO mode with the command
- cdrecord -multi -audio file1 ....
+ wodim -multi -audio file1 ....
or in DAO mode with the command
- cdrecord -dao -multi -useinfo -audio file1 ....
+ wodim -dao -multi -useinfo -audio file1 ....
To add the second session that contains the data track, you need
to create an ISO-9660 file system that starts not at sector 0.
@@ -32,7 +32,7 @@
With the current mkisofs (1.12), you must use the following method:
-- First call cdrecord -msinfo for your prepared multi-session audio CD.
+- First call wodim -msinfo for your prepared multi-session audio CD.
you will get something like 0,12345
@@ -40,9 +40,9 @@
mkisofs -o fs.raw -C 0,12345 root_directory_for_new_cd
- replace 0,12345 with your actual cdrecord -msinfo output.
+ replace 0,12345 with your actual wodim -msinfo output.
-the image in fs.raw may now be written with cdrecord as second session.
+the image in fs.raw may now be written with wodim as second session.
See my README.multi for more info on how to create multi session CD's
@@ -51,18 +51,18 @@
cdda2wav -vall -B
- cdrecord -multi -audio audio_tracks ....
+ wodim -multi -audio audio_tracks ....
or
- cdrecord -dao -useinfo -multi -audio audio_tracks ....
+ wodim -dao -useinfo -multi -audio audio_tracks ....
- cdrecord -msinfo ....
+ wodim -msinfo ....
(output is e.g. 0,12345)
mkisofs -R -o cd_plus.raw -C 0,12345 root_dir_of_fs
- cdrecord -data cd_plus.raw
+ wodim -data cd_plus.raw
or
- cdrecord -multi cd_plus.raw
+ wodim -multi cd_plus.raw
Note: If you want to create an HFS hybrid as the data track, then you must
@@ -70,3 +70,22 @@
as an ISO9660/Joliet CD when used on a Mac.
Jörg
+
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
+This describes the programs as shipped with cdrkit, a spinoff from the
+cdrtools project. However, the cdrtools developers are no longer
+involved in the development of this spinoff and therefore shall not
+be made responsible for any problem caused by it. Do not try to get
+support for this program by contacting the original authors.
+
+If you have support questions, send them to
+
+debburn-devel at lists.alioth.debian.org
+
+If you have definitely found a bug, send a mail to this list or to
+
+submit at bugs.debian.org
+
+writing at least a short description into the Subject and "Package: cdrkit"
+into the first line of the mail body.
Deleted: nonameyet/branches/cleanup/doc/READMEs/README.cdrw
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.cdrw 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.cdrw 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,13 +0,0 @@
-Using CD-RW media Mini Howto FAQ
-
-CD-RW drives usually support packet writing, but as there
-is currently no usable UDF filesystem support you may only use
-the simple cdrecord approach.
-
-Cdrecord writes to CD-RW media in exactly the same way as it
-does with CD-R.
-
-You may erase a complete disk in preparation to reuse it.
-Check the man page entry for the blank= option of cdrecord.
-Not all drives support all blanking modes. Usually
-blank=fast or blank=full are working.
Modified: nonameyet/branches/cleanup/doc/READMEs/README.cdtext
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.cdtext 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.cdtext 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,16 +1,16 @@
CD-Text Usage (to copy CD-Text from master CD):
cdda2wav -D 6,0 -vall -B # To extract audio information
- cdrecord dev=6,0 -vv -toc # To extract CD-Text information
+ wodim dev=6,0 -vv -toc # To extract CD-Text information
and then
- cdrecord dev=6,0 -v -dao textfile=cdtext.dat -useinfo *.wav
+ wodim dev=6,0 -v -dao textfile=cdtext.dat -useinfo *.wav
or
- cdrecord dev=6,0 -v -raw96r textfile=cdtext.dat -useinfo *.wav
+ wodim dev=6,0 -v -raw96r textfile=cdtext.dat -useinfo *.wav
If the CD-Text information contains more CRC errors than
- cdrecord can correct, you need to reload the CD and to
+ wodim can correct, you need to reload the CD and to
re-read the CD-Text information from the master disk.
Writing of CD-Text is supported for all drives that support
@@ -42,9 +42,9 @@
and then call
- cdrecord dev=6,0 -v -dao -text -useinfo *.wav
+ wodim dev=6,0 -v -dao -text -useinfo *.wav
or
- cdrecord dev=6,0 -v -raw96r -text -useinfo *.wav
+ wodim dev=6,0 -v -raw96r -text -useinfo *.wav
If you like to create your own CD-text data for a CD use the
@@ -54,8 +54,12 @@
then edit the *.inf Files and add album and song titles.
- Now call cdrecord as if the *.nf files contain CD-Text
+ Now call wodim as if the *.nf files contain CD-Text
information.
Note that it is recommended to use less that 160 characters
for a single string.
+
+Source: README.cdtext from cdrtools package
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
Deleted: nonameyet/branches/cleanup/doc/READMEs/README.clone
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.clone 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.clone 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,26 +0,0 @@
-Hints for how to copy a CD using the clone method:
-
-Step 1 (read master CD):
-
- Call "readcd dev=b,t,l -clone f=somefile" and the files
-
- somefile
- and
- somefile.toc
-
- will be generated.
-
- If the disk contains many sectors that are unreadable by intention,
- call "readcd dev=b,t,l -clone -nocorr f=somefile"
-
-
-Step 2 (write copy):
-
- Call "cdrecord dev=b,t,l -raw96r -clone -v somefile"
-
-If cdrecord complains that your drive does not support -raw96r, but the
-drive is able to do clone writing at all, then cdrecord will propose you
-a different write mode that works with the drive.
-
-
-
Deleted: nonameyet/branches/cleanup/doc/READMEs/README.compile
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.compile 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.compile 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,335 +0,0 @@
-Short overview for those who don't read manuals:
-
- Calling configure manually is outdated because this is a task of the
- makefile system.
-
- There is no 'configure', simply call 'make' on the top level
- directory.
-
- ***** If this does not work for you, read the rest if this file *****
- ***** If you have any problem, also first read the topic specific *****
- ***** README.* files (e.g. README.linux for Linux problems). *****
-
- All results in general will be placed into a directory named
- OBJ/<arch-name>/ in the current projects leaf directory.
-
- You **need** either my "smake" program, the SunPRO make
- from /usr/bin/make (SunOS 4.x) or /usr/ccs/bin/make (SunOS 5.x)
- or GNU make to compile this program. Read README.gmake for
- more information on gmake and a list of the most annoying bugs in gmake.
-
- All other make programs are either not smart enough or have bugs.
-
- My "smake" source is at:
-
- ftp://ftp.berlios.de/pub/smake/alpha/
-
- It is easy to compile and doesn't need a working make program
- on your machine. If you don't have a working "make" program on the
- machine where you like to compile "smake" read the file "BOOTSTRAP".
-
- If you have the choice between all three make programs, the
- preference would be
-
- 1) smake (preferred)
- 2) SunPRO make
- 3) GNU make (this is the last resort)
-
- Important notice: "smake" that comes with SGI/IRIX will not work!!!
- This is not the Schily "smake" but a dumb make program from SGI.
-
- ***** If you are on a platform that is not yet known by the *****
- ***** Schily makefilesystem you cannot use GNU make. *****
- ***** In this case, the automake features of smake are required. *****
-
- Please read the README's for your operating system too.
-
- WARNING
- Do not use 'mc' to extract the tar file!
- All mc versions before 4.0.14 cannot extract symbolic links correctly.
-
- The versions of WinZip that support tar archives cannot be used too.
- The reason is that they don't support symbolic links.
- Star and Gnutar do support symbolic links even on win32 systems.
- To support symbolic links on win32, you need to link with the
- Cygwin32 POSIX library.
-
- To unpack an archive use:
-
- gzip -d < some-arch.tar.gz | tar -xpf -
-
- Replace 'star' by the actual archive name.
-
- If your Platform does not support hard links or symbolic links, you
- first need to compile "star" and then call:
-
- star -xpz -copy-links < some-arch.tar.gz
-
- If your platform does not support hard links but supports
- symbolic links, you only need to call the command above once.
- If your platform does not support symbolic links, you need to call
- the command twice because a symbolic link may occur in the archive
- before the file it points to.
-
-
-
-Here comes the long form:
-
-
-PREFACE:
-
- Calling configure manually is outdated because this is a task of the
- makefile system.
-
- You don't have to call configure with this make file system.
-
- Calling 'make' or 'make all' on the top level directory will create
- all needed targets. Calling 'make install' will install all needed
- files.
-
- This program uses a new makefilesystem. This makefilesystem uses
- techniques and ideas from the 1980s and 1990s, is designed in a
- modular way and allows sources to be combined in a modular way.
- For mor information on the modular features read README.SSPM.
-
- The makefilesystem is optimized for a program called 'smake'
- Copyright 1985 by Jörg Schilling, but SunPro make (the make program
- that comes with SunOS >= 4.0 and Solaris) as well as newer versions
- of GNU make will work also. BSDmake could be made working, if it
- supports pattern matching rules correctly.
-
- The makefile system allows simultaneous compilation on a wide
- variety of target systems if the source tree is accessible via NFS.
-
-
-Finding Compilation Results:
-
- To allow this, all binaries and results of a 'compilation' in any form
- are placed in sub-directories. This includes automatically generated
- include files. Results in general will be placed into
- a directory named OBJ/<arch-name>/ in the current projects
- leaf directory, libraries will be placed into a directory called
- libs/<arch-name>/ that is located in the source tree root directory.
-
- <arch-name> will be something like 'sparc-sunos5-cc'
-
- This is the main reason why simultaneous compilation is possible on
- all supported platforms if the source is mounted via NFS.
-
-
-How to compile:
-
- To compile a system or sub-system, simply enter 'smake', 'make' or
- 'Gmake'. Compilation may be initialized at any point of the source
- tree of a system. If compilation is started in a sub tree, all objects
- in that sub tree will be made.
-
-
-How to install results:
-
- To install the product of a compilation in your system, call:
-
- smake install
-
- at top level. The binaries will usually be installed in
- /opt/schily/bin. The directory /opt/<vendor-name>/ has been agreed
- on by all major UNIX vendors in 1989. Unfortunately, still not all
- vendors follow this agreement.
-
- If you want to change the default installation directory, edit the
- appropriate (system dependent) files in the DEFAULTS directory
- (e.g. DEFAULTS/Defaults.sunos5).
-
- ***** If "smake install" doesn't do anything, you are on a broken *****
- ***** File System. Remove the file INSTALL in this case (the FS *****
- ***** does not handle upper/lower case characters correctly). *****
- ***** This is true for all DOS based filesystems and for Apple's *****
- ***** HFS+ filesystem. *****
-
-
-Using a different installation directory:
-
- If your system does not yet use the standard installation path /opt
- or if you don't like this installation directory, you can easily
- change the installation directory. You may edit the DEFAULTS file
- for your system and modify the macro INS_BASE.
-
- You may use a different installation directory without editing the
- DEFAULTS files. If you like to install everything in /usr/local, call:
-
-
- If your make program supports to propagate make macros to sub make programs
- which is the case for recent smake releases as well as for a recent gnumake:
-
- smake INS_BASE=/usr/local install
- or
- gmake INS_BASE=/usr/local install
-
- If you make program doesn't propagate make macros (e.g. SunPRO make) call:
-
- env INS_BASE=/usr/local make -e install
-
-
-Using a different C-compiler:
-
- If the configured default compiler is not present on the current machine,
- the makefilesystem will try an automatic fallback to GCC. For this reason
- in most cases you will not need to manually select a compiler.
-
- The default C-compiler can be modified in the files in the
- DEFAULT directory. If you want to have a different compiler
- for one compilation, call:
-
- make CCOM=gcc
- or
- make CCOM=cc
-
- This works even when your make program doesn't propagate make macros.
-
-
-Creating 64 bit executables on Solaris:
-
- If you like to create 64 bit executables you always need first to
- remove any old make results. This includes all autoconf results. In
- order to make sure that the source tree is in a "clean" state, call:
-
- ./.clean
-
- at the top level directory. Then configure and compile everything by
- calling:
-
- smake COPTX=-xarch=v9 LDOPTX=-xarch=v9
-
- To do this with GCC, you need at least GCC-3.1. It is the first 64 bit
- aware GCC. With GCC, call on Solaris:
-
- smake CCOM=gcc COPTX=-m64 LDOPTX=-m64
-
- It is not clear if GCC already supports other platforms in 64 bit mode.
- As all GCC versions before 3.1 did emit hundreds of compilation
- warnings related to 64 bit bugs when compiling itself, there is little
- hope that other platforms are already supported in 64 bit mode.
-
-
-Getting help from make:
-
- For a list of targets call:
-
- make .help
-
-
-Getting more information on the make file system:
-
- The man page makefiles.4 located in man/man4/makefiles.4 contains
- the documentation on general use and for leaf makefiles.
-
- The man page makerules.4 located in man/man4/makerules.4 contains
- the documentation for system programmers who want to modify
- the make rules of the makefile system.
-
- For further information read
-
- ftp://ftp.berlios.de/pub/makefiles/PortableSoftware.ps.gz
-
-
-Hints for compilation:
-
- The makefile system is optimized for 'smake'. Smake will give the
- fastest processing and best debugging output.
-
- SunPro make will work as is. GNU make need some special preparation.
-
- Read README.gmake for more information on gmake.
-
- To use GNU make create a file called 'Gmake' in your search path
- that contains:
-
- #!/bin/sh
- MAKEPROG=gmake
- export MAKEPROG
- exec gmake "$@"
-
- and call 'Gmake' instead of gmake. On Linux there is no gmake, 'make'
- on Linux is really a gmake.
-
- 'Gmake' and 'Gmake.linux' are part of this distribution.
-
- Some versions of gmake are very buggy. There are e.g. versions of gmake
- on some architectures that will not correctly recognize the default
- target. In this case call 'make all' or ../Gmake all'.
-
- Note that pseudo error messages from gmake similar to:
-
- gmake[1]: Entering directory `cdrtools-1.10/conf'
- ../RULES/rules.cnf:58: ../incs/sparc-sunos5-cc/Inull: No such file or directory
- ../RULES/rules.cnf:59: ../incs/sparc-sunos5-cc/rules.cnf: No such file or directory
-
- Are a result of a bug un GNU make. The make file system itself is
- correct (as you could prove by using smake).
- If your gmake version still has this bug, send a bug report to:
-
- "Paul D. Smith" <psmith at gnu.org>
-
- He is the current GNU make maintainer.
-
- If you like to use 'smake', please always compile it from source.
- The packages are located on:
-
- ftp://ftp.berlios.de/pub/smake/alpha/
-
- Smake has a -D flag to see the actual makefile source used
- and a -d flag that gives easy to read debugging info. Use smake -xM
- to get a makefile dependency list. Try smake -help
-
-
-Compiling the project using engineering defaults:
-
- The defaults found in the directory DEFAULTS are configured to
- give minimum warnings. This is made because many people will
- be irritated by warning messages and because the GNU c-compiler
- will give warnings for perfectly correct and portable c-code.
-
- If you want to port code to new platforms or do engineering
- on the code, you should use the alternate set of defaults found
- in the directory DEFAULTS_ENG.
- You may do this permanently by renaming the directories or
- for one compilation by calling:
-
- make DEFAULTSDIR=DEFAULTS_ENG
-
-
-Compiling the project to allow debugging with dbx/gdb:
-
- If you like to compile with debugging information for dbx or gdb,
- call:
-
- make clean
- make COPTX=-g LDOPTX=-g
-
-
- If you want to see an example, please have a look at the "star"
- source. It may be found on:
-
- ftp://ftp.berlios.de/pub/star
-
- Have a look at the manual page, it is included in the distribution.
- Install the manual page with
-
- make install first and include /opt/schily/man in your MANPATH
-
- Note that some systems (e.g. Solaris 2.x) require you either to call
- /usr/lib/makewhatis /opt/schily/man or to call
-
- man -F <man-page-name>
-
-Author:
-
-Joerg Schilling
-Seestr. 110
-D-13353 Berlin
-Germany
-
-Email: joerg at schily.isdn.cs.tu-berlin.de, js at cs.tu-berlin.de
- schilling at fokus.fhg.de
-
-Please mail bugs and suggestions to me.
Modified: nonameyet/branches/cleanup/doc/READMEs/README.copy
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.copy 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.copy 2006-09-15 14:35:58 UTC (rev 314)
@@ -19,12 +19,12 @@
For this reason, you will not be able to read such a CD correctly with 'dd'.
I recommend to write all disks in Disk at Once mode if your drive
-is supported in DAO mode with cdrecord. In addition, you may wish to
-add padding (see cdrecord / mkisofs man pages).
+is supported in DAO mode with wodim. In addition, you may wish to
+add padding (see wodim / mkisofs man pages).
-If you want to copy such a CD directly with cdrecord, you may call:
+If you want to copy such a CD directly with wodim, you may call:
- cdrecord -v dev=... -isosize /dev/rdsk/c0t6d0s0
+ wodim -v dev=... -isosize /dev/rdsk/c0t6d0s0
But this may fail if the master gives read errors. To copy such a CD to a file
you may use the program 'readcd' from this package
@@ -45,8 +45,11 @@
possible, use:
cdda2wav -vall -D... -B
-cdrecord -v dev=... -dao -useinfo *.wav
+wodim -v dev=... -dao -useinfo *.wav
This will preserve pre-gap sizes, indices ...
+Source: README.copy from cdrtools package
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
Deleted: nonameyet/branches/cleanup/doc/READMEs/README.install
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.install 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.install 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,32 +0,0 @@
-To install makefiles, just take the tar archive makefiles.tar
-and untar it on the source root of your new project.
-
-The tar file contains:
-
-- the RULES directory with the main make rules
-- two different DEFAULT directories with predefined project settings
-- a directory containing templates for all purpose
-- a skeleton directory structure for the new project
-- some README files that will be useful for developers and users
-
-If you want to see a better example, please have a look at the "star"
-source. It may be found on:
-
-ftp://ftp.berlios.de/pub/star
-
-Have a look at the manual page, it is included in the distribution.
-Install the manual page with
-
-make install first and include /opt/schily/man in your MANPATH
-
-Author:
-
-Joerg Schilling
-Seestr. 110
-D-13353 Berlin
-Germany
-
-Email: joerg at schily.isdn.cs.tu-berlin.de, js at cs.tu-berlin.de
- schilling at fokus.fhg.de
-
-Please mail bugs and suggestions to me.
Deleted: nonameyet/branches/cleanup/doc/READMEs/README.mkisofs
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.mkisofs 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.mkisofs 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,16 +0,0 @@
-Cdrtools carries is the official version of mkisofs.
-
-To compile mkisofs correctly on all supported platforms (> 30) you
-need to use the Schily makefilesystem to get the systematic portability
-support.
-
-Read the file README.multi to learn how to create multi-session
-CD-R's with this release of cdrecord and mkisofs.
-
-Read the file README.cdplus to learn how to create CD-plus/CD-extra
-CD-R's with this release of cdrecord and mkisofs.
-
-You definitely need this release of mkisofs to
-create multi-session CD-R's on SunOS/Solaris/SGI-IRIX OS/2 and Win32.
-
-Jörg Schilling
Modified: nonameyet/branches/cleanup/doc/READMEs/README.multi
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.multi 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.multi 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,4 +1,4 @@
-Creating multi-session CD's Mini Howto FAQ
+Creating multi-session CDs/DVDs Mini Howto FAQ
Multi-session filesystems are a trick that comes from the Kodak photo CD.
The OS mounts the last session that contains the sum of the current session
@@ -7,7 +7,7 @@
To test (with Linux):
Create a iso-9660 filesystem image with mkisofs-1.10 or later.
-mkisofs is included in the cdrecord release (including
+mkisofs is included in the wodim release (including
SunOS/Solaris multi-session support)
Use the -R flag to add Rock Ridge extensions (this is important).
@@ -15,7 +15,7 @@
Write the first session with:
-cdrecord -v speed=2 dev=2,0 -eject -multi isoimage.raw
+wodim -v speed=2 dev=2,0 -eject -multi isoimage.raw
Note that all Sony drives do no support XA2 disks in firmware - read README.sony
for more information.
@@ -24,7 +24,7 @@
Note the number of sectors written and check the disk, it should be mountable.
-Next step is to check if cdrecord is able to retrieve the following data:
+Next step is to check if wodim is able to retrieve the following data:
1) The first block (sector) number in the first track of the last session
This must be '0' in our case.
@@ -43,7 +43,7 @@
To get this information type:
-cdrecord -msinfo dev=2,0
+wodim -msinfo dev=2,0
The output should be two numbers separated by a comma.
@@ -52,7 +52,7 @@
The first number is (1), the second number is (2).
Create the image for the next session with mkisofs-1.12 or later.
-It is included in the cdrecord distribution.
+It is included in the wodim distribution.
2nd session:
You should create a directory that contains a second directory with data in it
@@ -81,11 +81,11 @@
mkisofs -o isoimage_2.raw -R -C xx,yy -M isoimage.raw first_dir
-The argument of -C is the output of cdrecord -msinfo
+The argument of -C is the output of wodim -msinfo
- On Linux, the argument of -M is a device that would allow you to mount
the current CD in the CD-writer
- On SunOS, target and lun refer to the SCSI target and lun of the
- CD-R device with the same notation as for cdrecord dev=xxx,yyy .
+ CD-R device with the same notation as for wodim dev=xxx,yyy .
If you want to check, whether mkisofs make everything right, you should create
@@ -97,7 +97,7 @@
On SunOS:
mkisofs -o isoimage_2.raw -R -C xx,0 -M target,lun first_dir
-Where xx is the first number of the pair returned by cdrecord -msinfo
+Where xx is the first number of the pair returned by wodim -msinfo
You may check ***this** image by mounting it with my "fbk" on Solaris
or the loopback driver on Linux.
@@ -118,7 +118,7 @@
To write the second session to CD, call:
-cdrecord -v speed=2 dev=2,0 -eject -multi isoimage_2.raw
+wodim -v speed=2 dev=2,0 -eject -multi isoimage_2.raw
If you mount this CD, you should see the first session and the second directory
from 2nd session added to the root directory of the CD.
@@ -128,10 +128,10 @@
call:
-cdrecord -msinfo dev=2,0
+wodim -msinfo dev=2,0
The first number should be the first writable address which was retrieved by the
-first call to cdrecord -msinfo after creating the first session.
+first call to wodim -msinfo after creating the first session.
The second number should be the first number + number of sectors of the second session
+ ~ 11400 sectors.
@@ -188,3 +188,23 @@
Joerg Schilling
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
+
+This describes the programs as shipped with cdrkit, a spinoff from the
+cdrtools project. However, the cdrtools developers are no longer
+involved in the development of this spinoff and therefore shall not
+be made responsible for any problem caused by it. Do not try to get
+support for this program by contacting the original authors.
+
+If you have support questions, send them to
+
+debburn-devel at lists.alioth.debian.org
+
+If you have definitely found a bug, send a mail to this list or to
+
+submit at bugs.debian.org
+
+writing at least a short description into the Subject and "Package: cdrkit"
+
+
Deleted: nonameyet/branches/cleanup/doc/READMEs/README.raw
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.raw 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.raw 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,69 +0,0 @@
-Tips for MMC RAW mode writing.
-
- This allows to do disk at once recording on Philips drives that
- do not support SAO.
-
- You may write audio tracks in RAW mode. There are some new
- and most likely transient options:
-
- -raw16 Write 2352 Bytes sectors + P+Q Subchannel
-
- -raw96r Write 2352 Bytes sectors + P+W Subchannel (R-W in raw mode)
-
- -raw96p Write 2352 Bytes sectors + P+W Subchannel (R-W in packed mode)
-
- NOTE that the MMC standard does not allow -dummy in RAW mode.
- There may be drives which allow it but don't bother if it does not work.
-
- Indices are fully supported in RAW mode.
-
- MCN & ISRC are not yet supported in RAW mode, they are silently discarded.
-
- If you find other problems in RAW mode or if you find
- new bugs introduced in old write modes, please send a bug report.
-
- Cdrecord now checks the properties of the writer. If a specific write
- mode is not supported by the writer, cdrecord warns you and makes
- a suggestion for a similar alternate write mode.
-
- With the curent structure of cdrecord, it is not possible to silently
- e.g. change the write mode from -dao to -raw96r
-
- MMC compliant drives are automatically scanned for supported write modes.
- This should help to make cdrecord work without manual static configuration.
- My hope is still to have no need to know all drive properties in
- advance, so new drives will continue to work as long as they
- are standard compliant enough for cdrecord.
-
-EXAMPLES:
-
- cdrecord dev=1,0 -v -raw96r *.wav
-
- will write a audio CD in raw mode using (computed) 2448 byte sectors
- with raw P-W subchannels. This works e.g. with Plextor drives.
-
-
- cdrecord dev=1,0 -v -raw16 *.wav
-
- will write a audio CD in raw mode using (computed) 2368 byte sectors
- with raw P+Q subchannels. This works e.g. with Philips drives.
-
-
- NOTE: The input sector size always is 2352 bytes for audio.
-
-IMPORTANT:
-
- - if the drive supports RAW/R96R among with other raw write modes,
- use -raw96r
-
- - if the drive does _only_ supports RAW/R16, use -raw16
-
- - ... else if the drive supports RAW/R96P, use -raw96p
-
- The packed raw mode (RAW/R96P) is buggy in Plextor drives and
- the RAW/R16 mode is buggy in TEAC drives. Plextor creates
- unreadable disks and TEAC hangs the drive.
-
- For this reason, it is important to select the raw writing
- mode accoding to the notes above.
-
Modified: nonameyet/branches/cleanup/doc/READMEs/README.verify
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.verify 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.verify 2006-09-15 14:35:58 UTC (rev 314)
@@ -76,6 +76,10 @@
the last file(s) on a CD. This seems at least to be true for all Linux versions
and for Solaris 7 FCS. For Solaris 7 there is a patch (107465-02) that you should
install. This I/O error problem does not occur with DAO disks and with TAO disks
-that have been written with cdrecord -pad.
+that have been written with wodim -pad.
Joerg Schilling
+
+Source: README.verify from cdrtools package
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
Deleted: nonameyet/branches/cleanup/doc/READMEs/README.volmgt
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.volmgt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/READMEs/README.volmgt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,44 +0,0 @@
-If you are on NeXT-Step/Apple Rhapsody,
-you must disable volume management before creating a CD.
-On older Solaris versions, you may also need to disable the volume management.
-
-This is needed because newer drives identify themselves correctly
-as CD-ROM drives. Unfortunately, the volume management daemon from
-Sun/Apple does not grok, that there may be a recordable medium in the drive.
-
-You do this on Solaris permanently by editing /etc/vold.conf
-NeXT-Step/Apple Rhapsody will only work correctly if you reboot while
-the CD-R drive is powered off.
-
-On Solaris you need to stop the volume management if you like to use the USCSI
-fallback SCSI transport code. Even things like cdrecord -scanbus
-will not work if the volume management is running.
-
-If the Solaris version you are running is recent enough, libscg will try to
-interace with the volume management. However, Solaris does not allow you to
-access a drive that is maintained by the volume management but does not
-include a medium. Cdrecord will mark this fact by printing a '?' during
-a -scanbus run.
-
-Cdrecord-ProDVD-Clone 2.01a23 (i386-pc-solaris2.9) Copyright (C) 1995-2003 Jörg Schilling
-scsidev: 'USCSI:'
-devname: 'USCSI'
-scsibus: -1 target: -1 lun: -1
-Warning: Using USCSI interface.
-Warning: Volume management is running, medialess managed drives are invisible.
-Using libscg version 'schily-0.7'.
-scsibus1:
- 1,0,0 100) ?
- 1,1,0 101) 'HP ' 'DVD Writer 200j ' '1.36' Removable CD-ROM
- 1,2,0 102) *
- 1,3,0 103) *
- 1,4,0 104) *
- 1,5,0 105) *
- 1,6,0 106) *
- 1,7,0 107) *
-
-If you insert a medium and close the tray, the medium becomes visible again.
-Note that for this reason, it is impossible to use cdrecord with automated
-scripts if the volume manager is configured to include a CD/DVD writer
-as it is impossible to close the door of the drive.
-
Modified: nonameyet/branches/cleanup/doc/cdda2wav/README
===================================================================
--- nonameyet/branches/cleanup/doc/cdda2wav/README 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/cdda2wav/README 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,15 +1,14 @@
Hi dear cdrom drive users,
This README describes hardware related matters as well as the installation of
-cdda2wav, the sampling utility.
+cdda2wav, the sampling utility.
-The last big change was the inclusion in Joerg Schillings cdrecord package
-as you may have noticed :-)
-That means most of the cdrecord interfacing applies for cdda2wav as well.
+This cdda2wav utility comes with the Cdrkit project. Cdrkit is a spinoff from
+cdrtools. However, the cdrtools developers are no longer involved in the
+development of this spinoff and therefore shall not be made responsible for
+any problem caused by it. Please do not try to get support for this program by
+contacting the original authors.
-I decided to retire the standalone version slowly, and to do all new
-development in this bundled variant.
-
Requirements
============
@@ -546,4 +545,5 @@
Additions to the tables above are welcome.
and now catch your sounds,
-Heiko heiko at colossus.escape.de
+Heiko heiko at colossus.escape.de (Original author)
+Changes for the Cdrkit project by Christian Fromme <kaner at strace.org>
Deleted: nonameyet/branches/cleanup/doc/mkisofs/README
===================================================================
--- nonameyet/branches/cleanup/doc/mkisofs/README 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/mkisofs/README 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,142 +0,0 @@
-# @(#)README 1.7 99/11/23 joerg
-
-Note:
-
- This program requires a lot of virtual memory to run since it
-builds all of the directories in memory. The exact requirements
-depend upon a lot of things, but for Rock Ridge discs 12Mb would not
-be unreasonable. Without RockRidge and without the translation
-tables, the requirements would be considerably less.
-
-*****************************
-Notes for version 1.12
-
- Joliet support is now complete. See the -J option.
-
- The file scanning code is much improved - mkisofs can use multiple
- sources of input files and merge them together to form the output
- image. In addition, each source can be grafted at any point in the
- iso9660 image.
-
- The image writing code has been cleaned up to make it much easier
- to add custom extensions.
-
- The ADD_FILES feature has been removed as it didn't work well,
-and it was hard to figure out. The recent rearrangements in the
-file scanning code would tend to solve these issues.
-
-*****************************
-Notes for version 1.11
-
- There is a feature which can be optionally compiled into
-mkisofs that allows you to merge arbitrary directory trees into the
-image you are creating. You need to compile with -DADD_FILES for my
-changes to take effect. Thanks to Ross Biro biro at yggdrasil.com.
-
-*****************************
-Notes for version 1.10b1
-
- Big news is that multi-session capability is very close to being
- done. There is still a missing interface to cdwrite that is
- used to determine the next writable address and the sector number
- of the last existing session. Until we get the interface to cdwrite
- done, this is a beta version.
-
- Bug involving DST fixed (dates are always calculated, since some
- files may be DST and other ones would not be).
-
- Unfortunately the notes on some of the small patches got lost.
-
-*****************************
-Notes for version 1.06
-
- Jan-Piet Mens <jpm at mens.de> added support for the '-m' switch. This
- allows exclusion of shell-style globs from the CDROM.
- See manual mkisofs.8 for more information.
-
-*****************************
-Notes for version 1.05
-
- Added support for '-r' switch. This is very similar to -R for
-Rock Ridge, but echos of the development environment are removed
-(i.e. uid/gid set to 0, and permissions of the files are canonicalized).
-Useful in applications where a distribution medium is being produced.
-
-*****************************
-Notes for version 1.04
-
- No notes for 1.04.
-
-*****************************
-Notes for version 1.03
-
- No notes for 1.03.
-
-*****************************
-Notes for version 1.02.
-
- Minor bugfixes here and there. Support for compiled in
-defaults for many of the text fields in the volume header are now
-present, and there is also support for a file ".mkisofsrc" that can
-also read settings for these parameters.
-
- A short script "Configure" was added to allow us to set up special
-compile options that depend upon the system that we are running on.
-This should help stamp out the sphaghetti-isms that were starting to grow
-up in various places in the code.
-
- You should get more meaningful error messages if you run out of
-memory.
-
-*****************************
-Notes for version 1.1.
-
- The big news is that SUSP CE entries are now generated for
-extremely long filenames and symlink names. This virtually guarantees
-that there is no limit (OK, well, about 600Mb) for file name lengths.
-I have tested this as well as I can, and it seems to work with linux.
-This would only be used very rarely I suspect.
-
- Also, I believe that support for VMS is done. You must be
-careful, because only Stream-LF and FIxed length record files can be
-recorded. The rest are rejected with error messages. Perhaps I am
-being too severe here.
-
- There is a bugfix in the sorting of entries on the disc - we
-need to stop comparing once we reach the ';' character.
-
- There are four new options -z -d -D -l -V. Some of these tell
-mkisofs to relax some of the iso9660 restrictions, and many systems
-apparently do not really seem to mind. Use these with caution.
-
- Some diagnostic programs to scan disc images are in the diag
-directory. These are not as portable as mkisofs, and may have some
-bugs. Still they are useful because they can check for bugs that I might
-have introduced as I add new features.
-
-*****************************
-Notes for version 1.0.
-
- In version 1.0, the date fields in the TF fields were fixed -
-previously I was storing st_ctime as the file creation time instead of
-the file attribute change time. Thanks to Peter van der Veen for
-pointing this out. I have one slight concern with this change,
-however. The Young Minds software is definitely supplying 3 dates
-(creation, modification and access), and I would strongly suspect that
-they are incorrectly putting the file attribute change time in the
-file creation slot. I would be curious to see how the different RRIP
-filesystems treat this. Anyway, this is something to keep in the back
-of your mind.
-
- The symlink handling was not quite correct in 0.99 - this is
-now fixed. Only some systems seemed to have been affected by this bug.
-
- A command line option is now present to allow you to
-specifically exclude certain files from the distribution.
-
- The case where you do not have permissions to read a directory
-is now handled better by mkisofs. The directory that cannot be opened
-is converted into a zero-length file, and processing continues normally.
-
- A few portability things have been fixed (hopefully).
-
Copied: nonameyet/branches/cleanup/doc/mkisofs/README (from rev 313, nonameyet/trunk/doc/mkisofs/README)
===================================================================
--- nonameyet/branches/cleanup/doc/mkisofs/README (rev 0)
+++ nonameyet/branches/cleanup/doc/mkisofs/README 2006-09-15 14:35:58 UTC (rev 314)
@@ -0,0 +1,34 @@
+Cdrkit carries a version of mkisofs.
+
+The acompanying documentation of mkisofs consists of the
+manual page mkisofs.8 and README files found in the
+following locations (shell globing used):
+
+doc/:
+
+README.multi: documentation and examples for creating
+ multi-session CDs and DVDs
+
+README.cdplus: documentation and examples for creating
+ CD-plus (aka CD-extra) disks
+
+doc/mkisofs:
+
+README: release notes for older mkisofs releases
+
+README.*boot: documentation for various boot loader related
+ extensions for different architectures
+
+README.hfs*: hints and usage for HFS related features
+
+README.*: additional docs for special features
+
+
+Eduard Bloch -- Mon, 11 Sep 2006 23:05:29 +0200
+
+This describes the program as shipped with cdrkit, a spinoff from the
+cdrtools project. However, the cdrtools developers are no longer
+involved in the development of this spinoff and therefore shall not
+be made responsible for any problem caused by it. Do not try to get
+support for this program by contacting the original authors.
+
Modified: nonameyet/branches/cleanup/doc/mkisofs/README.graft_dirs
===================================================================
--- nonameyet/branches/cleanup/doc/mkisofs/README.graft_dirs 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/mkisofs/README.graft_dirs 2006-09-15 14:35:58 UTC (rev 314)
@@ -8,14 +8,14 @@
with the possibility of determining the location of files. I hope
that this guide helps you too.
-In order to use cdrecord it is first necessary to define to which scsi bus
+In order to use wodim it is first necessary to define to which scsi bus
the cd-writer is connected. In my case the setup is dev=0,3,0. It is also
interesting to have a separate directory in which all image files can
be dumped: /home/cdsource is the directory I chose for dumping the images.
The best way to understand how to create multi-session cds is to read
README.multi. Most of what is going to be said here is based on that
-README file and on the help of several cdrecord users.
+README file and on the help of several wodim users.
This Micro Howto is divided into two parts as follows:
@@ -57,7 +57,7 @@
Does it look ok? Great! Unmount /mnt/image. Now the burning process itself:
-cdrecord -v -dev=0,3,0 -multi -eject image1.raw
+wodim -v -dev=0,3,0 -multi -eject image1.raw
To check the burned image we need to mount the cd; something like
@@ -72,9 +72,9 @@
To create the second image on our cd, we need get information
about sectors related to the first track. To do that, issue the command
-cdrecord -v -dev=0,3,0 -msinfo
+wodim -v -dev=0,3,0 -msinfo
-Cdrecord returns the following number
+wodim returns the following number
0,135563
@@ -85,7 +85,7 @@
Now we need to check of image2.raw is ok. The following command creates exactly what we
need. Plese note that -C option. Only the first number changes in this case. The second one
-is always zero. In our case the first number is zero due to cdrecord -msinfo. When
+is always zero. In our case the first number is zero due to wodim -msinfo. When
more tracks are added to the cd this number will change.
mkisofs -D -l -r -f -m core -L -C 0,0 -M /dev/scd0 -o image2_test.raw caldera/=/root
@@ -97,7 +97,7 @@
Now let us burn image2.raw (not image2_test.raw)
-cdrecord -v -dev=0,3,0 -multi -eject image2.raw
+wodim -v -dev=0,3,0 -multi -eject image2.raw
We can mount the CD again to see that the two directories are there. We can carry on
doing this until we decide to close the CD. If this is the case, don't use -multi when
@@ -112,15 +112,15 @@
mkisofs -D -l -r -f -m core -L -o image1.raw etc/redhat/=/mnt/redhat/etc
-cdrecord -v -dev=0,3,0 -multi -eject image1.raw
+wodim -v -dev=0,3,0 -multi -eject image1.raw
To check the burned image we need to mount the cd; something like
mount -t iso9660 /dev/scd0 /mnt/cdroms
-cdrecord -v -dev0,3,0 -msinfo
+wodim -v -dev0,3,0 -msinfo
-Cdrecord returns the following number
+wodim returns the following number
0,14391
@@ -138,7 +138,7 @@
Now the burning process itself.
-cdrecord -v -dev=0,3,0 -multi -eject image2.raw
+wodim -v -dev=0,3,0 -multi -eject image2.raw
and we're done !!!!
@@ -147,3 +147,7 @@
Good luxk!!!
Eduardo Mendes - 11/23/99
+
+Source: README.graft_dirs from cdrtools package
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
Modified: nonameyet/branches/cleanup/doc/mkisofs/README.mkhybrid
===================================================================
--- nonameyet/branches/cleanup/doc/mkisofs/README.mkhybrid 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/mkisofs/README.mkhybrid 2006-09-15 14:35:58 UTC (rev 314)
@@ -122,4 +122,24 @@
Please state the version, platform and command line used when submitting
a bug report - the output from "-log-file -v" would help.
-James Pearson (j.pearson at ge.ucl.ac.uk)
+Original author: James Pearson (j.pearson at ge.ucl.ac.uk)
+
+This describes the program as shipped with cdrkit, a spinoff from the
+cdrtools project. However, the cdrtools developers are no longer
+involved in the development of this spinoff and therefore shall not
+be made responsible for any problem caused by it. Do not try to get
+support for this program by contacting the original authors.
+
+If you have support questions, send them to
+
+debburn-devel at lists.alioth.debian.org
+
+If you have definitely found a bug, send a mail to this list or to
+
+submit at bugs.debian.org
+
+writing at least a short description into the Subject and "Package: cdrkit"
+
+Source: README.mkhybrid from cdrtools package
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
Copied: nonameyet/branches/cleanup/doc/mkisofs/README.releasenotes (from rev 313, nonameyet/trunk/doc/mkisofs/README.releasenotes)
===================================================================
--- nonameyet/branches/cleanup/doc/mkisofs/README.releasenotes (rev 0)
+++ nonameyet/branches/cleanup/doc/mkisofs/README.releasenotes 2006-09-15 14:35:58 UTC (rev 314)
@@ -0,0 +1,154 @@
+# @(#)README 1.7 99/11/23 joerg
+# 06/09/11 christian
+
+This describes the program as shipped with cdrkit, a spinoff from the
+cdrtools project. However, the cdrtools developers are no longer
+involved in the development of this spinoff and therefore shall not
+be made responsible for any problem caused by it. Do not try to get
+support for this program by contacting the original authors.
+
+Note:
+
+ This program requires a lot of virtual memory to run since it
+builds all of the directories in memory. The exact requirements
+depend upon a lot of things, but for Rock Ridge discs 12Mb would not
+be unreasonable. Without RockRidge and without the translation
+tables, the requirements would be considerably less.
+
+
+*****************************
+Notes for version 1.12
+
+ Joliet support is now complete. See the -J option.
+
+ The file scanning code is much improved - mkisofs can use multiple
+ sources of input files and merge them together to form the output
+ image. In addition, each source can be grafted at any point in the
+ iso9660 image.
+
+ The image writing code has been cleaned up to make it much easier
+ to add custom extensions.
+
+ The ADD_FILES feature has been removed as it didn't work well,
+and it was hard to figure out. The recent rearrangements in the
+file scanning code would tend to solve these issues.
+
+*****************************
+Notes for version 1.11
+
+ There is a feature which can be optionally compiled into
+mkisofs that allows you to merge arbitrary directory trees into the
+image you are creating. You need to compile with -DADD_FILES for my
+changes to take effect. Thanks to Ross Biro biro at yggdrasil.com.
+
+*****************************
+Notes for version 1.10b1
+
+ Big news is that multi-session capability is very close to being
+ done. There is still a missing interface to cdwrite that is
+ used to determine the next writable address and the sector number
+ of the last existing session. Until we get the interface to cdwrite
+ done, this is a beta version.
+
+ Bug involving DST fixed (dates are always calculated, since some
+ files may be DST and other ones would not be).
+
+ Unfortunately the notes on some of the small patches got lost.
+
+*****************************
+Notes for version 1.06
+
+ Jan-Piet Mens <jpm at mens.de> added support for the '-m' switch. This
+ allows exclusion of shell-style globs from the CDROM.
+ See manual mkisofs.8 for more information.
+
+*****************************
+Notes for version 1.05
+
+ Added support for '-r' switch. This is very similar to -R for
+Rock Ridge, but echos of the development environment are removed
+(i.e. uid/gid set to 0, and permissions of the files are canonicalized).
+Useful in applications where a distribution medium is being produced.
+
+*****************************
+Notes for version 1.04
+
+ No notes for 1.04.
+
+*****************************
+Notes for version 1.03
+
+ No notes for 1.03.
+
+*****************************
+Notes for version 1.02.
+
+ Minor bugfixes here and there. Support for compiled in
+defaults for many of the text fields in the volume header are now
+present, and there is also support for a file ".mkisofsrc" that can
+also read settings for these parameters.
+
+ A short script "Configure" was added to allow us to set up special
+compile options that depend upon the system that we are running on.
+This should help stamp out the sphaghetti-isms that were starting to grow
+up in various places in the code.
+
+ You should get more meaningful error messages if you run out of
+memory.
+
+*****************************
+Notes for version 1.1.
+
+ The big news is that SUSP CE entries are now generated for
+extremely long filenames and symlink names. This virtually guarantees
+that there is no limit (OK, well, about 600Mb) for file name lengths.
+I have tested this as well as I can, and it seems to work with linux.
+This would only be used very rarely I suspect.
+
+ Also, I believe that support for VMS is done. You must be
+careful, because only Stream-LF and FIxed length record files can be
+recorded. The rest are rejected with error messages. Perhaps I am
+being too severe here.
+
+ There is a bugfix in the sorting of entries on the disc - we
+need to stop comparing once we reach the ';' character.
+
+ There are four new options -z -d -D -l -V. Some of these tell
+mkisofs to relax some of the iso9660 restrictions, and many systems
+apparently do not really seem to mind. Use these with caution.
+
+ Some diagnostic programs to scan disc images are in the diag
+directory. These are not as portable as mkisofs, and may have some
+bugs. Still they are useful because they can check for bugs that I might
+have introduced as I add new features.
+
+*****************************
+Notes for version 1.0.
+
+ In version 1.0, the date fields in the TF fields were fixed -
+previously I was storing st_ctime as the file creation time instead of
+the file attribute change time. Thanks to Peter van der Veen for
+pointing this out. I have one slight concern with this change,
+however. The Young Minds software is definitely supplying 3 dates
+(creation, modification and access), and I would strongly suspect that
+they are incorrectly putting the file attribute change time in the
+file creation slot. I would be curious to see how the different RRIP
+filesystems treat this. Anyway, this is something to keep in the back
+of your mind.
+
+ The symlink handling was not quite correct in 0.99 - this is
+now fixed. Only some systems seemed to have been affected by this bug.
+
+ A command line option is now present to allow you to
+specifically exclude certain files from the distribution.
+
+ The case where you do not have permissions to read a directory
+is now handled better by mkisofs. The directory that cannot be opened
+is converted into a zero-length file, and processing continues normally.
+
+ A few portability things have been fixed (hopefully).
+
+
+Source: README from cdrtools package
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
Modified: nonameyet/branches/cleanup/doc/mkisofs/README.rootinfo
===================================================================
--- nonameyet/branches/cleanup/doc/mkisofs/README.rootinfo 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/mkisofs/README.rootinfo 2006-09-15 14:35:58 UTC (rev 314)
@@ -67,6 +67,24 @@
Using this option, it is now possible to make a nearly true representation
of a Mac folder layout on a Unix/Linux platform.
-James Pearson 26-Apr-2000
+Original author: James Pearson 26-Apr-2000
-Any comments/problems to j.pearson at ge.ucl.ac.uk
+This describes the program as shipped with cdrkit, a spinoff from the
+cdrtools project. However, the cdrtools developers are no longer
+involved in the development of this spinoff and therefore shall not
+be made responsible for any problem caused by it. Do not try to get
+support for this program by contacting the original authors.
+
+If you have support questions, send them to
+
+debburn-devel at lists.alioth.debian.org
+
+If you have definitely found a bug, send a mail to this list or to
+
+submit at bugs.debian.org
+
+writing at least a short description into the Subject and "Package: cdrkit"
+
+Source: README.rootinfo from cdrtools package
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
Modified: nonameyet/branches/cleanup/doc/mkisofs/README.session
===================================================================
--- nonameyet/branches/cleanup/doc/mkisofs/README.session 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/doc/mkisofs/README.session 2006-09-15 14:35:58 UTC (rev 314)
@@ -2,8 +2,8 @@
This release of mkisofs has basic support completed for
multiple sessions. However, we still need some interaction
-between cdrecord and mkisofs for this to work correctly. This is needed as
-only cdrecord knows the different ways to gather these numbers for all
+between wodim and mkisofs for this to work correctly. This is needed as
+only wodim knows the different ways to gather these numbers for all
different drives. It may be that future versions of mkisofs will include
the needed support for MMC compliant drives.
@@ -14,14 +14,14 @@
systems that don't allow to read from CD drives with a sector size
of 2048 bytes per sector. To use mkisofs on such an operating system, you
will need a version of mkisofs that includes the SCSI transport library
-from cdrecord. Simply use the dev= syntax from cdrecord with -M in
+from wodim. Simply use the dev= syntax from wodim with -M in
such a case. It will tell mkisofs to use the SCSI transport library to
read from the CD instead of using the standard read() OS interface.
There is also a temporary hack in mkisofs in the form of a '-C' option.
The -C option takes two numbers as input, which are delimited by commas.
For example, you could specify "-C 1000,1020", but you should never just
-make up numbers to use here. These numbers are determined from cdrecord.
+make up numbers to use here. These numbers are determined from wodim.
Note that if you use -C and omit -M, it effectively means that
you are writing a new session, starting at a non-zero block number,
@@ -31,7 +31,7 @@
In practice you should be able to do something like:
-mkisofs [other options] -C `cdrecord dev=b,t,l -msinfo` \
+mkisofs [other options] -C `wodim dev=b,t,l -msinfo` \
-M /dev/cdblkdev
Replace 'b,t,l' by the aproriate numbers for SCSIbus, target and lun
@@ -41,8 +41,12 @@
matured quite significantly. It is entirely possible that bugs
exists, or that further tweaks will be required somewhere along the
way to get things working correctly. The data gathering mode of
-cdrecord has been tested, and I believe it works correctly. Caveat
+wodim has been tested, and I believe it works correctly. Caveat
Emptor.
[Mar 1, 1999].
+
+Source: README.session from cdrtools package
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
Copied: nonameyet/branches/cleanup/doc/plattforms (from rev 313, nonameyet/trunk/doc/plattforms)
Copied: nonameyet/branches/cleanup/doc/wodim (from rev 313, nonameyet/trunk/doc/wodim)
Modified: nonameyet/branches/cleanup/include/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/include/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/include/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -35,6 +35,24 @@
TRY_RUN(BITFIELDS_HTOL TEST_DUMMY ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_BITFIELDS_HTOL.c)
+FIND_FILE(HAVE_WAIT_H "wait.h")
+FIND_FILE(HAVE_SYS_WAIT_H "sys/wait.h")
+TRY_COMPILE(HAVE_UNION_WAIT ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_UNION_WAIT.c )
+# disabled, though the alternative works on cygwin and both headers are present
+# there.
+#IF(NOT HAVE_UNION_WAIT)
+# TRY_COMPILE(HAVE_UNION_WAIT ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_SYS_UNION_WAIT.c )
+#MESSAGE("syswait: ${HAVE_UNION_WAIT}")
+#ENDIF(NOT HAVE_UNION_WAIT)
+
+SET(HAVE_GETNAMEINFO true)
+SET(HAVE_INET_NTOA true)
+IF (WIN32) # workaround for cygwin
+SET(HAVE_GETNAMEINFO false)
+SET(HAVE_INET_NTOA false)
+ENDIF (WIN32) # workaround for cygwin
+
+
CONFIGURE_FILE( xconfig.h.in xconfig.h)
# FIXME! Does not work as expected. Not important for out-of-source builds but
Copied: nonameyet/branches/cleanup/include/test_SYS_UNION_WAIT.c (from rev 313, nonameyet/trunk/include/test_SYS_UNION_WAIT.c)
===================================================================
--- nonameyet/branches/cleanup/include/test_SYS_UNION_WAIT.c (rev 0)
+++ nonameyet/branches/cleanup/include/test_SYS_UNION_WAIT.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -0,0 +1,7 @@
+#include <sys/types.h>
+#include <sys/wait.h>
+int main() {
+ union wait w;
+ return 0;
+}
+
Copied: nonameyet/branches/cleanup/include/test_UNION_WAIT.c (from rev 313, nonameyet/trunk/include/test_UNION_WAIT.c)
===================================================================
--- nonameyet/branches/cleanup/include/test_UNION_WAIT.c (rev 0)
+++ nonameyet/branches/cleanup/include/test_UNION_WAIT.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -0,0 +1,7 @@
+#include <sys/types.h>
+#include <wait.h>
+int main() {
+ union wait w;
+ return 0;
+}
+
Modified: nonameyet/branches/cleanup/include/xconfig.h.in
===================================================================
--- nonameyet/branches/cleanup/include/xconfig.h.in 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/include/xconfig.h.in 2006-09-15 14:35:58 UTC (rev 314)
@@ -60,8 +60,10 @@
/* #undef HAVE_SYS_MNTENT_H */ /* if sys/mntent.h is present */
/* #undef HAVE_SYS_MNTTAB_H */ /* if sys/mnttab.h is present */
#define HAVE_SYS_MOUNT_H 1 /* if sys/mount.h is present */
-#define HAVE_WAIT_H 1 /* to use wait.h for prototypes and union wait */
-#define HAVE_SYS_WAIT_H 1 /* else use sys/wait.h */
+/* to use wait.h for prototypes and union wait */
+#cmakedefine HAVE_WAIT_H
+/* else use sys/wait.h */
+#cmakedefine define HAVE_SYS_WAIT_H
#define HAVE_SYS_RESOURCE_H 1 /* to use sys/resource.h for rlimit() and wait3() */
/* #undef HAVE_PROCFS_H */ /* to use procfs.h instead of sys/procfs.h (Solaris forces profcs-2) */
#define HAVE_SYS_PROCFS_H 1 /* to use sys/procfs.h for wait3() emulation */
@@ -313,9 +315,11 @@
#define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */
#define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */
#define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */
-#define HAVE_INET_NTOA 1 /* inet_ntoa() is present in libc/libsocket */
+/* inet_ntoa() is present in libc/libsocket */
+#cmakedefine HAVE_INET_NTOA
#define HAVE_GETADDRINFO 1 /* getaddrinfo() is present in libc/libsocket */
-#define HAVE_GETNAMEINFO 1 /* getnameinfo() is present in libc/libsocket */
+/* getnameinfo() is present in libc/libsocket */
+#cmakedefine define HAVE_GETNAMEINFO
#if defined(HAVE_QUOTACTL) || defined(HAVE_QUOTAIOCTL)
# define HAVE_QUOTA /* The system inludes quota */
@@ -358,7 +362,8 @@
#define HAVE_STRUCT_RUSAGE 1 /* have struct rusage in sys/resource.h */
/* #undef HAVE_SI_UTIME */ /* if struct siginfo contains si_utime */
/* #undef HAVE_UNION_SEMUN */ /* have an illegal definition for union semun in sys/sem.h */
-#define HAVE_UNION_WAIT 1 /* have union wait in wait.h */
+/* have union wait in wait.h */
+#cmakedefine HAVE_UNION_WAIT
/*
* SCO UnixWare has st_atim.st__tim.tv_nsec but the st_atim.tv_nsec tests also
* succeeds. If you use st_atim.tv_nsec on UnixWare, you get a warning about
Modified: nonameyet/branches/cleanup/libdeflt/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/libdeflt/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/libdeflt/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
PROJECT (LIBdeflt)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso . ${CMAKE_BINARY_DIR} ../cdrecord)
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../cdrecord)
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
SET(LIBdeflt_SRCS default.c)
Copied: nonameyet/branches/cleanup/libedc/CMakeLists.txt (from rev 313, nonameyet/trunk/libedc/CMakeLists.txt)
===================================================================
--- nonameyet/branches/cleanup/libedc/CMakeLists.txt (rev 0)
+++ nonameyet/branches/cleanup/libedc/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -0,0 +1,6 @@
+PROJECT (LIBEDC)
+INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR})
+
+AUX_SOURCE_DIRECTORY(. LIBEDC_SRCS)
+
+ADD_LIBRARY (libedc STATIC ${LIBEDC_SRCS})
Modified: nonameyet/branches/cleanup/libedc/README
===================================================================
--- nonameyet/branches/cleanup/libedc/README 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/libedc/README 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,3 +1,9 @@
+This describes the program as shipped with cdrkit, a spinoff from the
+cdrtools project. However, the cdrtools developers are no longer
+involved in the development of this spinoff and therefore shall not
+be made responsible for any problem caused by it. Do not try to get
+support for this program by contacting the original authors.
+
This is a small description for the Reed-Solomon library intended for
CD sector formatting.
@@ -111,3 +117,7 @@
Yellow Book or ISO 10149
Appendix Red Book
Red Book or IEC 908
+
+Source: libedc/README from cdrtools package
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
Modified: nonameyet/branches/cleanup/libhfs_iso/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/libhfs_iso/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/libhfs_iso/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
PROJECT (LIBhfs_iso)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso . ../cdrecord ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../cdrecord ${CMAKE_BINARY_DIR})
ADD_DEFINITIONS(-DUSE_LARGEFILES -DABORT_DEEP_ISO_ONLY -DAPPLE_HYB -DUDF -DDVD_VIDEO -DSORTING -DHAVE_CONFIG_H -DUSE_LIBSCHILY -DUSE_SCG)
Modified: nonameyet/branches/cleanup/libhfs_iso/README
===================================================================
--- nonameyet/branches/cleanup/libhfs_iso/README 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/libhfs_iso/README 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,4 +1,5 @@
# @(#)README 1.1 97/07/21 joerg
+ 06/09/11 christian
Modified version of libhfs (v2.0) to work with mkhybrid.
@@ -14,6 +15,12 @@
hfsutils - tools for reading and writing Macintosh HFS volumes
Copyright (C) 1996, 1997 Robert Leslie
+ This describes the program as shipped with cdrkit, a spinoff from the
+ cdrtools project. However, the cdrtools developers are no longer
+ involved in the development of this spinoff and therefore shall not
+ be made responsible for any problem caused by it. Do not try to get
+ support for this program by contacting the original authors.
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -28,3 +35,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Source: lihfs_iso/README from cdrtools package
+Edited for cdrkit by Christian Fromme <kaner at strace.org>
+
Modified: nonameyet/branches/cleanup/libparanoia/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/libparanoia/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/libparanoia/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
PROJECT (LIBparanoia)
-INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR} ../cdrecord)
+INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR} ../cdrecord)
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
SET(LIBparanoia_SRCS gap.c isort.c overlap.c p_block.c paranoia.c pmalloc.c)
Modified: nonameyet/branches/cleanup/libscg/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/libscg/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/libscg/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
PROJECT (LIBSCG)
-INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR} ../cdrecord)
+INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR} ../cdrecord)
include(../include/AddScgBits.cmake)
#SET(LIBSCG_SRCS rdummy.c scgsettarget.c scgtimes.c scsi-linux-ata.c scsi-linux-pg.c scsi-linux-sg.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c)
Modified: nonameyet/branches/cleanup/libschily/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/libschily/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/libschily/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
PROJECT (LIBSCHILY)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso . ${CMAKE_BINARY_DIR} ../cdrecord)
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../cdrecord)
SET(LIBSCHILY_SRCS astoi.c astoll.c astoull.c breakline.c cmpbytes.c cmpnullbytes.c comerr.c cvt.c error.c fconv.c fexec.c fillbytes.c findbytes.c findline.c format.c getargs.c getav0.c getdomainname.c geterrno.c getfp.c gethostid.c gethostname.c getpagesize.c handlecond.c jsprintf.c jssnprintf.c jssprintf.c match.c matchl.c movebytes.c printf.c raisecond.c rename.c saveargs.c serrmsg.c seterrno.c setfp.c snprintf.c spawn.c sprintf.c strcatl.c strdup.c streql.c strtod.c swabbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fcons64.c stdio/fdown.c stdio/fdup.c stdio/fdup64.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/fgetstr.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/fileluopen64.c stdio/filemopen.c stdio/filemopen64.c stdio/fileopen.c stdio/fileopen64.c stdio/filepos.c stdio/filepos64.c stdio/fileread.c stdio/filereopen.c stdio/filereopen64.c stdio/fileseek.c stdio/fileseek64.c stdio/filesize.c stdio/filesize64.c stdio/filestat.c stdio/filestat64.c stdio/filewrite.c stdio/flag.c stdio/flush.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nixwrite.c stdio/openfd.c stdio/openfd64.c stdio/peekc.c )
Modified: nonameyet/branches/cleanup/libunls/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/libunls/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/libunls/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
PROJECT (LIBunls)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso . ../cdrecord ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../cdrecord ${CMAKE_BINARY_DIR})
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
FIND_FILE (USE_ICONV iconv.h)
Modified: nonameyet/branches/cleanup/mkisofs/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/mkisofs/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -2,11 +2,12 @@
INCLUDE(../include/AddScgBits.cmake)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso . ../cdrecord ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../cdrecord ${CMAKE_BINARY_DIR})
FIND_FILE (USE_MAGIC magic.h)
IF(USE_MAGIC)
ADD_DEFINITIONS(-DUSE_MAGIC)
+ SET(MAGICLIBS magic)
ENDIF(USE_MAGIC)
FIND_FILE (USE_ICONV iconv.h)
@@ -29,11 +30,11 @@
LINK_DIRECTORIES(../libhfs_iso ../libschily ../libscg ../libunls ../libdeflt)
ADD_EXECUTABLE (mkisofs mkisofs.c ${MKISOFS_MOST_SRCS})
-TARGET_LINK_LIBRARIES(mkisofs schily hfs_iso deflt magic unls z ${EXTRA_LIBICONV} ${SCG_LIBS})
+TARGET_LINK_LIBRARIES(mkisofs schily hfs_iso deflt ${MAGICLIBS} c unls z ${EXTRA_LIBICONV} ${SCG_LIBS})
# common lib set and mkisofs source parts for the rest
LINK_LIBRARIES(${SCG_LIBS} schily deflt unls ${EXTRA_LIBICONV} )
-SET(MI_COMMON diag/scsi.c diag/scsi_cdr.c diag/cd_misc.c diag/modes.c diag/defaults.c diag/getnum.c)
+SET(MI_COMMON scsi.c scsi_cdr.c cd_misc.c modes.c defaults.c getnum.c)
ADD_EXECUTABLE(devdump diag/dump.c ${MI_COMMON})
ADD_EXECUTABLE(isodebug diag/isodebug.c ${MI_COMMON})
ADD_EXECUTABLE(isodump diag/isodump.c ${MI_COMMON})
Modified: nonameyet/branches/cleanup/mkisofs/apple.c
===================================================================
--- nonameyet/branches/cleanup/mkisofs/apple.c 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/apple.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -58,7 +58,7 @@
#include <utypes.h>
#include <ctype.h>
#include <netinet/in.h>
-#include <apple.h>
+#include "apple.h"
#include <schily.h>
#ifdef USE_MAGIC
Modified: nonameyet/branches/cleanup/mkisofs/apple_driver.8
===================================================================
--- nonameyet/branches/cleanup/mkisofs/apple_driver.8 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/apple_driver.8 2006-09-15 14:35:58 UTC (rev 314)
@@ -48,3 +48,25 @@
.I mkisofs 1.05 PLUS
by Andy Polyakov <appro at fy.chalmers.se>
(see http://fy.chalmers.se/~appro/mkisofs_plus.html)
+.PP
+This manpage describes the program implementation of
+.B
+apple_driver
+as shipped by the cdrkit distribution. See
+.B
+http://alioth.debian.org/projects/debburn/
+for details. It is a spinof from the original program distributed by the cdrtools project. However, the cdrtools developers are no longer involved in the development of this spinoff and therefore shall not be made responsible for any problem caused by it. Do not try to get support for this program by contacting the original authors.
+.PP
+If you have support questions, send them to
+.PP
+.B
+debburn-devel at lists.alioth.debian.org
+.br
+.PP
+If you have definitely found a bug, send a mail to this list or to
+.PP
+.B
+submit at bugs.debian.org
+.br
+.PP
+writing at least a short description into the Subject and "Package: cdrkit" into the first line of the mail body.
Modified: nonameyet/branches/cleanup/mkisofs/boot-alpha.c
===================================================================
--- nonameyet/branches/cleanup/mkisofs/boot-alpha.c 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/boot-alpha.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -43,7 +43,7 @@
#include "diskmbr.h"
#include "bootinfo.h"
#include <schily.h>
-#include "endian.h"
+#include "endianconv.h"
int add_boot_alpha_filename __PR((char *filename));
static int boot_alpha_write __PR((FILE *outfile));
Modified: nonameyet/branches/cleanup/mkisofs/boot-hppa.c
===================================================================
--- nonameyet/branches/cleanup/mkisofs/boot-hppa.c 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/boot-hppa.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -51,7 +51,7 @@
#include "diskmbr.h"
#include "bootinfo.h"
#include <schily.h>
-#include "endian.h"
+#include "endianconv.h"
int add_boot_hppa_cmdline __PR((char *cmdline));
int add_boot_hppa_kernel_32 __PR((char *filename));
Modified: nonameyet/branches/cleanup/mkisofs/boot-mips.c
===================================================================
--- nonameyet/branches/cleanup/mkisofs/boot-mips.c 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/boot-mips.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -193,7 +193,7 @@
#include "diskmbr.h"
#include "bootinfo.h"
#include <schily.h>
-#include "endian.h"
+#include "endianconv.h"
int add_boot_mips_filename __PR((char *filename));
Modified: nonameyet/branches/cleanup/mkisofs/boot-mipsel.c
===================================================================
--- nonameyet/branches/cleanup/mkisofs/boot-mipsel.c 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/boot-mipsel.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -64,7 +64,7 @@
#include "diskmbr.h"
#include "bootinfo.h"
#include <schily.h>
-#include "endian.h"
+#include "endianconv.h"
#include <errno.h>
#include <elf.h>
Modified: nonameyet/branches/cleanup/mkisofs/diag/isodebug.8
===================================================================
--- nonameyet/branches/cleanup/mkisofs/diag/isodebug.8 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/diag/isodebug.8 2006-09-15 14:35:58 UTC (rev 314)
@@ -76,16 +76,14 @@
.fi
.PP
-Though beeing the original author and deserving the most credits for
-successfull result, Joerg Schilling is no longer involved into the development
-of this application and therefore he shall not be made responsible for any
-problem caused by it. Do not try to get support by contacting the original
-author!
+This manpage describes the program implementation of
+.B
+isodebug
+as shipped by the cdrkit distribution. See
+.B
+http://alioth.debian.org/projects/debburn/
+for details. It is a spinof from the original program distributed by the cdrtools project. However, the cdrtools developers are no longer involved in the development of this spinoff and therefore shall not be made responsible for any problem caused by it. Do not try to get support for this program by contacting the original authors.
.PP
-Additional information can be found on:
-.br
-https://alioth.debian.org/projects/debburn/
-.PP
If you have support questions, send them to
.PP
.B
@@ -100,4 +98,3 @@
.PP
writing at least a short description into the Subject and "Package: cdrkit" into the first line of the mail body.
-
Modified: nonameyet/branches/cleanup/mkisofs/diag/isoinfo.8
===================================================================
--- nonameyet/branches/cleanup/mkisofs/diag/isoinfo.8 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/diag/isoinfo.8 2006-09-15 14:35:58 UTC (rev 314)
@@ -230,6 +230,28 @@
them
Copyright (C) 1999-2004 J\*org Schilling.
Patches to improve general usability would be gladly accepted.
+.PP
+This manpage describes the program implementation of
+.B
+isoinfo
+as shipped by the cdrkit distribution. See
+.B
+http://alioth.debian.org/projects/debburn/
+for details. It is a spinof from the original program distributed by the cdrtools project. However, the cdrtools developers are no longer involved in the development of this spinoff and therefore shall not be made responsible for any problem caused by it. Do not try to get support for this program by contacting the original authors.
+.PP
+If you have support questions, send them to
+.PP
+.B
+debburn-devel at lists.alioth.debian.org
+.br
+.PP
+If you have definitely found a bug, send a mail to this list or to
+.PP
+.B
+submit at bugs.debian.org
+.br
+.PP
+writing at least a short description into the Subject and "Package: cdrkit" into the first line of the mail body.
.SH BUGS
The user interface really sucks.
.SH FUTURE IMPROVEMENTS
Modified: nonameyet/branches/cleanup/mkisofs/endian.c
===================================================================
--- nonameyet/branches/cleanup/mkisofs/endian.c 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/endian.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -11,7 +11,7 @@
*/
#include <mconfig.h>
-#include "endian.h"
+#include "endianconv.h"
/* Write a 64-bit quantity out into memory in BIG ENDIAN order */
void write_be64(in, out)
Deleted: nonameyet/branches/cleanup/mkisofs/endian.h
===================================================================
--- nonameyet/branches/cleanup/mkisofs/endian.h 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/endian.h 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,29 +0,0 @@
-/*
- * This file has been modified for the cdrkit suite.
- *
- * The behaviour and appearence of the program code below can differ to a major
- * extent from the version distributed by the original author(s).
- *
- * For details, see Changelog file distributed with the cdrkit package. If you
- * received this file from another source then ask the distributing person for
- * a log of modifications.
- *
- */
-
-void write_be64 __PR((unsigned long long in, unsigned char *out));
-unsigned long long read_be64 __PR((unsigned char *in));
-void write_le64 __PR((unsigned long long in, unsigned char *out));
-unsigned long long read_le64 __PR((unsigned char *in));
-
-void write_le48 __PR((unsigned long long in, unsigned char *out));
-unsigned long long read_le48 __PR((unsigned char *in));
-
-void write_be32 __PR((unsigned long in, unsigned char *out));
-unsigned long read_be32 __PR((unsigned char *in));
-void write_le32 __PR((unsigned long in, unsigned char *out));
-unsigned long read_le32 __PR((unsigned char *in));
-
-void write_be16 __PR((unsigned short in, unsigned char *out));
-unsigned short read_be16 __PR((unsigned char *in));
-void write_le16 __PR((unsigned short in, unsigned char *out));
-unsigned short read_le16 __PR((unsigned char *in));
Copied: nonameyet/branches/cleanup/mkisofs/endianconv.h (from rev 313, nonameyet/trunk/mkisofs/endianconv.h)
===================================================================
--- nonameyet/branches/cleanup/mkisofs/endianconv.h (rev 0)
+++ nonameyet/branches/cleanup/mkisofs/endianconv.h 2006-09-15 14:35:58 UTC (rev 314)
@@ -0,0 +1,29 @@
+/*
+ * This file has been modified for the cdrkit suite.
+ *
+ * The behaviour and appearence of the program code below can differ to a major
+ * extent from the version distributed by the original author(s).
+ *
+ * For details, see Changelog file distributed with the cdrkit package. If you
+ * received this file from another source then ask the distributing person for
+ * a log of modifications.
+ *
+ */
+
+void write_be64 __PR((unsigned long long in, unsigned char *out));
+unsigned long long read_be64 __PR((unsigned char *in));
+void write_le64 __PR((unsigned long long in, unsigned char *out));
+unsigned long long read_le64 __PR((unsigned char *in));
+
+void write_le48 __PR((unsigned long long in, unsigned char *out));
+unsigned long long read_le48 __PR((unsigned char *in));
+
+void write_be32 __PR((unsigned long in, unsigned char *out));
+unsigned long read_be32 __PR((unsigned char *in));
+void write_le32 __PR((unsigned long in, unsigned char *out));
+unsigned long read_le32 __PR((unsigned char *in));
+
+void write_be16 __PR((unsigned short in, unsigned char *out));
+unsigned short read_be16 __PR((unsigned char *in));
+void write_le16 __PR((unsigned short in, unsigned char *out));
+unsigned short read_le16 __PR((unsigned char *in));
Modified: nonameyet/branches/cleanup/mkisofs/fnmatch.c
===================================================================
--- nonameyet/branches/cleanup/mkisofs/fnmatch.c 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/fnmatch.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -35,12 +35,12 @@
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <errno.h>
#include <utypes.h>
-#include <fnmatch.h>
+#include "fnmatch.h"
#ifndef __STDC__
#define const
Modified: nonameyet/branches/cleanup/mkisofs/jte.c
===================================================================
--- nonameyet/branches/cleanup/mkisofs/jte.c 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/jte.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -31,7 +31,7 @@
#include "dvd_file.h"
#include "ifo_read.h"
#include "md5.h"
-#include "endian.h"
+#include "endianconv.h"
#endif
#ifdef APPLE_HYB
#include <ctype.h>
Modified: nonameyet/branches/cleanup/mkisofs/mac_label.c
===================================================================
--- nonameyet/branches/cleanup/mkisofs/mac_label.c 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/mac_label.c 2006-09-15 14:35:58 UTC (rev 314)
@@ -58,7 +58,7 @@
#include <mconfig.h>
#include "mkisofs.h"
-#include <mac_label.h>
+#include "mac_label.h"
#include "apple.h"
#ifdef PREP_BOOT
Modified: nonameyet/branches/cleanup/mkisofs/mkisofs.8
===================================================================
--- nonameyet/branches/cleanup/mkisofs/mkisofs.8 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/mkisofs/mkisofs.8 2006-09-15 14:35:58 UTC (rev 314)
@@ -30,8 +30,8 @@
.I pathspec [pathspec ...]
.SH DESCRIPTION
.B mkisofs
-is effectively a pre-mastering program to generate an ISO9660/JOLIET/HFS hybrid
-filesystem.
+is a pre-mastering program to generate ISO9660/JOLIET/HFS hybrid
+filesystems.
.PP
.B mkisofs
is capable of generating the
@@ -40,17 +40,16 @@
by the
.B "Rock Ridge Interchange Protocol.
This is used to further describe the
-files in the iso9660 filesystem to a unix host, and provides information such
-as longer filenames, uid/gid, posix permissions, symbolic links,
+files in the ISO9660 filesystem to a Unix host, and provides information such
+as long filenames, UID/GID, POSIX permissions, symbolic links,
block and character devices.
.PP
If Joliet or HFS hybrid command line options are specified,
.B mkisofs
-will create additional filesystem meta data for Joliet or HFS.
-The file content in this case refers to the same data blocks on the media.
-It
-will generate a pure ISO9660 filesystem unless the Joliet or HFS hybrid command
-line options are given.
+will create the additional filesystem metadata needed for Joliet or HFS.
+If no Joliet or HFS hybrid command line options are given,
+.B mkisofs
+will generate a pure ISO9660 filesystem.
.PP
.B mkisofs
can generate a
@@ -77,13 +76,13 @@
binary image which will correspond to an ISO9660 or HFS filesystem when
written to a block device.
.PP
-Each file written to the iso9660 filesystem must have a filename in the 8.3
+Each file written to the ISO9660 filesystem must have a filename in the 8.3
format (8 characters, period, 3 characters, all upper case), even if Rock Ridge
is in use. This filename is used on systems that are not able to make use of
the Rock Ridge extensions (such as MS-DOS), and each filename in each directory
must be different from the other filenames in the same directory.
.B mkisofs
-generally tries to form correct names by forcing the unix filename to upper
+generally tries to form correct names by forcing the Unix filename to upper
case and truncating as required, but often times this yields unsatisfactory
results when there are cases where the
truncated names are not all unique.
@@ -126,7 +125,7 @@
for the entire time that the disc is being written.
.PP
.B pathspec
-is the path of the directory tree to be copied into the iso9660 filesystem.
+is the path of the directory tree to be copied into the ISO9660 filesystem.
Multiple paths can be specified, and
.B
mkisofs
@@ -197,13 +196,13 @@
Use with caution.
.TP
.B \-allow\-lowercase
-This options allows lower case characters to appear in iso9660 filenames.
+This options allows lower case characters to appear in ISO9660 file names.
.br
This violates the ISO9660 standard, but it happens to work on some systems.
Use with caution.
.TP
.B \-allow\-multidot
-This options allows more than one dot to appear in iso9660 filenames.
+This options allows more than one dot to appear in ISO9660 filenames.
A leading dot is not affected by this option, it
may be allowed separately using the
.B \-allow\-leading\-dots
@@ -228,7 +227,7 @@
appear once on the CD. This helps to save space on the CD.
The option
.B \-cache\-inodes
-is default on UNIX like operating systems.
+is default on Unix like operating systems.
Be careful when using this option on a filesystem without unique
inode numbers as it may result in files containing the wrong content on CD.
.TP
@@ -329,7 +328,7 @@
.BI \-sparc\-boot " img_sun4,img_sun4c,img_sun4m,img_sun4d,img_sun4e
Specifies a comma separated list of boot images that are needed to make
a bootable CD for sparc systems.
-Partition 0 is used for the ISO-9660 image, the first image file is mapped
+Partition 0 is used for the ISO9660 image, the first image file is mapped
to partition 1.
There may be empty fields in the comma separated list.
The maximum number of possible partitions is 8 so it is impossible to specify
@@ -341,7 +340,7 @@
.B \-sparc\-boot
option has been specified, the first sector of the resulting image will
contain a Sun disk label. This disk label specifies slice 0 for the
-iso9660 image and slice 1 .\|.\|. slice 7 for the boot images that
+ISO9660 image and slice 1 .\|.\|. slice 7 for the boot images that
have been specified with this option. Byte offset 512 .\|.\|. 8191
within each of the additional boot images must contain a primary boot
that works for the appropriate sparc architecture. The rest of each
@@ -364,7 +363,7 @@
.B mkisofs
is called with
.BI "\-G " image " \-B " ...
-all boot partitions are mapped to the partition that contains the iso9660
+all boot partitions are mapped to the partition that contains the ISO9660
filesystem image and the generic boot image that is located in the first
16 sectors of the disk is used for all architectures.
.TP
@@ -377,7 +376,7 @@
The boot image must be exactly the size of either a 1200, 1440, or a 2880
kB floppy, and
.B mkisofs
-will use this size when creating the output iso9660
+will use this size when creating the output ISO9660
filesystem. It is assumed that the first 512 byte sector should be read
from the boot image (it is essentially emulating a normal floppy drive).
This will work, for example, if the boot image is a LILO based boot floppy.
@@ -404,7 +403,7 @@
.BI \-sparc\-boot " img_sun4,img_sun4c,img_sun4m,img_sun4d,img_sun4e
Specifies a comma separated list of boot images that are needed to make
a bootable CD for sparc systems.
-Partition 0 is used for the ISO-9660 image, the first image file is mapped
+Partition 0 is used for the ISO9660 image, the first image file is mapped
to partition 1.
There may be empty fields in the comma separated list.
The maximum number of possible partitions is 8 so it is impossible to specify
@@ -416,7 +415,7 @@
.B \-sparc\-boot
option has been specified, the first sector of the resulting image will
contain a Sun disk label. This disk label specifies slice 0 for the
-iso9660 image and slice 1 .\|.\|. slice 7 for the boot images that
+ISO9660 image and slice 1 .\|.\|. slice 7 for the boot images that
have been specified with this option. Byte offset 512 .\|.\|. 8191
within each of the additional boot images must contain a primary boot
that works for the appropriate sparc architecture. The rest of each
@@ -439,7 +438,7 @@
.B mkisofs
is called with
.BI "\-G " image " \-B " ...
-all boot partitions are mapped to the partition that contains the iso9660
+all boot partitions are mapped to the partition that contains the ISO9660
filesystem image and the generic boot image that is located in the first
16 sectors of the disk is used for all architectures.
.TP
@@ -449,7 +448,7 @@
The
.B generic_boot_image
will be placed on the first 16 sectors of the CD. The first 16 sectors
-are the sectors that are located before the iso9660 primary volume descriptor.
+are the sectors that are located before the ISO9660 primary volume descriptor.
If this option is used together with the
.B \-sparc\-boot
option, the Sun disk label will overlay the first 512 bytes of the generic
@@ -491,7 +490,7 @@
.BI \-C " last_sess_start,next_sess_start
This option is needed when
.B mkisofs
-is used to create a CDextra or the image of a second session or a
+is used to create a CD Extra or the image of a second session or a
higher level session for a multi session disk.
The option
.B \-C
@@ -516,7 +515,7 @@
option,
.B mkisofs
will create a filesystem image that is intended to be used for a second
-session on a CDextra. This is a multi session CD that holds audio data
+session on a CD Extra. This is a multi session CD that holds audio data
in the first session and a ISO9660 filesystem in the second session.
.TP
.BI \-c " boot_catalog
@@ -541,15 +540,15 @@
Check all filenames imported from old session for compliance with
actual
.B mkisofs
-iso9660 file naming rules.
+ISO9660 file naming rules.
It his option is not present, only names with a length > 31 are checked
-as these files are a hard violation of the iso9660 standard.
+as these files are a hard violation of the ISO9660 standard.
.TP
.BI \-check\-session " FILE
Check all old sessions for compliance with
actual
.B mkisofs
-iso9660 file naming rules.
+ISO9660 file naming rules.
This is a high level option that is a combination of the options:
.BI \-M " FILE " "\-C 0,0 \-check\-oldnames
For the parameter
@@ -559,7 +558,7 @@
option.
.TP
.BI \-copyright " FILE
-Specifies the Copyright file name.
+Specifies the copyright file name.
There is space on the disc for 37 characters of information.
This parameter can also be set in the file
.B \&.m\&kisofsrc
@@ -586,7 +585,7 @@
Specifying this option automatically enables Rock Ridge extensions.
.TP
.B \-dvd\-video
-Generate DVD-Video compliant UDF file system. This is done by sorting the
+Generate a DVD-Video compliant UDF file system. This is done by sorting the
order of the content of the appropriate files and by adding padding
between the files if needed.
Note that the sorting only works if the DVD-Video filenames include upper case
@@ -746,7 +745,7 @@
section below for more details.
.TP
.BI \-iso\-level " level
-Set the iso9660 conformance level. Valid numbers are 1..3 and 4.
+Set the ISO9660 conformance level. Valid numbers are 1..3 and 4.
.sp
With level 1, files may only consist of one section and filenames are
restricted to 8.3 characters.
@@ -755,14 +754,14 @@
.sp
With level 3, no restrictions (other than ISO-9660:1988) do apply.
.sp
-With all iso9660 levels from 1..3, all filenames are restricted to upper
+With all ISO9660 levels from 1..3, all filenames are restricted to upper
case letters, numbers and the underscore (_). The maximum filename
length is restricted to 31 characters, the directory nesting level
is restricted to 8 and the maximum path length is limited to 255 characters.
.sp
Level 4 officially does not exists but
.B mkisofs
-maps it to ISO-9660:1999 which is ISO-9660 version 2.
+maps it to ISO-9660:1999 which is ISO9660 version 2.
.sp
With level 4, an enhanced volume descriptor with version number
and file structure version number set to 2 is emitted.
@@ -774,21 +773,21 @@
.\" specified to be characters is subject to agreement between the
.\" originator and the recipient of the volume),
the maximum length for files and directory is raised to 207.
-If Rock Ridge is used, the maximum ISO-9660 name length is reduced to 197.
+If Rock Ridge is used, the maximum ISO9660 name length is reduced to 197.
.sp
When creating Version 2 images,
.B mkisofs
emits an enhanced volume descriptor which looks similar to a primary volume
descriptor but is slightly different. Be careful not to use broken software
-to make ISO-9660 images bootable by assuming a second PVD copy and patching
+to make ISO9660 images bootable by assuming a second PVD copy and patching
this putative PVD copy into an El Torito VD.
.TP
.B \-J
-Generate Joliet directory records in addition to regular iso9660 file
-names. This is primarily useful when the discs are to be used on Windows-NT
-or Windows-95 machines. The Joliet filenames are specified in Unicode and
+Generate Joliet directory records in addition to regular ISO9660 file
+names. This is primarily useful when the discs are to be used on Windows
+machines. The Joliet filenames are specified in Unicode and
each path component can be up to 64 Unicode characters long.
-Note that Joliet is no standard - CD's that use only Joliet extensions but no
+Note that Joliet is not a standard - CDs that use only Joliet extensions but no
standard Rock Ridge extensions may usually only be used on Microsoft Win32
systems. Furthermore, the fact that the filenames are limited to 64 characters
and the fact that Joliet uses the UTF-16 coding for Unicode characters causes
@@ -873,7 +872,7 @@
.BI \-m " glob
Exclude
.I glob
-from being written to CDROM.
+from being written to CD-ROM.
.I glob
is a shell wild-card-style pattern that must match part of the filename (not
the path as with option
@@ -889,7 +888,7 @@
mkisofs \-o rom \-m '*.o' \-m core \-m foobar
would exclude all files ending in ".o", called "core" or "foobar" to be
-copied to CDROM. Note that if you had a directory called "foobar" it too (and
+copied to CD-ROM. Note that if you had a directory called "foobar" it too (and
of course all its descendants) would be excluded.
.sp
NOTE: The
@@ -906,11 +905,11 @@
to be exclude as above.
.TP
.B \-max\-iso9660\-filenames
-Allow 37 chars in iso9660 filenames.
+Allow 37 chars in ISO9660 filenames.
This option forces the
.B \-N
option as the extra name space is taken from the space reserved for
-ISO-9660 version numbers.
+ISO9660 version numbers.
.br
This violates the ISO9660 standard, but it happens to work on many systems.
Although a conforming application needs to provide a buffer space of at
@@ -924,7 +923,7 @@
or
.TP
.BI \-dev " device
-Specifies path to existing iso9660 image to be merged. The alternate form
+Specifies path to existing ISO9660 image to be merged. The alternate form
takes a SCSI device specifier that uses the same syntax as the
.B "dev=
parameter of
@@ -947,22 +946,22 @@
Use with caution.
.TP
.BI \-new\-dir\-mode " mode
-Mode to use when creating new directories in the iso fs image. The default
+Mode to use when creating new directories in the filesystem image. The default
mode is 0555.
.TP
.B \-nobak
.TP
.B \-no\-bak
-Do not include backup files files on the iso9660 filesystem.
+Do not include backup files files on the ISO9660 filesystem.
If the
.B \-no\-bak
option is specified, files that contain the characters '~' or '#'
or end in '.bak' will not be included (these are typically backup files
-for editors under unix).
+for editors under Unix).
.TP
.B \-force\-rr
Do not use the automatic Rock Ridge attributes recognition for previous sessions.
-This helps to show rotten iso9660 extension records as e.g. created by NERO burning ROM.
+This helps to show rotten ISO9660 extension records as e.g. created by NERO burning ROM.
.TP
.B \-no\-rr
Do not use the Rock Ridge attributes from previous sessions.
@@ -1003,7 +1002,7 @@
has been fixed in May 2003.
.TP
.BI \-o " filename
-is the name of the file to which the iso9660 filesystem image should be
+is the name of the file to which the ISO9660 filesystem image should be
written. This can be a disk file, a tape drive, or it can correspond directly
to the device name of the optical disc writer. If not specified, stdout is
used. Note that the output can also be a block special device for a regular
@@ -1014,7 +1013,7 @@
Pad the end of the whole image by 150 sectors (300 kB).
If the option
.B \-B
-is used, then there is a padding at the end of the iso9660 partition
+is used, then there is a padding at the end of the ISO9660 partition
and before the beginning of the boot partitions.
The size of this padding is chosen to make the first boot partition start
on a sector number that is a multiple of 16.
@@ -1052,7 +1051,7 @@
.TP
.BI \-publisher " publisher_id
Specifies a text string that will be written into the volume header.
-This should describe the publisher of the CDROM, usually with a
+This should describe the publisher of the CD-ROM, usually with a
mailing address and phone number. There is space on the disc for 128
characters of information. This parameter can also be set in the file
.B \&.m\&kisofsrc
@@ -1061,7 +1060,7 @@
.TP
.BI \-p " preparer_id
Specifies a text string that will be written into the volume header.
-This should describe the preparer of the CDROM, usually with a mailing
+This should describe the preparer of the CD-ROM, usually with a mailing
address and phone number. There is space on the disc for 128
characters of information. This parameter can also be set in the file
.B \&.m\&kisofsrc
@@ -1074,7 +1073,7 @@
Disk At Once mode and with some CD-R drives when piping directly into
.B wodim.
In this case it is needed to know the size of the filesystem before the
-actual CD-creation is done.
+actual CD creation is done.
The option \-print\-size allows to get this size from a "dry-run" before
the CD is actually written.
Old versions of
@@ -1102,7 +1101,7 @@
.TP
.B \-R
Generate SUSP and RR records using the Rock Ridge protocol to further describe
-the files on the iso9660 filesystem.
+the files on the ISO9660 filesystem.
.TP
.B \-r
This is like the \-R option, but file ownership and modes are set to
@@ -1114,7 +1113,7 @@
globally executable on the client. If any search bit is set for a
directory, set all of the search bits, so that directories are globally
searchable on the client. All write bits are cleared, because the
-CD-Rom will be mounted read-only in any case. If any of the special
+filesystem will be mounted read-only in any case. If any of the special
mode bits are set, clear them, because file locks are not useful on a
read-only file system, and set-id bits are not desirable for uid 0 or
gid 0.
@@ -1216,7 +1215,7 @@
.TP
.B \-split\-output
Split the output image into several files of approximately 1 GB.
-This helps to create DVD sized iso9660 images on operating systems without
+This helps to create DVD sized ISO9660 images on operating systems without
large file support.
Wodim will concatenate more than one file into a single track if writing
to a DVD.
@@ -1230,7 +1229,7 @@
.BI \-stream\-media\-size " #
Select streaming operation and set the media size to # sectors.
This allows you to pipe the output of the tar program into mkisofs
-and to create a iso9660 filesystem without the need of an intermediate
+and to create a ISO9660 filesystem without the need of an intermediate
tar archive file.
If this option has been specified,
.B mkisofs
@@ -1246,7 +1245,7 @@
.sp
The option
.B \-stream\-media\-size
-creates simple iso9660 filesystems only and may not used together with multi-session
+creates simple ISO9660 filesystems only and may not used together with multi-session
or hybrid filesystem options.
.TP
.BI \-stream\-file\-name " name
@@ -1256,7 +1255,7 @@
Specifies a comma separated list of filesystem images that are needed to make
a bootable CD for Solaris x86 systems.
.sp
-Note that partition 1 is used for the ISO-9660 image and that partition 2 is
+Note that partition 1 is used for the ISO9660 image and that partition 2 is
the whole disk, so partition 1 and 2 may not be used by external partition data.
The first image file is mapped to partition 0.
There may be empty fields in the comma separated list,
@@ -1275,7 +1274,7 @@
SVr4 disk label at offset 1024 in the first sector of the CD.
This disk label specifies slice 0 for the first (usually UFS type)
filesystem image that is used to boot the PC and slice 1 for
-the iso9660 image.
+the ISO9660 image.
Slice 2 spans the whole CD slice 3 .\|.\|. slice 7 may be used for additional
filesystem images that have been specified with this option.
.sp
@@ -1302,7 +1301,7 @@
If specified in both places, the command line version is used.
.TP
.B \-T
-Generate a file TRANS.TBL in each directory on the CDROM, which can be used
+Generate a file TRANS.TBL in each directory on the CD-ROM, which can be used
on non-Rock Ridge capable systems to help establish the correct file names.
There is also information present in the file that indicates the major and
minor numbers for block and character devices, and each symlink has the name of
@@ -1333,7 +1332,7 @@
Note that
.B UDF
wastes the space from sector ~20 to sector 256 at the beginning of the disk
-in addition to the spcae needed for real
+in addition to the space needed for real
.B UDF
data structures.
.TP
@@ -1356,7 +1355,7 @@
This option is the default on VMS.
.TP
.B \-U
-Allows "Untranslated" filenames, completely violating the iso9660 standards
+Allows "Untranslated" filenames, completely violating the ISO9660 standards
described above. Forces on the \-d, \-l, \-N, \-allow\-leading\-dots,
\-relaxed\-filenames,
\-allow\-lowercase, \-allow\-multidot and \-no\-iso\-translate
@@ -1366,7 +1365,7 @@
not recognize ANY extensions. Use with extreme caution.
.TP
.B \-no\-iso\-translate
-Do not translate the characters '#' and '~' which are invalid for iso9660 filenames.
+Do not translate the characters '#' and '~' which are invalid for ISO9660 filenames.
These characters are though invalid often used by Microsoft systems.
.br
This violates the ISO9660 standard, but it happens to work on many systems.
@@ -1394,12 +1393,12 @@
.TP
.BI \-volset\-size " #
Sets the volume set size to #.
-The volume set size is the number of CD's that are in a CD volume set.
+The volume set size is the number of CDs that are in a CD volume set.
A volume set is a collection of one or more volumes, on which a set of
files is recorded.
.sp
-Volume Sets are not intended to be used to create a set numbered CD's
-that are part of e.g. a Operation System installation set of CD's.
+Volume Sets are not intended to be used to create a set numbered CDs
+that are part of e.g. a Operation System installation set of CDs.
Volume Sets are rather used to record a big directory tree that would not
fit on a single volume.
Each volume of a Volume Set contains a description of all the directories
@@ -1407,7 +1406,7 @@
are less than, or equal to, the assigned Volume Set Size of the current
volume.
.sp
-.B Mkisofs
+.B mkisofs
currently does not support a
.B \-volset\-size
that is larger than 1.
@@ -1435,7 +1434,7 @@
.BI \-x " path
Exclude
.I path
-from being written to CDROM.
+from being written to CD-ROM.
.I path
must be the complete pathname that results from concatenating the pathname
given as command line argument and the path relative to this directory.
@@ -1459,7 +1458,7 @@
.B \-R
or
.B \-r
-options to enable RockRidge, and generate compressed files using the
+options to enable Rock Ridge, and generate compressed files using the
.B mkzftree
utility before running
.BR mkisofs .
@@ -1562,8 +1561,8 @@
.TP
.B \-part
Generate an HFS partition table. By default, no partition table is generated,
-but some older Macintosh CDROM drivers need an HFS partition table on the
-CDROM to be able to recognize a hybrid CDROM.
+but some older Macintosh CD-ROM drivers need an HFS partition table on the
+CD-ROM to be able to recognize a hybrid CD-ROM.
.TP
.BI \-auto " AutoStart_file
Make the HFS CD use the QuickTime 2.0 Autostart feature to launch an
@@ -1749,7 +1748,7 @@
a subset of all codes and that 16-bit characters are not compliant with
the POSIX filesystem interface.
.PP
-Modern UNIX operating systems may use
+Modern Unix operating systems may use
.B UTF-8
coding for filenames. This coding allows to use the complete Unicode code set.
Each 32-bit character is represented by one or more 8-bit characters.
@@ -1760,7 +1759,7 @@
coded Unicode character.
If a character is coded in
.B "7-Bit ASCII
-(used in USA and other countries with limted character set)
+(used in USA and other countries with limited character set)
is maps 1:1 to a
.BR UTF-32 ", " UTF-16 " or " UTF-8
coded Unicode character.
@@ -1804,10 +1803,10 @@
To make matters more complicated, different operating systems use
different character sets for the region or language. For example the character
code for "small e with acute accent" may be character code 0x82 on a PC,
-code 0x8e on a Macintosh and code 0xe9 on a UNIX system.
+code 0x8e on a Macintosh and code 0xe9 on a Unix system.
Note while the codings used on a PC or Mac are nonstandard,
Unicode codes this character as 0x00000000e9 which is basically the
-same value as the value used by most UNIX systems.
+same value as the value used by most Unix systems.
.PP
As long as not all operating systems and applications will use the Unicode
character set as the basis for file names in a unique way, it may be
@@ -1888,7 +1887,7 @@
Note that there is no support for 16 bit UNICODE (UTF-16) or 32 bit UNICODE
(UTF-32) coding because this coding is not POSIX compliant. There should
be support for UTF-8 UNICODE coding which is compatible to POSIX filenames
-and supported by moder UNIX implementations such as Solaris.
+and supported by moder Unix implementations such as Solaris.
.PP
A 1:1 character set mapping can be defined by using the keyword
.I default
@@ -1945,7 +1944,7 @@
.B \-hfs\-creator
and/or
.B \-hfs\-type
-options, otherwise the default CREATOR and TYPE are 'unix' and 'TEXT'.
+options, otherwise the default CREATOR and TYPE are 'Unix' and 'TEXT'.
.PP
The format of the
.I mapping
@@ -2046,7 +2045,7 @@
0/string/GIF8/8BIM GIFf GIF image
0/beshort/0xffd8/8BIM JPEG image data
0/string/SIT!/SIT! SIT! StuffIt Archive
-0/string/\\037\\235/LZIV ZIVU standard unix compress
+0/string/\\037\\235/LZIV ZIVU standard Unix compress
0/string/\\037\\213/GNUz ZIVU gzip compressed data
0/string/%!/ASPS TEXT Postscript
0/string/\\004%!/ASPS TEXT PC Postscript with a ^D to start
@@ -2071,7 +2070,7 @@
option may significantly increase processing time as each file has to opened
and read to find it's magic number.
.PP
-In summary, for all files, the default CREATOR is 'unix' and the default
+In summary, for all files, the default CREATOR is 'Unix' and the default
TYPE is 'TEXT'. These can be changed by using entries in the
.I \&.m\&kisofsrc
file or by using the
@@ -2262,11 +2261,11 @@
the Unix filename is used - with escaped special characters. Special
characters include '/' and characters with codes over 127.
.PP
-Aufs escapes these characters by using ":" followed by the character code
+AUFS escapes these characters by using ":" followed by the character code
as two hex digits. Netatalk and EtherShare have a similar scheme, but uses
"%" instead of a ":".
.PP
-If mkisofs can't find an HFS filename, then it uses the Unix name, with
+If mkisofs can not find an HFS filename, it uses the Unix name, with
any %xx or :xx characters (xx == two hex digits) converted to a single
character code. If "xx" are not hex digits ([0-9a-fA-F]), then they are
left alone - although any remaining ":" is converted to "%" as colon
@@ -2591,7 +2590,7 @@
command line option.
.TP
.B PREP
-This should describe the preparer of the CDROM,
+This should describe the preparer of the CD-ROM,
usually with a mailing address and phone number.
There is space on the disc for 128 characters of information.
May be overridden using the
@@ -2599,7 +2598,7 @@
command line option.
.TP
.B PUBL
-This should describe the publisher of the CDROM,
+This should describe the publisher of the CD-ROM,
usually with a mailing address and phone number.
There is space on the disc for 128 characters of information.
May be overridden using the
@@ -2645,7 +2644,7 @@
.SH EXAMPLES
.PP
-To create a vanilla ISO-9660 filesystem image in the file
+To create a vanilla ISO9660 filesystem image in the file
.IR cd.iso ,
where the directory
.I cd_dir
@@ -2670,7 +2669,7 @@
% mkisofs \-o cd.iso \-r cd_dir
.PP
To write a tar archive directly to a CD that will later contain a simple
-iso9660 filesystem with the tar archive call:
+ISO9660 filesystem with the tar archive call:
.PP
% star \-c . | mkisofs \-stream\-media\-size 333000 | \\
.br
@@ -2712,13 +2711,13 @@
.PP
The following example puts different files on the CD that all have
the name README, but have different contents when seen as a
-ISO9660/RockRidge, Joliet or HFS CD.
+ISO9660/Rock Ridge, Joliet or HFS CD.
.PP
Current directory contains:
.PP
% ls \-F
.br
-README.hfs README.joliet README.unix cd_dir/
+README.hfs README.joliet README.Unix cd_dir/
.PP
The following command puts the contents of the directory
.I cd_dir
@@ -2730,52 +2729,60 @@
.br
\-hide README.hfs \-hide README.joliet \\
.br
- \-hide\-joliet README.hfs \-hide\-joliet README.unix \\
+ \-hide\-joliet README.hfs \-hide\-joliet README.Unix \\
.br
- \-hide\-hfs README.joliet \-hide\-hfs README.unix \\
+ \-hide\-hfs README.joliet \-hide\-hfs README.Unix \\
.br
README=README.hfs README=README.joliet \\
.br
- README=README.unix cd_dir
+ README=README.Unix cd_dir
.PP
i.e. the file README.hfs will be seen as README on the HFS CD and the
other two README files will be hidden. Similarly for the Joliet and
-ISO9660/RockRidge CD.
+ISO9660/Rock Ridge CD.
.PP
There are probably all sorts of strange results possible with
combinations of the hide options ...
.SH AUTHOR
-.B m\&kisofs
-is not based on the standard mk*fs tools for unix, because we must generate
-a complete copy of an existing filesystem on a disk in the iso9660
-filesystem. The name m\&kisofs is probably a bit of a misnomer, since it
-not only creates the filesystem, but it also populates it as well.
-However, the appropriate tool name for a UNIX tool that creates populated
-filesystems - mkproto - is not well known.
.PP
.br
Eric Youngdale <ericy at gnu.ai.mit.edu> or <eric at andante.org> wrote the
first versions (1993 .\|.\|. 1998) of the m\&kisofs utility.
The copyright for old versions of the m\&kisofs utility is held by
Yggdrasil Computing, Incorporated.
-J\*org Schilling wrote the SCSI transport library and it's adaptation layer to
+.PP
+Major additional parts were written or contributed by the following authors. Also
+see the MAINTAINER section below for recent information.
+.PP
+J\*org Schilling
+wrote the SCSI transport library and its adaptation layer to
.B mkisofs
and newer parts (starting from 1999) of the utility, this makes
.B mkisofs
+.br
Copyright (C) 1999, 2000, 2001 J\*org Schilling.
.PP
-HFS hybrid code Copyright (C) James Pearson 1997, 1998, 1999, 2000, 2001
-.br
-libhfs code Copyright (C) 1996, 1997 Robert Leslie
-.br
-libfile code Copyright (C) Ian F. Darwin 1986, 1987, 1989, 1990, 1991,
-1992, 1994, 1995.
-.br
-libunls code Copyright (C) James Pearson 2000, (C) Joerg Schilling 2001-2006, (C) Jungshik Shin 2002
+HFS hybrid code, Copyright (C) James Pearson 1997, 1998, 1999, 2000, 2001
+.PP
+libhfs code, Copyright (C) 1996, 1997 Robert Leslie
+.PP
+libunls code, Copyright (C) James Pearson 2000, (C) Joerg Schilling 2001-2006, (C) Jungshik Shin 2002
+.PP
+iconv code, Copyright (C) 2003 Jungshik Shin, (C) 2003 Jaakko Heinonen
+.PP
+See MAINTAINER section for contact information.
.SH NOTES
.PP
-.B Mkisofs
+.B mkisofs
+is not based on the standard mk*fs tools for Unix, because we must generate
+a complete copy of an existing filesystem on a disk in the ISO9660
+filesystem. The name mkisofs is probably a bit of a misnomer, since it
+not only creates the filesystem, but it also populates it.
+However, the appropriate tool name for a Unix tool that creates populated
+filesystems - mkproto - is not well known.
+.PP
+.B mkisofs
may safely be installed suid root. This may be needed to allow
.B mkisofs
to read the previous session when creating a multi session image.
@@ -2784,7 +2791,7 @@
.B mkisofs
is creating a filesystem image with Rock Ridge attributes and the
directory nesting level of the source directory tree is too much
-for ISO-9660,
+for ISO9660,
.B mkisofs
will do deep directory relocation.
This results in a directory called
@@ -2805,7 +2812,7 @@
.TP
\(bu
Any files that have hard links to files not in the tree being copied to the
-iso9660 filesystem will have an incorrect file reference count.
+ISO9660 filesystem will have an incorrect file reference count.
.TP
\(bu
Does not check for SUSP record(s) in "." entry of the
@@ -2965,12 +2972,13 @@
.SH AVAILABILITY
.B m\&kisofs
is available as part of the cdrkit package from
-http://alioth.debian.org/projects/debburn/
+http://alioth.debian.org/projects/debburn/. For other implementations/spinoffs
+of mkisofs, look at the homepage of the particular developers.
.B hfsutils
from ftp://ftp.mars.org/pub/hfs
.SH "MAILING LISTS
If you want to actively take part on the development of m\&kisofs,
-you may join the developers mailing list by following the instructions on:
+you may join the Cdrkit developers mailing list by following the instructions on:
.nf
.sp
https://alioth.debian.org/mail/?group_id=31006
@@ -2986,12 +2994,17 @@
.fi
.SH MAINTAINER
+.PP
+This is the Cdrkit spinoff of the original mkisofs application. Maintained by:
.nf
Joerg Jaspert
Eduard Bloch
Steve McIntyre
+Ben Hutchings
+and other contributors
.PP
-Previous maintainers:
+Cdrkit implementation of mkisofs is derived from the Cdrtools version (however
+now developed independently), having previous maintainers:
.PP
.nf
J\*org Schilling
@@ -3009,3 +3022,12 @@
.PP
.B
debburn-devel at lists.alioth.debian.org
+
+.PP
+If you are interested in using the alternative mkisofs derivative maintained in
+the Cdrtools package, visit http://cdrecord.berlios.de/. See there for download
+and contact information for cdrtools related issues. Note that the Cdrkit is
+not affiliated to Cdrtools and vice versa.
+
+.SH ACKNOWLEDGEMENTS
+UNIX is a registered trademark of The Open Group in the US and other countries.
Modified: nonameyet/branches/cleanup/readcd/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/readcd/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/readcd/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
PROJECT (READECD)
-INCLUDE_DIRECTORIES(../include ../cdrecord . ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../cdrecord ${CMAKE_BINARY_DIR})
INCLUDE(../include/AddScgBits.cmake)
AUX_SOURCE_DIRECTORY(. READCD_SRCS)
Modified: nonameyet/branches/cleanup/readcd/readcd.1
===================================================================
--- nonameyet/branches/cleanup/readcd/readcd.1 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/readcd/readcd.1 2006-09-15 14:35:58 UTC (rev 314)
@@ -356,76 +356,18 @@
.SH NOTES
.PP
-If you don't want to allow users to become root on your system,
+Unless you want to risk getting problems,
.B readcd
-may safely be installed suid root. This allows all users or a group of
-users with no root privileges to use
-.B readcd.
-.B Readcd
-in this case will only allow access to CD-ROM type drives-
-To give all user access to use
-.B readcd,
-enter:
-.PP
- chown root /usr/local/bin/readcd
-.br
- chmod 4711 /usr/local/bin/readcd
-.PP
-To give a restricted group of users access to
+should be run as root. If you don't want to allow users to become root on your system,
.B readcd
-enter:
+may safely be installed suid root.
+For more information see the additional notes of your system/program
+distribution or README.suidroot which is part of the Cdrkit source.
.PP
- chown root /usr/local/bin/readcd
-.br
- chgrp cdburners /usr/local/bin/readcd
-.br
- chmod 4710 /usr/local/bin/readcd
-.PP
-and add a group
-.I cdburners
-on your system.
-.PP
-Never give write permissions for non root users to the
-.I /dev/scg?
-devices unless you would allow anybody to read/write/format
-all your disks.
-.PP
-You should not connect old drives that do not support
-disconnect/reconnect to either the SCSI bus that is connected to the
-CD-Recorder or the source disk.
-.PP
-When using
-.B readcd
-with the
-.B "Linux SCSI generic driver",
-you should note that
-.B readcd
-uses a hack, that tries to emulate the functionality of the scg driver.
-Unfortunately, the sg driver on
-.B Linux
-has several severe bugs:
-.TP
-\(bu
-It cannot see if a SCSI command could not be sent at all.
-.TP
-\(bu
-It cannot get the SCSI status byte.
-.B Readcd
-for that reason cannot report failing SCSI commands in some
-situations.
-.TP
-\(bu
-It cannot get real DMA count of transfer.
-.B Readcd
-cannot tell you if there is an DMA residual count.
-.TP
-\(bu
-It cannot get number of bytes valid in auto sense data.
-.B Readcd
-cannot tell you if device transfers no sense data at all.
-.TP
-\(bu
-It fetches to few data in auto request sense (CCS/SCSI-2/SCSI-3 needs >= 18).
+Documentation of the
+.B wodim
+program contains more technical details which could also apply to
+.B readcd.
.SH DIAGNOSTICS
.PP
@@ -485,6 +427,24 @@
The eight line reports the timeout set up for this command and the time
that the command really needed to complete.
+.SH BUGS
+.PP
+The
+.B readcd
+program described here is the Cdrkit spinof from the original
+.B reacd
+application (see AUTHOR section for details). It may contain bugs not present
+in the original implementation.
+.PP
+It is definitely less portable than the original implementation.
+.PP
+The original implementation (version 2.01.01a08) and newer versions of it are available on
+.I http://cdrecord.berlios.de/.
+See there for more information.
+.PP
+For platform specific bugs, see the corresponding README.platform file in the
+Cdrkit documentation (eg. README.linux).
+
.SH "MAILING LISTS
If you want to actively take part on the development of readcd,
you may join the developer mailing list via this URL:
@@ -530,6 +490,7 @@
submit at bugs.debian.org
.br
.PP
-writing at least a short description into the Subject and "Package: cdrkit" into the first line of the mail body.
+writing at least a short description into the Subject and "Package: cdrkit"
+into the first line of the mail body.
Modified: nonameyet/branches/cleanup/rscsi/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/rscsi/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/rscsi/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
PROJECT (RSCSI)
-INCLUDE_DIRECTORIES(../include ../cdrecord . ${CMAKE_BINARY_DIR} )
+INCLUDE_DIRECTORIES(../include ../cdrecord ${CMAKE_BINARY_DIR} )
INCLUDE(../include/AddScgBits.cmake)
LINK_DIRECTORIES(../libschily ../libscg ../libdeflt)
Modified: nonameyet/branches/cleanup/scgcheck/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/scgcheck/CMakeLists.txt 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/scgcheck/CMakeLists.txt 2006-09-15 14:35:58 UTC (rev 314)
@@ -1,5 +1,5 @@
PROJECT (SCGCHECK)
-INCLUDE_DIRECTORIES(../include ../cdrecord . )
+INCLUDE_DIRECTORIES(../include ../cdrecord )
INCLUDE(../include/AddScgBits.cmake)
Modified: nonameyet/branches/cleanup/scgcheck/scgcheck.1
===================================================================
--- nonameyet/branches/cleanup/scgcheck/scgcheck.1 2006-09-15 12:38:05 UTC (rev 313)
+++ nonameyet/branches/cleanup/scgcheck/scgcheck.1 2006-09-15 14:35:58 UTC (rev 314)
@@ -344,5 +344,24 @@
Germany
.fi
.PP
-It has been modified by the cdrkit maintainers. See
-http://alioth.debian.org/projects/debburn/ for details and support.
+This manpage describes the program implementation of
+.B
+scgcheck
+as shipped by the cdrkit distribution. See
+.B
+http://alioth.debian.org/projects/debburn/
+for details. It is a spinoff from the original program distributed by the cdrtools project. However, the cdrtools developers are no longer involved in the development of this spinoff and therefore shall not be made responsible for any problem caused by it. Do not try to get support for this program by contacting the original authors.
+.PP
+If you have support questions, send them to
+.PP
+.B
+debburn-devel at lists.alioth.debian.org
+.br
+.PP
+If you have definitely found a bug, send a mail to this list or to
+.PP
+.B
+submit at bugs.debian.org
+.br
+.PP
+writing at least a short description into the Subject and "Package: cdrkit" into the first line of the mail body.
More information about the Debburn-changes
mailing list