libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Warn of volid length for Joliet only if more than 16 characters (was: 16 bytes)

Browse Source
This commit is contained in:
Thomas Schmitt
2021-08-28 18:12:15 +02:00
parent 5011a5f7b0
commit 7dc45e3311
4 changed files with 65 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xorriso/opts_p_z.c
View File

@ -2083,6 +2083,8 @@ int Xorriso_option_version(struct XorrisO *xorriso, int flag)
int Xorriso_option_volid(struct XorrisO *xorriso, char *volid, int flag)
{
int warn_shell= 0, warn_ecma= 0, i, ret;
char *result= NULL;
size_t result_len= 0;
static char shell_chars[]= {
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-+=:.,~@"};
static char ecma_chars[]= {"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"};
@ -2104,9 +2106,20 @@ int Xorriso_option_volid(struct XorrisO *xorriso, char *volid, int flag)
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
}
if(xorriso->do_joliet && strlen(volid)>16 && !(flag & 1)) {
sprintf(xorriso->info_text,
"-volid text is too long for Joliet (%d > 16)",(int) strlen(volid));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
ret= Xorriso_conv_name_chars(xorriso, volid, &result, &result_len, 2, 0);
if(result != NULL)
free(result); /* just want the result_len */
xorriso->info_text[0]= 0;
if(ret <= 0) {
sprintf(xorriso->info_text,
"Cannot determine length of -volid text in Joliet character set");
} else if(result_len > 32) {
sprintf(xorriso->info_text,
"-volid text is too long for Joliet (%d > 16)",
(int) (result_len + 1) / 2);
}
if(xorriso->info_text[0])
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
}
if(warn_ecma && !(flag & 1)) {
sprintf(xorriso->info_text,