diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1998-12-17 17:19:50 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1998-12-17 17:19:50 +0000 |
| commit | 1710cfefe9aad1b3684d3c4d3f47e05e759d23b1 (patch) | |
| tree | c5b9c1f7a6ce3ed0967727d19c5045f07fc65fe4 /usr.bin/xinstall | |
| parent | 24c6615fb49bdcbc51400bfc54ff8df17300923f (diff) | |
Some -Wall
Don't try to close a descriptor if it was never opened.
Diffstat (limited to 'usr.bin/xinstall')
| -rw-r--r-- | usr.bin/xinstall/xinstall.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index c516cde24c6..192e05fc0a9 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xinstall.c,v 1.17 1998/12/16 19:55:57 millert Exp $ */ +/* $OpenBSD: xinstall.c,v 1.18 1998/12/17 17:19:49 millert Exp $ */ /* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93"; #endif -static char rcsid[] = "$OpenBSD: xinstall.c,v 1.17 1998/12/16 19:55:57 millert Exp $"; +static char rcsid[] = "$OpenBSD: xinstall.c,v 1.18 1998/12/17 17:19:49 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -89,7 +89,7 @@ void strip __P((char *)); void usage __P((void)); int create_newfile __P((char *, struct stat *)); int create_tempfile __P((char *, char *, size_t)); -int file_write __P((int, char *, register int, int *, int *, int)); +int file_write __P((int, char *, register size_t, int *, int *, int)); int main(argc, argv) @@ -391,7 +391,8 @@ install(from_name, to_name, fset, flags) } (void)close(to_fd); - (void)close(from_fd); + if (!devnull) + (void)close(from_fd); } /* @@ -405,7 +406,7 @@ copy(from_fd, from_name, to_fd, to_name, size, sparse) off_t size; int sparse; { - register int nr, nw; + register ssize_t nr, nw; int serrno; char *p, buf[MAXBSIZE]; @@ -533,6 +534,10 @@ strip(to_name) int serrno, status; char *path_strip; +#ifdef __GNUC__ /* XXX: to shut up gcc warnings */ + (void)&path_strip; +#endif + if (issetugid() || (path_strip = getenv("STRIP")) == NULL) path_strip = _PATH_STRIP; @@ -696,14 +701,14 @@ int file_write(fd, str, cnt, rem, isempt, sz) int fd; char *str; - register int cnt; + register size_t cnt; int *rem; int *isempt; int sz; { register char *pt; register char *end; - register int wcnt; + register size_t wcnt; register char *st = str; /* |