diff --git a/Makefile.am b/Makefile.am index f31998a8..a8da5c24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -222,11 +222,13 @@ nodist_pkgconfig_DATA = \ man_MANS = \ xorriso/xorriso.1 \ - xorriso/xorrisofs.1 + xorriso/xorrisofs.1 \ + xorriso/xorrecord.1 info_TEXINFOS = \ xorriso/xorriso.texi \ - xorriso/xorrisofs.texi + xorriso/xorrisofs.texi \ + xorriso/xorrecord.texi EXTRA_DIST = \ libisoburn-1.pc.in \ diff --git a/README b/README index edee8457..16709d6d 100644 --- a/README +++ b/README @@ -89,6 +89,7 @@ xorriso binary depending on libburn.so, libisofs.so, libisoburn.so. After installation documentation is available via man xorriso man xorrisofs + man xorrecord Several alias links point to the xorriso binary: xorrisofs starts xorriso with -as mkisofs emulation already enabled diff --git a/xorriso/README_gnu_xorriso b/xorriso/README_gnu_xorriso index 5d3f3c9b..fd09a1fc 100644 --- a/xorriso/README_gnu_xorriso +++ b/xorriso/README_gnu_xorriso @@ -73,14 +73,14 @@ or you may execute as superuser: For general concepts, options and usage examples see info xorriso info xorrisofs + info xorrecord man 1 xorriso man 1 xorrisofs + man 1 xorrecord -You may get a first glimpse by +You may get a first glimpse by e.g. info ./xorriso/xorriso.info - info ./xorriso/xorrisofs.info man ./xorriso/xorriso.1 - man ./xorriso/xorrisofs.1 The installation creates several alias links pointing to the xorriso binary: xorrisofs starts xorriso with -as mkisofs emulation already enabled diff --git a/xorriso/convert_man_to_html.sh b/xorriso/convert_man_to_html.sh index 55b40740..9d3c9dcf 100755 --- a/xorriso/convert_man_to_html.sh +++ b/xorriso/convert_man_to_html.sh @@ -1,13 +1,14 @@ #!/bin/sh # -# convert_man_to_html.sh - ts B10309 +# convert_man_to_html.sh - ts B11024 # -# Generates a HTML version of man pages xorriso.1 , xorrisofs.1 +# Generates a HTML version of man pages xorriso.1 , xorrisofs.1 , xorrecord.1 # -# To be executed in the libisoburn toplevel directory (eg. ./libisoburn-1.0.4) +# To be executed in the libisoburn toplevel directory (eg. ./libisoburn-1.1.8) # xorriso/man_xorriso_to_html.sh xorriso/man_xorrisofs_to_html.sh +xorriso/man_xorrecord_to_html.sh diff --git a/xorriso/emulators.c b/xorriso/emulators.c index 79fc2a9b..a4856d9e 100644 --- a/xorriso/emulators.c +++ b/xorriso/emulators.c @@ -55,8 +55,9 @@ int Xorriso_cdrskin_help(struct XorrisO *xorriso, int flag) "\t--devices\tprint list of available MMC drives and exit emulation", "\tdev=target\tpseudo-SCSI target to use as CD-Recorder", "\t-v\t\tincrement verbose level by one", +"\t-V\t\tincrement SCSI command transport verbose level by one", "\t-checkdrive\tcheck if a driver for the drive is present", -"\t-inq\t\tdo an inquiry for the drive and exit emulation", +"\t-inq\t\tdo an inquiry for the drive", "\tspeed=#\t\tset speed of drive", "\tblank=type\tblank a CD-RW disc (see blank=help)", "\tfs=#\t\tSet fifo size to # (0 to disable, default is 4 MB)", diff --git a/xorriso/make_docs.sh b/xorriso/make_docs.sh index 742db9d7..0a97ee90 100755 --- a/xorriso/make_docs.sh +++ b/xorriso/make_docs.sh @@ -2,12 +2,14 @@ # # Produce man page xorriso/xorriso.1 and info file xorriso/xorriso.info # from base file xorriso/xorriso.texi. -# Same for xorriso/xorrisofs.texi. +# Same for xorriso/xorrisofs.texi and xorriso/xorrecord.texi. ( cd xorriso ; makeinfo ./xorriso.texi ) ( cd xorriso ; makeinfo ./xorrisofs.texi ) +( cd xorriso ; makeinfo ./xorrecord.texi ) xorriso/make_xorriso_1 -auto xorriso/make_xorriso_1 -auto -xorrisofs +xorriso/make_xorriso_1 -auto -xorrecord diff --git a/xorriso/make_xorriso_1.c b/xorriso/make_xorriso_1.c index 2653eed4..788fd6ab 100644 --- a/xorriso/make_xorriso_1.c +++ b/xorriso/make_xorriso_1.c @@ -473,13 +473,16 @@ usage:; exit(2); } for(i= 1; i < argc; i++) { - if(strcmp(argv[i], "-filter") == 0) + if(strcmp(argv[i], "-filter") == 0) { as_filter= 1; - else if(strcmp(argv[i], "-auto") == 0) + } else if(strcmp(argv[i], "-auto") == 0) { as_filter= 0; - else if(strcmp(argv[i], "-xorrisofs") == 0) { + } else if(strcmp(argv[i], "-xorrisofs") == 0) { strcpy(name_in, "xorriso/xorrisofs.texi"); strcpy(name_out, "xorriso/xorrisofs.1"); + } else if(strcmp(argv[i], "-xorrecord") == 0) { + strcpy(name_in, "xorriso/xorrecord.texi"); + strcpy(name_out, "xorriso/xorrecord.1"); } else { fprintf(stderr, "%s : unknown option %s\n", argv[0], argv[i]); goto usage; diff --git a/xorriso/make_xorriso_standalone.sh b/xorriso/make_xorriso_standalone.sh index f9f7f559..105baf1b 100755 --- a/xorriso/make_xorriso_standalone.sh +++ b/xorriso/make_xorriso_standalone.sh @@ -194,11 +194,15 @@ copy_files \ xorriso/xorriso.info \ xorriso/xorrisofs.texi \ xorriso/xorrisofs.info \ + xorriso/xorrecord.texi \ + xorriso/xorrecord.info \ xorriso/make_xorriso_1.c \ xorriso/xorriso.1 \ xorriso/xorrisofs.1 \ + xorriso/xorrecord.1 \ xorriso/man_1_xorriso.html \ xorriso/man_1_xorrisofs.html \ + xorriso/man_1_xorrecord.html \ "$lone_dir"/xorriso copy_files COPYRIGHT "$lone_dir"/xorriso diff --git a/xorriso/man_xorrecord_to_html.sh b/xorriso/man_xorrecord_to_html.sh new file mode 100755 index 00000000..8b85b8bd --- /dev/null +++ b/xorriso/man_xorrecord_to_html.sh @@ -0,0 +1,73 @@ +#!/bin/sh + +# +# man_xorrecord_to_html.sh - ts A80118 , B10309 +# +# Generates a HTML version of man page xorrecord.1 +# +# To be executed in the libisoburn toplevel directory (eg. ./libisoburn-0.1.0) +# + +# set -x + +man_dir=$(pwd)"/xorriso" +export MANPATH="$man_dir" +manpage="xorrecord" +raw_html=$(pwd)/"xorriso/raw_man_1_xorrecord.html" +htmlpage=$(pwd)/"xorriso/man_1_xorrecord.html" + +if test -r "$man_dir"/"$manpage".1 +then + dummy=dummy +else + echo "Cannot find readable man page source $1" >&2 + exit 1 +fi + +if test -e "$man_dir"/man1 +then + dummy=dummy +else + ln -s . "$man_dir"/man1 +fi + +if test "$1" = "-work_as_filter" +then + +# set -x + + sed \ + -e 's///' \ + -e 's///' \ + -e 's/