diff options
| author | blueness <basile@opensource.dyc.edu> | 2014-03-22 16:51:07 -0400 |
|---|---|---|
| committer | blueness <basile@opensource.dyc.edu> | 2014-03-22 16:51:07 -0400 |
| commit | fbfcfb49a6f2bfa61e235f5fe601fa9a9f95b4ea (patch) | |
| tree | 41068dda4890be00135e260e30620400997cb662 /src/udev | |
| parent | 12c87cef17934b0909b96fdaa18b178963ec4436 (diff) | |
| parent | 728baddb472075e21421ebdc5de0a6e992453fbc (diff) | |
Merge pull request #90 from lhb-jr/fix_nocheckreturn
Fixed gcc warnings that call returns not checked
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/udev-node.c | 9 | ||||
| -rw-r--r-- | src/udev/udevadm-settle.c | 5 | ||||
| -rw-r--r-- | src/udev/udevd.c | 5 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index 200e24fb41..2dddc7b4b4 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -286,8 +286,13 @@ static int node_permissions_apply(struct udev_device *dev, bool apply, if ((stats.st_mode & 0777) != (mode & 0777) || stats.st_uid != uid || stats.st_gid != gid) { log_debug("set permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid); - chmod(devnode, mode); - chown(devnode, uid, gid); + ; + if((chmod(devnode, mode) !=0 ) || (chown(devnode, uid,gid) !=0)) { + err = -errno; + log_error("FAILED to set permissions %s, %#o, uid=%u, gid=%u" + ,devnode, mode, uid, gid); + goto out; + } } else { log_debug("preserve permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid); } diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c index 9eeeab8f14..9ae6c6bf8e 100644 --- a/src/udev/udevadm-settle.c +++ b/src/udev/udevadm-settle.c @@ -201,7 +201,10 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) if (poll(pfd, 1, delay) > 0 && pfd[0].revents & POLLIN) { char buf[sizeof(struct inotify_event) + PATH_MAX]; - read(pfd[0].fd, buf, sizeof(buf)); + if(read(pfd[0].fd, buf, sizeof(buf)) < 0){ + log_error("failed to read /run/udev"); + goto out; + } } } else { sleep(1); diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 850e4f5ef6..03de852c02 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1031,7 +1031,10 @@ int main(int argc, char *argv[]) } /* set umask before creating any file/directory */ - chdir("/"); + if(chdir("/")!= 0) { + log_error("unable to change into directory '/'"); + goto exit; + } umask(022); mkdir("/run/udev", 0755); |