diff options
Diffstat (limited to 'usr/src/cmd/logadm/main.c')
| -rw-r--r-- | usr/src/cmd/logadm/main.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/usr/src/cmd/logadm/main.c b/usr/src/cmd/logadm/main.c index 4423fd7ea3..3c959841f5 100644 --- a/usr/src/cmd/logadm/main.c +++ b/usr/src/cmd/logadm/main.c @@ -605,17 +605,14 @@ rotatelog(struct fn *fnp, struct opts *opts) if (opts_count(opts, "N")) return (1); err(EF_WARN|EF_SYS, "%s", fname); - return (B_FALSE); } if ((stbuf.st_mode & S_IFMT) == S_IFLNK) { err(EF_WARN, "%s is a symlink", fname); - return (B_FALSE); } if ((stbuf.st_mode & S_IFMT) != S_IFREG) { err(EF_WARN, "%s is not a regular file", fname); - return (B_FALSE); } /* even if size condition is not met, this entry is "done" */ @@ -1076,7 +1073,6 @@ docmd(struct opts *opts, const char *msg, const char *cmd, (arg2) ? arg2 : "", (arg3) ? " " : "", (arg3) ? arg3 : ""); - first = B_FALSE; } err_fromfd(pfd.fd); } @@ -1086,7 +1082,6 @@ docmd(struct opts *opts, const char *msg, const char *cmd, } if (waitpid(pid, &wstat, 0) < 0) { err(EF_SYS, "waitpid"); - return; } if (!first) { @@ -1151,20 +1146,15 @@ docopytruncate(struct opts *opts, const char *file, const char *file_copy) /* open log file to be rotated and remember its chmod mask */ if ((fi = open(file, O_RDWR)) < 0) { err(EF_SYS, "cannot open file %s", file); - return; } if (fstat(fi, &s) < 0) { err(EF_SYS, "cannot access: %s", file); - (void) close(fi); - return; } /* create new file for copy destination with correct attributes */ if ((fo = open(file_copy, O_CREAT|O_TRUNC|O_WRONLY, s.st_mode)) < 0) { err(EF_SYS, "cannot create file: %s", file_copy); - (void) close(fi); - return; } (void) fchown(fo, s.st_uid, s.st_gid); @@ -1190,10 +1180,6 @@ docopytruncate(struct opts *opts, const char *file, const char *file_copy) do { if (fstat(fi, &s) < 0) { err(EF_SYS, "cannot stat: %s", file); - (void) close(fi); - (void) close(fo); - (void) remove(file_copy); - return; } if ((rem = s.st_size - written) < thresh) { @@ -1233,10 +1219,6 @@ docopytruncate(struct opts *opts, const char *file, const char *file_copy) } err(EF_SYS, "cannot write into file %s", file_copy); - (void) close(fi); - (void) close(fo); - (void) remove(file_copy); - return; } } while (len >= 0); @@ -1251,12 +1233,6 @@ docopytruncate(struct opts *opts, const char *file, const char *file_copy) while ((len = read(fi, buf, sizeof (buf))) > 0) if (write(fo, buf, len) != len) { err(EF_SYS, "cannot write into file %s", file_copy); - (void) lockf(fi, F_ULOCK, 0); - (void) fchmod(fi, s.st_mode); - (void) close(fi); - (void) close(fo); - (void) remove(file_copy); - return; } (void) ftruncate(fi, 0); |