From dcafd7c96a8d49333f95645127f607ca0cf5df1e Mon Sep 17 00:00:00 2001 From: "Tim J. Robbins" Date: Sun, 2 Jun 2002 09:32:39 +0000 Subject: [PATCH] Don't exit immediately if an error occurs, continue but exit non-zero. --- usr.sbin/chown/chown.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c index 6f5f390d4aaf..b0154588846e 100644 --- a/usr.sbin/chown/chown.c +++ b/usr.sbin/chown/chown.c @@ -255,17 +255,21 @@ chownerr(file) gid_t groups[NGROUPS_MAX]; /* Check for chown without being root. */ - if (errno != EPERM || - (uid != (uid_t)-1 && euid == (uid_t)-1 && (euid = geteuid()) != 0)) - err(1, "%s", file); + if (errno != EPERM || (uid != (uid_t)-1 && + euid == (uid_t)-1 && (euid = geteuid()) != 0)) { + warn("%s", file); + return; + } /* Check group membership; kernel just returns EPERM. */ if (gid != (gid_t)-1 && ngroups == -1 && euid == (uid_t)-1 && (euid = geteuid()) != 0) { ngroups = getgroups(NGROUPS_MAX, groups); while (--ngroups >= 0 && gid != groups[ngroups]); - if (ngroups < 0) - errx(1, "you are not a member of group %s", gname); + if (ngroups < 0) { + warnx("you are not a member of group %s", gname); + return; + } } warn("%s", file); }