emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Avoid assignment in comparisons.

Browse Source
This commit is contained in:
nekral-guest 2007-12-27 23:30:36 +00:00
parent dfb6416a5b
commit cc4b37f65c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -7,6 +7,7 @@
* libmisc/copydir.c: -1 is used to indicate an error, directly set err * libmisc/copydir.c: -1 is used to indicate an error, directly set err
to -1, instead of incrementing it, and checking if not nul at the to -1, instead of incrementing it, and checking if not nul at the
end. end.
* libmisc/copydir.c: Avoid assignment in comparisons.
2007-12-27 Nicolas François <nicolas.francois@centraliens.net> 2007-12-27 Nicolas François <nicolas.francois@centraliens.net>

15
libmisc/copydir.c
View File

@ -185,8 +185,8 @@ int copy_tree (const char *src_root, const char *dst_root, uid_t uid, gid_t gid)
* regular files (and directories ...) are copied, and no file * regular files (and directories ...) are copied, and no file
* is made set-ID. * is made set-ID.
*/ */
dir = opendir (src_root);
if (!(dir = opendir (src_root))) if (NULL == dir)
return -1; return -1;
if (src_orig == 0) { if (src_orig == 0) {
@ -431,14 +431,15 @@ static int copy_file (const char *src, const char *dst,
char buf[1024]; char buf[1024];
int cnt; int cnt;
if ((ifd = open (src, O_RDONLY)) < 0) { ifd = open (src, O_RDONLY);
if (ifd < 0) {
return -1; return -1;
} }
#ifdef WITH_SELINUX #ifdef WITH_SELINUX
selinux_file_context (dst); selinux_file_context (dst);
#endif #endif
if ((ofd = ofd = open (dst, O_WRONLY | O_CREAT | O_TRUNC, 0);
open (dst, O_WRONLY | O_CREAT | O_TRUNC, 0)) < 0 if ((ofd < 0)
|| chown (dst, || chown (dst,
uid == (uid_t) - 1 ? statp->st_uid : uid, uid == (uid_t) - 1 ? statp->st_uid : uid,
gid == (gid_t) - 1 ? statp->st_gid : gid) gid == (gid_t) - 1 ? statp->st_gid : gid)
@ -495,8 +496,8 @@ int remove_tree (const char *root)
* regular files (and directories ...) are copied, and no file * regular files (and directories ...) are copied, and no file
* is made set-ID. * is made set-ID.
*/ */
dir = opendir (root);
if (!(dir = opendir (root))) if (NULL == dir)
return -1; return -1;
while ((ent = readdir (dir))) { while ((ent = readdir (dir))) {