diff options
| author | wollman <wollman@FreeBSD.org> | 2012-02-08 05:03:04 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 2012-02-08 05:03:04 +0000 |
| commit | 046e176269f94d0e304bb66cad61dc4d0fca8dbd (patch) | |
| tree | 2b3c8d635a8f34669e9cdfa95deb447c310acc3d /usr.sbin/tzsetup | |
| parent | b1e43d714544cbc14117ef57eba24da11224983a (diff) | |
| download | FreeBSD-src-046e176269f94d0e304bb66cad61dc4d0fca8dbd.zip FreeBSD-src-046e176269f94d0e304bb66cad61dc4d0fca8dbd.tar.gz | |
It's not an error if unlink(2) fails because the pathname doesn't exist.
Noticed by: kevlo
Pointy hat to: wollman
Diffstat (limited to 'usr.sbin/tzsetup')
| -rw-r--r-- | usr.sbin/tzsetup/tzsetup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 5da9d72..97daa0b 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -723,7 +723,7 @@ install_zoneinfo_file(const char *zoneinfo_file) return (DITEM_FAILURE | DITEM_RECREATE); } - if (unlink(path_localtime) < 0) { + if (unlink(path_localtime) < 0 && errno != ENOENT) { snprintf(prompt, sizeof(prompt), "Could not unlink %s: %s", path_localtime, strerror(errno)); @@ -780,7 +780,7 @@ install_zoneinfo_file(const char *zoneinfo_file) fprintf(stderr, "%s\n", prompt); return (DITEM_FAILURE | DITEM_RECREATE); } - if (unlink(path_localtime) < 0) { + if (unlink(path_localtime) < 0 && errno != ENOENT) { snprintf(prompt, sizeof(prompt), "Could not unlink %s: %s", path_localtime, strerror(errno)); |
