Removed some bugs and made adaptions to nglibisofs

This commit is contained in:
2008-01-14 19:03:17 +00:00
parent d78ffac9b2
commit f172682369
4 changed files with 17 additions and 11 deletions

View File

@@ -4992,7 +4992,7 @@ int Xorriso_convert_modstring(struct XorrisO *xorriso, char *cmd, char *mode,
for(mpt= mode; mpt!=NULL; mpt= strchr(mpt, ',')) {
if(*mpt==',')
mpt++;
if(strlen(mpt)<3)
if(strlen(mpt)<2)
goto unrecognizable;
who_val= 0;
for(vpt= mpt; *vpt!='+' && *vpt!='-' && *vpt!='='; vpt++) {
@@ -6483,7 +6483,7 @@ int Xorriso_option_commit(struct XorrisO *xorriso, int flag)
int Xorriso_option_cpri(struct XorrisO *xorriso, int argc, char **argv,
int *idx, int flag)
{
int i, ret, is_dir= 0, was_failure= 0, fret;
int i, ret, is_dir= 0, was_failure= 0, fret, end_idx_dummy;
char eff_origin[SfileadrL], eff_dest[SfileadrL];
char dest_dir[SfileadrL], leafname[SfileadrL];
int optc= 0;
@@ -6533,6 +6533,8 @@ problem_handler:;
}
ret= !was_failure;
ex:;
Xorriso_opt_args(xorriso, "-cpri",
argc, argv, *idx, &end_idx_dummy, &optc, &optv, 256);
return(ret);
}
@@ -7544,10 +7546,10 @@ ex:;
int Xorriso_option_mvi(struct XorrisO *xorriso, int argc, char **argv,
int *idx, int flag)
{
int i, end_idx, ret, is_dir= 0, was_failure= 0, fret;
int i, end_idx_dummy, ret, is_dir= 0, was_failure= 0, fret;
char sfe[5*SfileadrL], sfe2[5*SfileadrL];
char eff_origin[SfileadrL], eff_dest[SfileadrL], dest_dir[SfileadrL];
char *leafname;
char leafname[SfileadrL];
int optc= 0;
char **optv= NULL;
@@ -7595,8 +7597,7 @@ problem_handler:;
ret= !was_failure;
ex:;
Xorriso_opt_args(xorriso, "-mvi",
argc, argv, *idx, &end_idx, &optc, &optv, 256);
(*idx)= end_idx;
argc, argv, *idx, &end_idx_dummy, &optc, &optv, 256);
return(ret);
}