New -as mkisofs options -abstract, -biblio, -copyright

This commit is contained in:
Thomas Schmitt 2010-06-26 11:43:56 +00:00
parent e57f8bf8f3
commit 6f371778c6
2 changed files with 31 additions and 32 deletions

View File

@ -509,7 +509,7 @@ int Xorriso_genisofs_ignore(struct XorrisO *xorriso, char *whom,
"" ""
}; };
static char ignored_arg1_options[][41]= { 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", "-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", " -publisher PUB Set Volume publisher",
" -A ID, -appid ID Set Application ID", " -A ID, -appid ID Set Application ID",
" -sysid ID Set System 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", " -b FILE, -eltorito-boot FILE",
" Set El Torito boot image name", " Set El Torito boot image name",
" -eltorito-alt-boot Start specifying alternative El Torito boot parameters", " -eltorito-alt-boot Start specifying alternative El Torito boot parameters",
@ -1033,39 +1036,35 @@ not_enough_args:;
/* was already handled in first argument scan */; /* was already handled in first argument scan */;
} else if(strcmp(argv[i], "-help")==0) { } else if(strcmp(argv[i], "-help")==0) {
/* was already handled in first argument scan */; /* 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) if(i+1>=argc)
goto not_enough_args; goto not_enough_args;
i++; i++;
ret= Xorriso_option_volid(xorriso, argv[i], 0); ret= 1;
if(ret<=0) if(strcmp(argv[i - 1], "-V")==0 || strcmp(argv[i - 1], "-volid")==0)
goto problem_handler_2; ret= Xorriso_option_volid(xorriso, argv[i], 0);
} else if(strcmp(argv[i], "-volset")==0) { else if(strcmp(argv[i - 1], "-volset")==0)
if(i+1>=argc) ret= Xorriso_option_volset_id(xorriso, argv[i], 0);
goto not_enough_args; else if(strcmp(argv[i - 1], "-P")==0 ||
i++; strcmp(argv[i - 1], "-publisher")==0)
ret= Xorriso_option_volset_id(xorriso, argv[i], 0); ret= Xorriso_option_publisher(xorriso, argv[i], 0);
if(ret<=0) else if(strcmp(argv[i - 1], "-A")==0 || strcmp(argv[i - 1], "-appid")==0)
goto problem_handler_2; ret= Xorriso_option_application_id(xorriso, argv[i], 0);
} else if(strcmp(argv[i], "-P")==0 || strcmp(argv[i], "-publisher")==0) { else if(strcmp(argv[i - 1], "-sysid")==0)
if(i+1>=argc) ret= Xorriso_option_system_id(xorriso, argv[i], 0);
goto not_enough_args; else if(strcmp(argv[i - 1], "-biblio")==0)
i++; ret= Xorriso_option_biblio_file(xorriso, argv[i], 0);
ret= Xorriso_option_publisher(xorriso, argv[i], 0); else if(strcmp(argv[i - 1], "-copyright")==0)
if(ret<=0) ret= Xorriso_option_copyright_file(xorriso, argv[i], 0);
goto problem_handler_2; else if(strcmp(argv[i - 1], "-abstract")==0)
} else if(strcmp(argv[i], "-A")==0 || strcmp(argv[i], "-appid")==0) { ret= Xorriso_option_abstract_file(xorriso, argv[i], 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);
if(ret<=0) if(ret<=0)
goto problem_handler_2; goto problem_handler_2;
} else if(strcmp(argv[i], "-m")==0 || strcmp(argv[i], "-exclude")==0 || } else if(strcmp(argv[i], "-m")==0 || strcmp(argv[i], "-exclude")==0 ||

View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.06.26.113947" #define Xorriso_timestamP "2010.06.26.114315"