changeset 1572:da1bf31ed322 draft

Tweak the "ignoring return value" fortify workaround for readlinkat. We zero the buffer and if the link read fails that's left alone, so it's ok for the symlink not to be there. Unfortunately, typecasting the return value to (void) doesn't shut up gcc, and having an if(); with the semicolon on the same line doesn't shut up llvm. (The semicolon on a new line would, but C does not have significant whitespace and I'm not going to humor llvm if it plans to start.) So far, empty curly brackets consistently get the warning to shut up.
author Rob Landley <>
date Mon, 24 Nov 2014 17:23:23 -0600
parents e85e5f3b87c2
children 423e04b90469
files toys/other/lspci.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/toys/other/lspci.c	Sat Nov 22 00:36:45 2014 -0600
+++ b/toys/other/lspci.c	Mon Nov 24 17:23:23 2014 -0600
@@ -53,7 +53,7 @@
   // it's ok for the driver link not to be there, whatever fortify says
   *driver = 0;
   if (toys.optflags & FLAG_k)
-    if (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);