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

Supports systems without the d_type field in struct dirent

Browse Source
This commit is contained in:
Pierre Pronchery 2007-03-28 05:03:27 +00:00
parent b00b5b9602
commit b5132b4855
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cp.c
View File

@ -131,6 +131,9 @@ static int _single_recurse(Prefs * prefs, char const * src, char const * dst)
char * ssrc = NULL; char * ssrc = NULL;
char * sdst = NULL; char * sdst = NULL;
char * p; char * p;
#ifndef DT_DIR
struct stat st;
#endif
if(mkdir(dst, 0777) != 0 && errno != EEXIST) if(mkdir(dst, 0777) != 0 && errno != EEXIST)
return _cp_error(dst, 1); return _cp_error(dst, 1);
@ -159,9 +162,20 @@ 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
if(de->d_type == DT_DIR) if(de->d_type == DT_DIR)
ret |= _single_recurse(&prefs2, ssrc, sdst); ret |= _single_recurse(&prefs2, ssrc, sdst);
else if(de->d_type == DT_LNK && (*prefs & PREFS_P)) 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 |= _cp_symlink(ssrc, sdst); ret |= _cp_symlink(ssrc, sdst);
else else
ret |= _cp_single(&prefs2, ssrc, sdst); ret |= _cp_single(&prefs2, ssrc, sdst);