diff options
| author | Warner Losh <imp@FreeBSD.org> | 1999-04-25 21:13:34 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 1999-04-25 21:13:34 +0000 |
| commit | 426e9c1dcc6b3d9d4a5ad436aecaa1c2f9d29e17 (patch) | |
| tree | c77cfa8ea1a0c7d542f16074d77f4bf229b98639 /bin/cp/utils.c | |
| parent | 51bb7ba6641b0601252c2c5a21eb47728a1c9566 (diff) | |
| download | src-426e9c1dcc6b3d9d4a5ad436aecaa1c2f9d29e17.tar.gz src-426e9c1dcc6b3d9d4a5ad436aecaa1c2f9d29e17.zip | |
First set of fixes to keep egcs happy. These include {} around single
statement if blocks[*] when the else could be ambiguous, not defaulting
to int type and removal of some unused variables.
[*] This is explicitly allowed by style(9) when the single statement
spans more than one line.
Reviewed by: obrien, chuckr
Notes
Notes:
svn path=/head/; revision=46073
Diffstat (limited to 'bin/cp/utils.c')
| -rw-r--r-- | bin/cp/utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/cp/utils.c b/bin/cp/utils.c index f6c0f0d21d55..9118efcc32f0 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94"; #endif static const char rcsid[] = - "$Id: utils.c,v 1.20 1998/06/10 06:29:23 peter Exp $"; + "$Id: utils.c,v 1.21 1998/11/18 11:47:45 bde Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -183,7 +183,7 @@ copy_file(entp, dne) */ #define RETAINBITS \ (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) - else if (fs->st_mode & (S_ISUID | S_ISGID) && fs->st_uid == myuid) + else if (fs->st_mode & (S_ISUID | S_ISGID) && fs->st_uid == myuid) { if (fstat(to_fd, &to_stat)) { warn("%s", to.p_path); rval = 1; @@ -192,6 +192,7 @@ copy_file(entp, dne) warn("%s", to.p_path); rval = 1; } + } (void)close(from_fd); if (close(to_fd)) { warn("%s", to.p_path); |