|
|
|
@ -1448,9 +1448,12 @@ much_too_long:;
|
|
|
|
|
report_size= sub_size/1024;
|
|
|
|
|
if(report_size*1024<sub_size)
|
|
|
|
|
report_size++;
|
|
|
|
|
sprintf(xorriso->result_line, "%7.f ",(double) (report_size));
|
|
|
|
|
if(xorriso->sh_style_result)
|
|
|
|
|
sprintf(xorriso->result_line, "%-7.f ",(double) (report_size));
|
|
|
|
|
else
|
|
|
|
|
sprintf(xorriso->result_line, "%7.f ",(double) (report_size));
|
|
|
|
|
sprintf(xorriso->result_line+strlen(xorriso->result_line), "%s\n",
|
|
|
|
|
Text_shellsafe(show_path, sfe, 0));
|
|
|
|
|
Xorriso_esc_filepath(xorriso, show_path, sfe, 0));
|
|
|
|
|
Xorriso_result(xorriso, 0);
|
|
|
|
|
}
|
|
|
|
|
ret= 1;
|
|
|
|
@ -1621,7 +1624,7 @@ int Xorriso_ls_filev(struct XorrisO *xorriso, char *wd,
|
|
|
|
|
if(filec>1) {
|
|
|
|
|
strcpy(xorriso->result_line, "\n");
|
|
|
|
|
Xorriso_result(xorriso,0);
|
|
|
|
|
Text_shellsafe(filev[i], xorriso->result_line, 0);
|
|
|
|
|
Xorriso_esc_filepath(xorriso, filev[i], xorriso->result_line, 0);
|
|
|
|
|
strcat(xorriso->result_line, ":\n");
|
|
|
|
|
Xorriso_result(xorriso,0);
|
|
|
|
|
}
|
|
|
|
@ -1670,14 +1673,17 @@ int Xorriso_ls_filev(struct XorrisO *xorriso, char *wd,
|
|
|
|
|
if(ret==0)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
sprintf(rpt, "%7.f ",(double) (size/1024));
|
|
|
|
|
if(xorriso->sh_style_result)
|
|
|
|
|
sprintf(rpt, "%-7.f ",(double) (size/1024));
|
|
|
|
|
else
|
|
|
|
|
sprintf(rpt, "%7.f ",(double) (size/1024));
|
|
|
|
|
}
|
|
|
|
|
if(link_target[0] && (flag&5)==1) {
|
|
|
|
|
Text_shellsafe(filev[i], xorriso->result_line, 1),
|
|
|
|
|
Xorriso_esc_filepath(xorriso, filev[i], xorriso->result_line, 1),
|
|
|
|
|
strcat(xorriso->result_line, " -> ");
|
|
|
|
|
Text_shellsafe(link_target, xorriso->result_line, 1 | 2);
|
|
|
|
|
Xorriso_esc_filepath(xorriso, link_target, xorriso->result_line, 1 | 2);
|
|
|
|
|
} else {
|
|
|
|
|
Text_shellsafe(filev[i], xorriso->result_line, 1);
|
|
|
|
|
Xorriso_esc_filepath(xorriso, filev[i], xorriso->result_line, 1);
|
|
|
|
|
}
|
|
|
|
|
strcat(xorriso->result_line, "\n");
|
|
|
|
|
Xorriso_result(xorriso, 0);
|
|
|
|
@ -1783,11 +1789,11 @@ cannot_create_iter:;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if(link_target[0] && (flag&1)) {
|
|
|
|
|
Text_shellsafe(npt, xorriso->result_line, 1);
|
|
|
|
|
Xorriso_esc_filepath(xorriso, npt, xorriso->result_line, 1);
|
|
|
|
|
strcat(xorriso->result_line, " -> ");
|
|
|
|
|
Text_shellsafe(link_target, xorriso->result_line, 1 | 2);
|
|
|
|
|
Xorriso_esc_filepath(xorriso, link_target, xorriso->result_line, 1 | 2);
|
|
|
|
|
} else {
|
|
|
|
|
Text_shellsafe(npt, xorriso->result_line, 1);
|
|
|
|
|
Xorriso_esc_filepath(xorriso, npt, xorriso->result_line, 1);
|
|
|
|
|
}
|
|
|
|
|
strcat(xorriso->result_line, "\n");
|
|
|
|
|
Xorriso_result(xorriso, 0);
|
|
|
|
|