DeforaOS/utils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simpler and more portable code (cannot avoid TOCTOU anyway)

Browse Source
This commit is contained in:
Pierre Pronchery 2007-07-29 16:18:02 +00:00
parent 1d73c291f1
commit e9f12002c1
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cp.c
View File

@ -180,23 +180,7 @@ static int _single_recurse(Prefs * prefs, char const * src, char const * dst)
} }
sdst = p; sdst = p;
sprintf(sdst, "%s/%s", dst, de->d_name); sprintf(sdst, "%s/%s", dst, de->d_name);
#ifdef DT_DIR ret |= _cp_single(&prefs2, ssrc, sdst);
if(de->d_type == DT_DIR)
ret |= _single_recurse(&prefs2, ssrc, sdst);
else if(de->d_type == DT_LNK && (*prefs & PREFS_P))
#else
if(lstat(ssrc, &st) != 0) /* XXX TOCTOU */
{
ret |= _cp_error(ssrc, 1);
continue;
}
if(S_ISDIR(st.st_mode))
ret |= _single_recurse(&prefs2, ssrc, sdst);
else if(S_ISLNK(st.st_mode) && (*prefs & PREFS_P))
#endif
ret |= _single_symlink(ssrc, sdst); /* XXX incomplete */
else
ret |= _cp_single(&prefs2, ssrc, sdst);
} }
closedir(dir); closedir(dir);
free(ssrc); free(ssrc);