690cefc
diff -Naupr udftools-1.0.0b3.orig/cdrwtool/cdrwtool.h udftools-1.0.0b3/cdrwtool/cdrwtool.h
690cefc
--- udftools-1.0.0b3.orig/cdrwtool/cdrwtool.h	2002-11-26 08:18:50.000000000 +0100
690cefc
+++ udftools-1.0.0b3/cdrwtool/cdrwtool.h	2006-07-27 14:16:06.000000000 +0200
690cefc
@@ -226,6 +226,7 @@ int read_disc_info(int, disc_info_t *);
690cefc
 int read_track_info(int, track_info_t *, int);
690cefc
 int reserve_track(int, struct cdrw_disc *);
690cefc
 int close_track(int, unsigned int);
690cefc
+int close_session(int, unsigned int);
690cefc
 int read_buffer_cap(int, struct cdrw_disc *);
690cefc
 int set_cd_speed(int, int);
690cefc
 void cdrom_close(int);
690cefc
@@ -236,5 +237,6 @@ int print_disc_track_info(int);
690cefc
 void make_write_page(write_params_t *, struct cdrw_disc *);
690cefc
 void print_params(write_params_t *);
690cefc
 void cdrw_init_disc(struct cdrw_disc *);
690cefc
+int udf_set_version(struct udf_disc *, int);
690cefc
 
690cefc
 #endif /* _CDRWTOOL_H */
690cefc
diff -Naupr udftools-1.0.0b3.orig/include/udf_endian.h udftools-1.0.0b3/include/udf_endian.h
690cefc
--- udftools-1.0.0b3.orig/include/udf_endian.h	2002-11-26 08:18:51.000000000 +0100
690cefc
+++ udftools-1.0.0b3/include/udf_endian.h	2006-07-27 14:09:30.000000000 +0200
690cefc
@@ -23,6 +23,8 @@
690cefc
 #ifndef __UDF_ENDIAN_H
690cefc
 #define __UDF_ENDIAN_H
690cefc
 
690cefc
+#include <string.h>
690cefc
+
690cefc
 #include "bswap.h"
690cefc
 
690cefc
 static inline lb_addr lelb_to_cpu(lb_addr in)
690cefc
diff -Naupr udftools-1.0.0b3.orig/libudffs/unicode.c udftools-1.0.0b3/libudffs/unicode.c
690cefc
--- udftools-1.0.0b3.orig/libudffs/unicode.c	2002-11-26 08:18:51.000000000 +0100
690cefc
+++ udftools-1.0.0b3/libudffs/unicode.c	2006-07-27 14:11:17.000000000 +0200
690cefc
@@ -169,8 +169,6 @@ error_out:
690cefc
 
690cefc
 int decode_string(struct udf_disc *disc, char *in, char *out, int inlen)
690cefc
 {
690cefc
-	int i;
690cefc
-
690cefc
 	if (disc->flags & FLAG_UTF8)
690cefc
 		return decode_utf8(in, out, inlen);
690cefc
 	else if (disc->flags & (FLAG_UNICODE8 | FLAG_UNICODE16))
690cefc
diff -Naupr udftools-1.0.0b3.orig/pktsetup/pktsetup.c udftools-1.0.0b3/pktsetup/pktsetup.c
690cefc
--- udftools-1.0.0b3.orig/pktsetup/pktsetup.c	2002-11-26 08:18:51.000000000 +0100
690cefc
+++ udftools-1.0.0b3/pktsetup/pktsetup.c	2006-07-27 14:18:24.000000000 +0200
690cefc
@@ -23,6 +23,7 @@
690cefc
 #include <getopt.h>
690cefc
 #include <bits/types.h>
690cefc
 #include <sys/types.h>
690cefc
+#include <string.h>
690cefc
 
690cefc
 #include <linux/cdrom.h>
690cefc
 
690cefc
diff -Naupr udftools-1.0.0b3.orig/wrudf/Makefile.am udftools-1.0.0b3/wrudf/Makefile.am
690cefc
--- udftools-1.0.0b3.orig/wrudf/Makefile.am	2002-11-26 08:18:51.000000000 +0100
690cefc
+++ udftools-1.0.0b3/wrudf/Makefile.am	2006-07-27 14:21:24.000000000 +0200
690cefc
@@ -1,5 +1,5 @@
690cefc
 bin_PROGRAMS = wrudf
690cefc
 wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses
690cefc
-wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
690cefc
+wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h ../include/libudffs.h
690cefc
 
690cefc
 AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG
690cefc
diff -Naupr udftools-1.0.0b3.orig/wrudf/Makefile.in udftools-1.0.0b3/wrudf/Makefile.in
690cefc
--- udftools-1.0.0b3.orig/wrudf/Makefile.in	2004-02-23 10:33:48.000000000 +0100
690cefc
+++ udftools-1.0.0b3/wrudf/Makefile.in	2006-07-27 14:21:44.000000000 +0200
690cefc
@@ -85,7 +85,7 @@ am__quote = @am__quote@
690cefc
 install_sh = @install_sh@
690cefc
 bin_PROGRAMS = wrudf
690cefc
 wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses
690cefc
-wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
690cefc
+wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h ../include/libudffs.h
690cefc
 
690cefc
 AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG
690cefc
 subdir = wrudf
690cefc
diff -Naupr udftools-1.0.0b3.orig/wrudf/wrudf.h udftools-1.0.0b3/wrudf/wrudf.h
690cefc
--- udftools-1.0.0b3.orig/wrudf/wrudf.h	2002-11-26 08:18:51.000000000 +0100
690cefc
+++ udftools-1.0.0b3/wrudf/wrudf.h	2006-07-27 14:22:33.000000000 +0200
690cefc
@@ -23,9 +23,11 @@
690cefc
 #include <sys/time.h>
690cefc
 #include <time.h>
690cefc
 #include <stdint.h>
690cefc
+#include <string.h>
690cefc
 
690cefc
 #include "ecma_167.h"
690cefc
 #include "osta_udf.h"
690cefc
+#include "libudffs.h"
690cefc
 
690cefc
 struct generic_desc
690cefc
 {