diff --git a/AUTHORS b/AUTHORS index 30c77c04..ffba872e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,8 +1,11 @@ libudffs Ben Fennema + Pali Rohár mkudffs Ben Fennema + Pali Rohár + Steve Kenton cdrwtool Jens Axboe @@ -14,3 +17,5 @@ pktsetup doc Paul Thompson Ben Fennema + Pali Rohár + Steve Kenton diff --git a/cdrwtool/options.c b/cdrwtool/options.c index 90a39f18..13f0004f 100644 --- a/cdrwtool/options.c +++ b/cdrwtool/options.c @@ -55,11 +55,12 @@ void usage(void) { int i; + printf("cdrwtool from " PACKAGE_NAME " " PACKAGE_VERSION "\nUsage:\n\tcdrwtool [options]\nOptions:\n"); for (i = 0; long_options[i].name != NULL; i++) if (long_options[i].val >= 0xFF) - printf("\t--%s\n", long_options[i].name); + printf("\t--%s\t%s\n", long_options[i].name, long_options[i].name); else - printf("\t%c\t%s\n", long_options[i].val, long_options[i].name); + printf("\t-%c\t%s\n", long_options[i].val, long_options[i].name); exit(1); } diff --git a/configure.ac b/configure.ac index 8c694630..5b7c1595 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(mkudffs, 1.0.0b3) +AC_INIT(udftools, 1.1, , , [https://github.com/pali/udftools/]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(include/config.h:include/config.in) AM_INIT_AUTOMAKE diff --git a/doc/HOWTO.udf b/doc/HOWTO.udf index 4d1ae586..5c652dc2 100644 --- a/doc/HOWTO.udf +++ b/doc/HOWTO.udf @@ -16,13 +16,9 @@ filesystem will not increase if you delete files. In order to do packet writing under Linux, your kernel needs both support for UDF (Universal Disc Format) filesystems and for packet writing. This is the case for kernels later than about 2.6.10. -For earlier kernels, you may have to apply patches from Peter -Osterlund . That site -also has patches for udftools to make them work with recent kernels - -they have been applied to this package. This package tries to support -both old-style packet writing (kernel <2.6.8), and the newer variant -(>=2.6.10), with and without udev. Use a recent 2.6 kernel for optimum -results! +This package tries to support both old-style packet writing +(kernel <2.6.8), and the newer variant (>=2.6.10), with and without +udev. Use a recent 2.6 kernel for optimum results! Formatting and using a UDF DVD-RW or CD-RW for packet writing diff --git a/doc/cdrwtool.1 b/doc/cdrwtool.1 index f5d8c0d6..f1d68f9d 100644 --- a/doc/cdrwtool.1 +++ b/doc/cdrwtool.1 @@ -24,7 +24,7 @@ .\" udf-0.9.5 source .\" .\" -.TH CDRWTOOL 1 "2002-02-09" "udftools-1.0.0b2" "Commands" +.TH CDRWTOOL 1 "udftools" "Commands" .SH NAME cdrwtool \- perform various actions on a CD-R, CD-RW, and DVD-R @@ -145,7 +145,7 @@ Some additions by Richard Atterer .SH AVAILABILITY .B cdrwtool is part of the udftools package and is available from -http://sourceforge.net/projects/linux-udf/. +https://github.com/pali/udftools/. .SH "SEE ALSO" .BR pktsetup (8) diff --git a/doc/mkudffs.8 b/doc/mkudffs.8 index 92a5de59..0c3533f9 100644 --- a/doc/mkudffs.8 +++ b/doc/mkudffs.8 @@ -24,7 +24,7 @@ .\" References consulted: .\" udftools src .\" -.TH MKUDFFS 8 "2002-02-09" "udftools-1.0.0b2" "System Management Commands" +.TH MKUDFFS 8 "udftools" "System Management Commands" .SH NAME mkudffs \- create an UDF filesystem @@ -224,9 +224,10 @@ returns 0 if successful, non-zero if there are problems. .SH AUTHOR .nf Ben Fennema +Pali Rohár .fi .SH AVAILABILITY .B mkudffs is part of the udftools package and is available from -http://sourceforge.net/projects/linux-udf/. +https://github.com/pali/udftools/. diff --git a/doc/pktsetup.8 b/doc/pktsetup.8 index c916ab9d..0f4be439 100644 --- a/doc/pktsetup.8 +++ b/doc/pktsetup.8 @@ -24,7 +24,7 @@ .\" losetup.8 .\" udftools src .\" -.TH PKTSETUP 8 "2002-02-09" "udftools-1.0.0b2" "System Management Commands" +.TH PKTSETUP 8 "udftools" "System Management Commands" .SH NAME pktsetup \- set up and tear down packet device associations @@ -95,7 +95,7 @@ Some additions by Richard Atterer .SH AVAILABILITY .B pktsetup is part of the udftools package and is available from -http://sourceforge.net/projects/linux-udf/ +https://github.com/pali/udftools/. .SH "SEE ALSO" .BR cdrwtool (1) diff --git a/doc/wrudf.1 b/doc/wrudf.1 index cab2d53c..6de99ca2 100644 --- a/doc/wrudf.1 +++ b/doc/wrudf.1 @@ -1,5 +1,5 @@ .\" Text automatically generated by txt2man -.TH wrudf 1 "16 April 2013" "udftools" "Linux Reference Manual" +.TH wrudf 1 "udftools" "Linux Reference Manual" .SH NAME \fBwrudf \fP- Maintain an UDF filesystem. .SH SYNOPSIS @@ -55,6 +55,6 @@ quit \fBwrudf\fP exit quit \fBwrudf\fP .SH AVAILABILITY -\fBwrudf\fP is part of the udftools package and is available from http://linux-udf.sourceforge.net. +\fBwrudf\fP is part of the udftools package and is available from https://github.com/pali/udftools/. .SH SEE ALSO \fBcdrwtool\fP(1), \fBmkudffs\fP(8), \fBpktsetup\fP(8) diff --git a/libudffs/crc.c b/libudffs/crc.c index 9e9ae980..6b148f72 100644 --- a/libudffs/crc.c +++ b/libudffs/crc.c @@ -14,11 +14,6 @@ * * AT&T gives permission for the free use of the CRC source code. * - * CONTACTS - * E-mail regarding any portion of the Linux UDF file system should be - * directed to the development team mailing list (run by majordomo): - * linux_udf@hootie.lvld.hp.com - * * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from: diff --git a/mkudffs/defaults.c b/mkudffs/defaults.c index b124484c..89941837 100644 --- a/mkudffs/defaults.c +++ b/mkudffs/defaults.c @@ -176,8 +176,8 @@ struct impUseVolDescImpUse default_iuvdiu = }, logicalVolIdent : "\x08" "LinuxUDF", LVInfo1 : "\x08" "Linux mkudffs " PACKAGE_VERSION, - LVInfo2 : "\x08" "Linux UDF " UDFFS_VERSION " (" UDFFS_DATE ")", - LVInfo3 : "\x08" EMAIL_STRING, + LVInfo2 : "\x08" "Linux udftools " PACKAGE_VERSION, + LVInfo3 : "\x08" PACKAGE_URL, impIdent : { ident : UDF_ID_DEVELOPER, diff --git a/mkudffs/mkudffs.h b/mkudffs/mkudffs.h index fc569ce3..043e1624 100644 --- a/mkudffs/mkudffs.h +++ b/mkudffs/mkudffs.h @@ -31,11 +31,6 @@ #define CS0 0x00000001 #define UDF_ID_APPLICATION "*Linux mkudffs" -#define EMAIL_STRING "" - -#define UDFFS_DATE "2004/02/26" -#define UDFFS_VERSION "1.0.0-cvs" - #define DEFAULT_HD 0 #define DEFAULT_DVD 0 #define DEFAULT_DVDRAM 0 diff --git a/mkudffs/options.c b/mkudffs/options.c index d28bf462..60e83692 100644 --- a/mkudffs/options.c +++ b/mkudffs/options.c @@ -66,10 +66,10 @@ struct option long_options[] = { void usage(void) { - fprintf(stderr, "mkudffs %s for UDF FS %s, %s\n" + fprintf(stderr, "mkudffs from " PACKAGE_NAME " " PACKAGE_VERSION "\n" "Usage:\n" "\tmkudffs [options] device [blocks-count]\n" - "Switches:\n" + "Options:\n" "\t--help, -h\n" "\t--label=, -l\n" "\t--uuid=, -u\n" @@ -93,8 +93,7 @@ void usage(void) "\t--u16\n" "\t--utf8\n" "\t--bridge\n" - "\t--closed\n", - PACKAGE_VERSION, UDFFS_VERSION, UDFFS_DATE + "\t--closed\n" ); exit(1); } diff --git a/pktsetup/pktsetup.c b/pktsetup/pktsetup.c index 94745486..eec86be9 100644 --- a/pktsetup/pktsetup.c +++ b/pktsetup/pktsetup.c @@ -31,6 +31,8 @@ #include +#include "config.h" + /* * if we don't have one, we probably have neither */ @@ -125,6 +127,8 @@ static int setup_dev(char *pkt_device, char *device, int rem) static int usage(void) { + printf("pktsetup from " PACKAGE_NAME " " PACKAGE_VERSION "\n"); + printf("Set up and tear down packet device associations\n"); printf("For pktcdvd < 0.2.0:\n"); printf(" pktsetup /dev/pktcdvd0 /dev/cdrom setup device\n"); printf(" pktsetup -d /dev/pktcdvd0 tear down device\n"); diff --git a/wrudf/ide-pc.h b/wrudf/ide-pc.h index 182db234..727a7521 100644 --- a/wrudf/ide-pc.h +++ b/wrudf/ide-pc.h @@ -3,11 +3,6 @@ * PURPOSE * Header file for programs using ide-pc.c defined routines * - * CONTACTS - * E-mail regarding any portion of the Linux UDF file system should be - * directed to the development team mailing list (run by majordomo): - * linux_udf@hpesjro.fc.hp.com - * * COPYRIGHT * This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from: diff --git a/wrudf/wrudf.c b/wrudf/wrudf.c index 8b507f66..4f1c4ab3 100644 --- a/wrudf/wrudf.c +++ b/wrudf/wrudf.c @@ -12,8 +12,6 @@ #include "wrudf.h" -#define WRUDF_VERSION "0.0.5" - char *devicename; /* "/dev/cdrom" or disk image filename */ int device; /* the file descriptor */ int devicetype; @@ -47,7 +45,7 @@ uint32_t options; Directory *rootDir, *curDir; timestamp timeStamp; -regid entityWRUDF = { 0, "-wrudf (" WRUDF_VERSION ")", "\x04\x05"}; +regid entityWRUDF = { 0, "-wrudf (" PACKAGE_VERSION ")", "\x04\x05"}; extent_ad extentMainVolDescSeq; extent_ad extentRsrvVolDescSeq; @@ -632,7 +630,7 @@ main(int argc, char** argv) char prompt[256]; Directory *d; - printf("wrudf " WRUDF_VERSION "\n"); + printf("wrudf from " PACKAGE_NAME " " PACKAGE_VERSION "\n"); devicename= "/dev/cdrom"; if( argc > 2 || (argc == 2 && (!strcmp(argv[1], "-h") || !strcmp(argv[1], "-help") || !strcmp(argv[1], "--help"))) )