Adjusted behavior of -as mkisofs option -l

xorriso/emulators.c

@@ -1305,10 +1305,8 @@ illegal_c:;
    } else if(strcmp(argpt, "-J")==0 || strcmp(argpt, "-joliet")==0) {
      xorriso->do_joliet= 1;
    } else if(strcmp(argpt, "-joliet-long")==0) {
-     ret= Xorriso_option_compliance(xorriso,
-                                    "joliet_long_paths:joliet_long_names", 0);
-     if(ret<=0)
-       goto problem_handler_2;
+     Xorriso_relax_compliance(xorriso,
+                              "joliet_long_paths:joliet_long_names", 0);
    } else if(strcmp(argpt, "-graft-points")==0) {
      xorriso->allow_graft_points= 1;
    } else if(strcmp(argpt, "-path-list")==0 ||
@@ -1493,8 +1491,12 @@ not_enough_args:;
              strcmp(argpt, "-omit-version-number") == 0) {
      Xorriso_relax_compliance(xorriso, "omit_version", 0);
    } else if(strcmp(argpt, "-l") == 0 ||
-             strcmp(argpt, "-full-iso9660-filenames") == 0 ||
-             strcmp(argpt, "-max-iso9660-filenames") == 0) {
+             strcmp(argpt, "-full-iso9660-filenames") == 0) {
+     if(xorriso->iso_level <= 2)
+       Xorriso_relax_compliance(xorriso, "iso_9660_level=2", 0);
+     if(iso_level <= 2)
+       iso_level= 2;
+   } else if(strcmp(argpt, "-max-iso9660-filenames") == 0) {
      Xorriso_relax_compliance(xorriso, "long_names", 0);
    } else if(strcmp(argpt, "-d") == 0 ||
              strcmp(argpt, "-omit-period") == 0) {
@@ -1654,10 +1656,7 @@ rr_reloc_dir:;
      ret= Xorriso_option_rr_reloc_dir(xorriso, rr_reloc_dir_pt, 0);
      if(ret <= 0)
        goto problem_handler_2;
-     ret= Xorriso_option_compliance(xorriso, "deep_paths_off:long_paths_off",
-                                    0);
-     if(ret <= 0)
-       goto problem_handler_2;
+     Xorriso_relax_compliance(xorriso, "deep_paths_off:long_paths_off", 0);
 
    } else if(argpt[0]=='-' && argpt[1]!=0) {
      hargv[0]= argpt;
@@ -1832,7 +1831,7 @@ problem_handler_2:;
  }
 
  if(option_d)
-   Xorriso_option_compliance(xorriso, "deep_paths:long_paths", 0);
+   Xorriso_relax_compliance(xorriso, "deep_paths:long_paths", 0);
 
  /* After all pathspecs are added: perform boot related options */
  for(j= 0; j < delay_opt_count; j++) {

xorriso/xorriso_timestamp.h

-#define Xorriso_timestamP "2012.03.14.152414"
+#define Xorriso_timestamP "2012.03.14.195147"

xorriso/xorrisofs.1

@@ -452,15 +452,15 @@ Alias of \-d.
 .TP
 \fB\-l\fR
 .br
-Allow up to 37 characters in ISO file names.
-.br
-This violates ISO 9660 specs.
+Allow up to 31 characters in ISO file names.
 .TP
 \fB\-full-iso9660-filenames\fR
 Alias of \-l.
 .TP
 \fB\-max-iso9660-filenames\fR
-Alias of \-l.
+Allow up to 37 characters in ISO file names.
+.br
+This violates ISO 9660 specs.
 .TP
 \fB\-N\fR
 .br

xorriso/xorrisofs.texi

@@ -664,20 +664,21 @@ This violates ISO 9660 specs.
 Alias of -d.
 @c man .TP
 @item -l
-@kindex -l   allow 37 characters in ISO file names
-@cindex ISO file names, allow 37 characters, -l, -full-iso9660-filenames, -max-iso9660-filenames
+@kindex -l   allow 31 characters in ISO file names
+@cindex ISO file names, allow 31 characters, -l, -full-iso9660-filenames
 @*
-Allow up to 37 characters in ISO file names.
-@*
-This violates ISO 9660 specs.
+Allow up to 31 characters in ISO file names.
 @c man .TP
 @item -full-iso9660-filenames
-@kindex -full-iso9660-filenames   allow 37 characters in ISO file names
+@kindex -full-iso9660-filenames   allow 31 characters in ISO file names
 Alias of -l.
 @c man .TP
 @item -max-iso9660-filenames
 @kindex -max-iso9660-filenames   allow 37 characters in ISO file names
-Alias of -l.
+@cindex ISO file names, allow 37 characters, -max-iso9660-filenames
+Allow up to 37 characters in ISO file names.
+@*
+This violates ISO 9660 specs.
 @c man .TP
 @item -N
 @kindex -N   omit version number in ISO file names