diff --git a/xorriso/emulators.c b/xorriso/emulators.c index d71f8067..fc1d6cb5 100644 --- a/xorriso/emulators.c +++ b/xorriso/emulators.c @@ -509,7 +509,7 @@ int Xorriso_genisofs_ignore(struct XorrisO *xorriso, char *whom, "" }; static char ignored_arg1_options[][41]= { - "-biblio", "-check-session", "-hide-hfs", "-hide-hfs-list", "-p", "-root", + "-check-session", "-hide-hfs", "-hide-hfs-list", "-p", "-preparer", "-root", "-old-root", "-table-name", "-volset-seqno", "-volset-size", "" }; @@ -608,6 +608,9 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag) " -publisher PUB Set Volume publisher", " -A ID, -appid ID Set Application ID", " -sysid ID Set System ID", +" -abstract FILE Set Abstract filename", +" -biblio FILE Set Bibliographic filename", +" -copyright FILE Set Copyright filename", " -b FILE, -eltorito-boot FILE", " Set El Torito boot image name", " -eltorito-alt-boot Start specifying alternative El Torito boot parameters", @@ -1033,39 +1036,35 @@ not_enough_args:; /* was already handled in first argument scan */; } else if(strcmp(argv[i], "-help")==0) { /* was already handled in first argument scan */; - } else if(strcmp(argv[i], "-V")==0 || strcmp(argv[i], "-volid")==0) { + } else if(strcmp(argv[i], "-V")==0 || strcmp(argv[i], "-volid")==0 || + strcmp(argv[i], "-volset")==0 || + strcmp(argv[i], "-P")==0 || strcmp(argv[i], "-publisher")==0 || + strcmp(argv[i], "-A")==0 || strcmp(argv[i], "-appid")==0 || + strcmp(argv[i], "-sysid")==0 || + strcmp(argv[i], "-biblio")==0 || + strcmp(argv[i], "-copyright")==0 || + strcmp(argv[i], "-abstract")==0 ) { if(i+1>=argc) goto not_enough_args; i++; - ret= Xorriso_option_volid(xorriso, argv[i], 0); - if(ret<=0) - goto problem_handler_2; - } else if(strcmp(argv[i], "-volset")==0) { - if(i+1>=argc) - goto not_enough_args; - i++; - ret= Xorriso_option_volset_id(xorriso, argv[i], 0); - if(ret<=0) - goto problem_handler_2; - } else if(strcmp(argv[i], "-P")==0 || strcmp(argv[i], "-publisher")==0) { - if(i+1>=argc) - goto not_enough_args; - i++; - ret= Xorriso_option_publisher(xorriso, argv[i], 0); - if(ret<=0) - goto problem_handler_2; - } else if(strcmp(argv[i], "-A")==0 || strcmp(argv[i], "-appid")==0) { - if(i+1>=argc) - goto not_enough_args; - i++; - ret= Xorriso_option_application_id(xorriso, argv[i], 0); - if(ret<=0) - goto problem_handler_2; - } else if(strcmp(argv[i], "-sysid")==0) { - if(i+1>=argc) - goto not_enough_args; - i++; - ret= Xorriso_option_system_id(xorriso, argv[i], 0); + ret= 1; + if(strcmp(argv[i - 1], "-V")==0 || strcmp(argv[i - 1], "-volid")==0) + ret= Xorriso_option_volid(xorriso, argv[i], 0); + else if(strcmp(argv[i - 1], "-volset")==0) + ret= Xorriso_option_volset_id(xorriso, argv[i], 0); + else if(strcmp(argv[i - 1], "-P")==0 || + strcmp(argv[i - 1], "-publisher")==0) + ret= Xorriso_option_publisher(xorriso, argv[i], 0); + else if(strcmp(argv[i - 1], "-A")==0 || strcmp(argv[i - 1], "-appid")==0) + ret= Xorriso_option_application_id(xorriso, argv[i], 0); + else if(strcmp(argv[i - 1], "-sysid")==0) + ret= Xorriso_option_system_id(xorriso, argv[i], 0); + else if(strcmp(argv[i - 1], "-biblio")==0) + ret= Xorriso_option_biblio_file(xorriso, argv[i], 0); + else if(strcmp(argv[i - 1], "-copyright")==0) + ret= Xorriso_option_copyright_file(xorriso, argv[i], 0); + else if(strcmp(argv[i - 1], "-abstract")==0) + ret= Xorriso_option_abstract_file(xorriso, argv[i], 0); if(ret<=0) goto problem_handler_2; } else if(strcmp(argv[i], "-m")==0 || strcmp(argv[i], "-exclude")==0 || diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index cfbd6a59..46f32c67 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.06.26.113947" +#define Xorriso_timestamP "2010.06.26.114315"