diff options
| author | Rob Landley <rob@landley.net> | 2014-11-22 00:36:45 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2014-11-22 00:36:45 -0600 |
| commit | f6c28b6e0017ac36190ee31132721a1c9e30f2b6 (patch) | |
| tree | c242e6d66c112c46ec1a0010758ff00df29f2e87 /toys/other | |
| parent | ea6fc27fc8853b317a78c402e290bdc0142792e8 (diff) | |
| download | toybox-f6c28b6e0017ac36190ee31132721a1c9e30f2b6.tar.gz | |
As long as Android's going to require fortify, fixup the warnings it generates.
Diffstat (limited to 'toys/other')
| -rw-r--r-- | toys/other/acpi.c | 2 | ||||
| -rw-r--r-- | toys/other/clear.c | 2 | ||||
| -rw-r--r-- | toys/other/lspci.c | 3 | ||||
| -rw-r--r-- | toys/other/nbd_client.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/toys/other/acpi.c b/toys/other/acpi.c index c4f31283..44fd03b1 100644 --- a/toys/other/acpi.c +++ b/toys/other/acpi.c @@ -38,7 +38,7 @@ int read_int_at(int dirfd, char *name) FILE *fil; if ((fd = openat(dirfd, name, O_RDONLY)) < 0) return -1; - fscanf(fil = xfdopen(fd, "r"), "%d", &ret); + if (!fscanf(fil = xfdopen(fd, "r"), "%d", &ret)) perror_exit("%s", name); fclose(fil); return ret; diff --git a/toys/other/clear.c b/toys/other/clear.c index 2515f735..4061ea8d 100644 --- a/toys/other/clear.c +++ b/toys/other/clear.c @@ -15,5 +15,5 @@ config CLEAR void clear_main(void) { - write(1, "\e[2J\e[H", 7); + xwrite(1, "\e[2J\e[H", 7); } diff --git a/toys/other/lspci.c b/toys/other/lspci.c index 40e0c0a0..6a265a1d 100644 --- a/toys/other/lspci.c +++ b/toys/other/lspci.c @@ -50,9 +50,10 @@ int do_lspci(struct dirtree *new) if (-1 == (dirfd = openat(dirtree_parentfd(new), new->name, O_RDONLY))) return 0; + // it's ok for the driver link not to be there, whatever fortify says *driver = 0; if (toys.optflags & FLAG_k) - readlinkat(dirfd, "driver", driver, sizeof(driver)); + if (readlinkat(dirfd, "driver", driver, sizeof(driver))); for (fields = (char*[]){"class", "vendor", "device", 0}; *fields; fields++) { int fd, size = 6 + 2*((toys.optflags & FLAG_e) && p == toybuf); diff --git a/toys/other/nbd_client.c b/toys/other/nbd_client.c index 6b437c72..969ad4ae 100644 --- a/toys/other/nbd_client.c +++ b/toys/other/nbd_client.c @@ -112,7 +112,7 @@ void nbd_client_main(void) // Daemonize here. - daemon(0,0); + if (daemon(0,0)) perror_exit("daemonize"); // Process NBD requests until further notice. |