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

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2018-01-30 01:05:35 +01:00
parent 60c805a405
commit e9a349f55c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cp.c
View File

@ -141,8 +141,13 @@ static int _cp_single(Prefs * prefs, char const * src, char const * dst)
ret = _cp_single_nod(src, dst, st.st_mode, st.st_rdev); ret = _cp_single_nod(src, dst, st.st_mode, st.st_rdev);
else if(S_ISLNK(st.st_mode)) else if(S_ISLNK(st.st_mode))
ret = _cp_single_symlink(src, dst); ret = _cp_single_symlink(src, dst);
else else if(S_ISREG(st.st_mode))
ret = _cp_single_regular(src, dst, st.st_mode & 0777); ret = _cp_single_regular(src, dst, st.st_mode & 0777);
else
{
errno = ENOSYS;
return _cp_error(src, 1);
}
if(ret != 0) if(ret != 0)
return ret; return ret;
if(*prefs & CP_PREFS_p) /* XXX TOCTOU */ if(*prefs & CP_PREFS_p) /* XXX TOCTOU */

6
src/mv.c
View File

@ -123,13 +123,13 @@ static int _mv_single(Prefs * prefs, char const * src, char const * dst)
ret = _mv_single_nod(src, dst, st.st_mode, st.st_rdev); ret = _mv_single_nod(src, dst, st.st_mode, st.st_rdev);
else if(S_ISLNK(st.st_mode)) else if(S_ISLNK(st.st_mode))
ret = _mv_single_symlink(src, dst); ret = _mv_single_symlink(src, dst);
else if(!S_ISREG(st.st_mode)) /* FIXME not implemented */ else if(S_ISREG(st.st_mode))
ret = _mv_single_regular(src, dst, st.st_mode & 0777);
else
{ {
errno = ENOSYS; errno = ENOSYS;
return _mv_error(src, 1); return _mv_error(src, 1);
} }
else
ret = _mv_single_regular(src, dst, st.st_mode & 0777);
if(ret != 0) if(ret != 0)
return ret; return ret;
_mv_single_p(dst, &st); _mv_single_p(dst, &st);