Adapted version checking to new library situation

This commit is contained in:
2010-05-21 13:37:25 +00:00
parent 5a30faa957
commit 701608b92d
6 changed files with 219 additions and 78 deletions

View File

@ -1513,13 +1513,14 @@ int Xorriso_option_use_readline(struct XorrisO *xorriso, char *mode, int flag)
/* Option -version */
int Xorriso_option_version(struct XorrisO *xorriso, int flag)
{
sprintf(xorriso->result_line, "%sxorriso %d.%d.%d%s\n",
#ifdef Xorriso_GNU_xorrisO
sprintf(xorriso->result_line, "GNU xorriso %s%s\n",
Xorriso_program_versioN, Xorriso_program_patch_leveL);
"GNU ",
#else
sprintf(xorriso->result_line, "xorriso %s%s\n",
Xorriso_program_versioN, Xorriso_program_patch_leveL);
"",
#endif /* ! Xorriso_GNU_xorrisO */
Xorriso_header_version_majoR, Xorriso_header_version_minoR,
Xorriso_header_version_micrO, Xorriso_program_patch_leveL);
Xorriso_result(xorriso, 0);
sprintf(xorriso->result_line,
"ISO 9660 Rock Ridge filesystem manipulator and CD/DVD/BD burn program\n");
@ -1527,8 +1528,10 @@ int Xorriso_option_version(struct XorrisO *xorriso, int flag)
"Copyright (C) 2010, Thomas Schmitt <scdbackup@gmx.net>, libburnia project.\n");
Xorriso_result(xorriso, 0);
sprintf(xorriso->result_line,
"xorriso version : %s%s\n",
Xorriso_program_versioN, Xorriso_program_patch_leveL);
"xorriso version : %d.%d.%d%s\n",
Xorriso_header_version_majoR, Xorriso_header_version_minoR,
Xorriso_header_version_micrO, Xorriso_program_patch_leveL);
Xorriso_result(xorriso, 0);
sprintf(xorriso->result_line+strlen(xorriso->result_line),
"Version timestamp : %s\n",Xorriso_timestamP);
sprintf(xorriso->result_line+strlen(xorriso->result_line),