From cd3be2c9a241254666cf9481b56f204a685b6a07 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Mon, 11 Feb 2008 15:07:41 +0000
Subject: [PATCH] Clarifications about -volid rules

---
 libisoburn/trunk/xorriso/xorriso.1           | 14 ++++++++++----
 libisoburn/trunk/xorriso/xorriso.c           |  4 ++++
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1
index ef0d6ecd..ade75d41 100644
--- a/libisoburn/trunk/xorriso/xorriso.1
+++ b/libisoburn/trunk/xorriso/xorriso.1
@@ -887,9 +887,15 @@ Rock Ridge info will be generated by the program unconditionally.
 If enabled by "on", generate Joliet info additional to Rock Ridge info.
 .TP
 \fB\-volid\fR text
-Specifies the volume ID. The text may be up to 32 characters long.
-Be aware that it might get used automatically as name of the mount point
-when the media is inserted into a playful computer system.
+Specifies the volume ID. xorriso accepts any text up to 32 characters,
+but according to rarely obeyed specs stricter rules apply:
+.br
+ECMA 119 demands character set [A-Z0-9_]. Like: "IMAGE_23"
+.br
+Joliet allows 16 UCS-2 characters. Like: "Windows name"
+.br
+Be aware that the volume id might get used automatically as name of the
+mount point when the media is inserted into a playful computer system.
 .br
 If an ISO image gets loaded while the volume ID is set to default "ISOIMAGE"
 or to "", then the volume ID of the loaded image will become the effective
@@ -996,7 +1002,7 @@ source file access problems have been ignored at image generation time.
 .br
 "HINT" A proposal to the user how to achieve better results.
 .br
-"NOTE" A harmless information about noteworthy cuircumstances.
+"NOTE" A harmless information about noteworthy circumstances.
 .br
 "UPDATE" A pacifier message during long running operations.
 .br
diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c
index 48af892b..1447cde9 100644
--- a/libisoburn/trunk/xorriso/xorriso.c
+++ b/libisoburn/trunk/xorriso/xorriso.c
@@ -8431,6 +8431,10 @@ int Xorriso_option_volid(struct XorrisO *xorriso, char *volid, int flag)
            "-volid text problematic as automatic mount point name");
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
  }
+ if(xorriso->do_joliet && strlen(volid)>16) {
+   sprintf(xorriso->info_text, "-volid text is too long for Joliet");
+   Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
+ }
  if(warn_ecma) {
    sprintf(xorriso->info_text,
            "-volid text does not comply to ISO 9660 / ECMA 119 rules");
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 57f70b0a..075774ac 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.02.11.150123"
+#define Xorriso_timestamP "2008.02.11.150700"