lagertonne/ifupdown-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity

clean up locking-related errors further

Browse source
This commit is contained in:
Ariadne Conill 2020-07-29 03:17:12 -06:00
parent c71c01862d
commit ef3bdd79da
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cmd/ifupdown.c
View file

@ -81,8 +81,8 @@ acquire_state_lock(const char *state_path, const char *lifname)
int fd = open(lockpath, O_CREAT | O_WRONLY | O_TRUNC); int fd = open(lockpath, O_CREAT | O_WRONLY | O_TRUNC);
if (fd < 0) if (fd < 0)
{ {
fprintf(stderr, "opening lockfile %s: %s\n", lockpath, strerror(errno)); fprintf(stderr, "%s: while opening lockfile %s: %s\n", argv0, lockpath, strerror(errno));
return -1; return -2;
} }
int flags = fcntl(fd, F_GETFD); int flags = fcntl(fd, F_GETFD);
@ -90,8 +90,8 @@ acquire_state_lock(const char *state_path, const char *lifname)
{ {
close(fd); close(fd);
fprintf(stderr, "getting flags for lockfile: %s\n", strerror(errno)); fprintf(stderr, "%s: while getting flags for lockfile: %s\n", argv0, strerror(errno));
return -1; return -2;
} }
flags |= FD_CLOEXEC; flags |= FD_CLOEXEC;
@ -99,8 +99,8 @@ acquire_state_lock(const char *state_path, const char *lifname)
{ {
close(fd); close(fd);
fprintf(stderr, "setting lockfile close-on-exec: %s\n", strerror(errno)); fprintf(stderr, "%s: while setting lockfile close-on-exec: %s\n", argv0, strerror(errno));
return -1; return -2;
} }
struct flock fl = { struct flock fl = {
@ -115,7 +115,8 @@ acquire_state_lock(const char *state_path, const char *lifname)
{ {
close(fd); close(fd);
fprintf(stderr, "locking lockfile: %s\n", strerror(errno)); if (exec_opts.verbose)
fprintf(stderr, "%s: while locking lockfile: %s\n", argv0, strerror(errno));
return -2; return -2;
} }
@ -129,7 +130,7 @@ change_interface(struct lif_interface *iface, struct lif_dict *collection, struc
if (lockfd == -2) if (lockfd == -2)
{ {
fprintf(stderr, "%s: could not acquire exclusive lock for %s\n", argv0, ifname); fprintf(stderr, "%s: could not acquire exclusive lock for %s: %s\n", argv0, ifname, strerror(errno));
return false; return false;
} }