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

Removed some unused code

Browse Source
This commit is contained in:
Thomas Schmitt 2008-04-07 20:13:01 +00:00
parent 1adeb2cf69
commit 2d78868112
3 changed files with 31 additions and 884 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -1 +1 @@
#define Xorriso_timestamP "2008.04.07.185727" #define Xorriso_timestamP "2008.04.07.201253"

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

@ -1586,7 +1586,7 @@ cannot_open_dir:;
Linkitem_reset_stack(&own_link_stack, link_stack, 0); Linkitem_reset_stack(&own_link_stack, link_stack, 0);
srcpt= disk_path; srcpt= disk_path;
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
ret= Dirseq_next_adr(dirseq,name,0); ret= Dirseq_next_adr(dirseq,name,0); /* name is a pointer into disk_path */
if(ret==0) if(ret==0)
break; break;
if(ret<0) { if(ret<0) {
@ -1594,6 +1594,9 @@ cannot_open_dir:;
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FATAL", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FATAL", 0);
{ret= -1; goto ex;} {ret= -1; goto ex;}
} }
/* >>> compare exclusions against disk_path resp. name */;
strcpy(img_name, name); strcpy(img_name, name);
if(Xorriso_much_too_long(xorriso, strlen(img_path), 0)<=0) if(Xorriso_much_too_long(xorriso, strlen(img_path), 0)<=0)
{ret= 0; goto was_problem;} {ret= 0; goto was_problem;}
@ -1800,23 +1803,8 @@ int Xorriso_copy_implict_properties(struct XorrisO *xorriso, IsoDir *dir,
strcpy(nfd, "/"); strcpy(nfd, "/");
if(stat(nfd, &stbuf)==-1) if(stat(nfd, &stbuf)==-1)
return(0); return(0);
#ifdef NIX
if((flag&1) && d==0) {
/* give directory x-permission where is r-permission */
if(stbuf.st_mode&S_IRUSR)
stbuf.st_mode|= S_IXUSR;
if(stbuf.st_mode&S_IRGRP)
stbuf.st_mode|= S_IXGRP;
if(stbuf.st_mode&S_IROTH)
stbuf.st_mode|= S_IXOTH;
}
Xorriso_transfer_properties(xorriso, &stbuf, (IsoNode *) dir, flag&1);
#else
Xorriso_transfer_properties(xorriso, &stbuf, (IsoNode *) dir, Xorriso_transfer_properties(xorriso, &stbuf, (IsoNode *) dir,
((flag&1) && d==0)); ((flag&1) && d==0));
#endif /* ! NIX */
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Copied properties for %s", Text_shellsafe(ni, sfe, 0)); "Copied properties for %s", Text_shellsafe(ni, sfe, 0));
sprintf(xorriso->info_text+strlen(xorriso->info_text), sprintf(xorriso->info_text+strlen(xorriso->info_text),
@ -1869,11 +1857,12 @@ int Xorriso_graft_in(struct XorrisO *xorriso, void *boss_iter,
int target_is_split; int target_is_split;
struct stat stbuf; struct stat stbuf;
/* >>> compare exclusions against disk_path resp. name
but no leaf patter if flag&4 */;
for(cpt= img_path; 1; cpt++) { for(cpt= img_path; 1; cpt++) {
/*
if(cpt[0]!='/')
break;
*/
cpt= strstr(cpt,"/."); cpt= strstr(cpt,"/.");
if(cpt==NULL) if(cpt==NULL)
break; break;
@ -3592,6 +3581,7 @@ ex:;
return(ret); return(ret);
} }
/* @param boss_iter Opaque handle to be forwarded to actions in ISO image /* @param boss_iter Opaque handle to be forwarded to actions in ISO image
Set to NULL if calling this function from outside ISO world Set to NULL if calling this function from outside ISO world
*/ */