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

Options for -as mkisofs: -input-charset, -output-charset

Browse Source
This commit is contained in:
Thomas Schmitt 2008-12-14 23:12:05 +00:00
parent 82e5f9179f
commit cf3346463d
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libisoburn/trunk/xorriso/xorriso.1
View File

@ -2257,8 +2257,8 @@ Personality "\fBmkisofs\fR" accepts the options listed with:
.br .br
Among them: -R (always on), -J, -o, -M, -C, -path-list, -m, -exclude-list, Among them: -R (always on), -J, -o, -M, -C, -path-list, -m, -exclude-list,
-f, -print-size, -pad, -no-pad, -V, -v, -version, -graft-points, -f, -print-size, -pad, -no-pad, -V, -v, -version, -graft-points,
-no-emul-boot, -b, -c, -boot-info-table, -boot-load-size, -no-emul-boot, -b, -c, -boot-info-table, -boot-load-size, -input-charset,
pathspecs as with xorriso -add. -output-charset, pathspecs as with xorriso -add.
A lot of options are not supported and lead to failure of the mkisofs A lot of options are not supported and lead to failure of the mkisofs
emulation. Some are ignored, but better do not rely on this tolerance. emulation. Some are ignored, but better do not rely on this tolerance.
.br .br

30
libisoburn/trunk/xorriso/xorriso.c
View File

@ -9364,6 +9364,8 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
" -f, -follow-links Follow symbolic links", " -f, -follow-links Follow symbolic links",
" -graft-points Allow to use graft points for filenames", " -graft-points Allow to use graft points for filenames",
" -help Print option help", " -help Print option help",
" -input-charset CHARSET Local input charset for file name conversion",
" -output-charset CHARSET Output charset for file name conversion",
" -iso-level LEVEL Set ISO9660 conformance level (1..3)", " -iso-level LEVEL Set ISO9660 conformance level (1..3)",
" -J, -joliet Generate Joliet directory information", " -J, -joliet Generate Joliet directory information",
" -o FILE, -output FILE Set output file name", " -o FILE, -output FILE Set output file name",
@ -9511,6 +9513,28 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
ret= Xorriso_option_boot_image(xorriso, "isolinux", sfe, 0); ret= Xorriso_option_boot_image(xorriso, "isolinux", sfe, 0);
if(ret <= 0) if(ret <= 0)
goto problem_handler_1; goto problem_handler_1;
} else if(strcmp(argv[i], "-input-charset")==0) {
if(i+1>=argc)
goto not_enough_args;
i++;
/* -local_charset */
if(strcmp(argv[i], "default") == 0)
ret= Xorriso_option_charset(xorriso, "ISO-8859-1", 4);
else
ret= Xorriso_option_charset(xorriso, argv[i], 4);
if(ret <= 0)
goto problem_handler_1;
} else if(strcmp(argv[i], "-output-charset")==0) {
if(i+1>=argc)
goto not_enough_args;
i++;
/* -charset */
if(strcmp(argv[i], "default") == 0)
ret= Xorriso_option_charset(xorriso, "ISO-8859-1", 3);
else
ret= Xorriso_option_charset(xorriso, argv[i], 3);
if(ret <= 0)
goto problem_handler_1;
} else } else
was_other_option= 1; was_other_option= 1;
@ -9709,6 +9733,12 @@ not_enough_args:;
/* was already handled in first argument scan */; /* was already handled in first argument scan */;
} else if(strcmp(argv[i], "-boot-info-table")==0) { } else if(strcmp(argv[i], "-boot-info-table")==0) {
; ;
} else if(strcmp(argv[i], "-input-charset")==0) {
i++;
/* was already handled in first argument scan */;
} else if(strcmp(argv[i], "-output-charset")==0) {
i++;
/* was already handled in first argument scan */;
} else if(argv[i][0]=='-' && argv[i][1]!=0) { } else if(argv[i][0]=='-' && argv[i][1]!=0) {
sprintf(xorriso->info_text, "-as %s: Unknown option %s", sprintf(xorriso->info_text, "-as %s: Unknown option %s",
whom, Text_shellsafe(argv[i], sfe, 0)); whom, Text_shellsafe(argv[i], sfe, 0));

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.12.14.151550" #define Xorriso_timestamP "2008.12.14.231145"