readlinknul(): Minor tweaks

[alejandro-colomar]

---

Revisions:

v1b

• Rebase

$ git range-diff alx/master..gh/readlink shadow/master..readlink 
1:  56975bbd = 1:  1df0343c lib/fs/readlink/readlinknul.h: readlinknul(): Simplify the return value
2:  dacf42bd = 2:  13c7d4c9 lib/fs/readlink/readlinknul.h: readlinknul(): Silence warning

v1c

• Rebase

$ git range-diff gh/master..gh/readlink shadow/master..readlink 
1:  1df0343c = 1:  9c99500d lib/fs/readlink/readlinknul.h: readlinknul(): Simplify the return value
2:  13c7d4c9 = 2:  340b5544 lib/fs/readlink/readlinknul.h: readlinknul(): Silence warning

v1d

• Rebase

$ git range-diff master..gh/readlink shadow/master..readlink 
1:  9c99500d = 1:  26597716 lib/fs/readlink/readlinknul.h: readlinknul(): Simplify the return value
2:  340b5544 = 2:  96367947 lib/fs/readlink/readlinknul.h: readlinknul(): Silence warning

v2

• Be more like readlink(2). [@hallyn ]

$ git range-diff shadow/master gh/readlink readlink 
1:  26597716 < -:  -------- lib/fs/readlink/readlinknul.h: readlinknul(): Simplify the return value
2:  96367947 = 1:  ec20d793 lib/fs/readlink/readlinknul.h: readlinknul(): Silence warning
-:  -------- > 2:  44f5100e lib/fs/readlink/: readlinknul(): Fix return type

v2b

• Rebase

$ git range-diff master..gh/readlink shadow/master..readlink 
1:  ec20d793 = 1:  eebe88a6 lib/fs/readlink/readlinknul.h: readlinknul(): Silence warning
2:  44f5100e = 2:  b29b9242 lib/fs/readlink/: readlinknul(): Fix return type

v2c

• Rebase

$ git range-diff master..gh/readlink shadow/master..readlink 
1:  eebe88a6 = 1:  f3ff9482 lib/fs/readlink/readlinknul.h: readlinknul(): Silence warning
2:  b29b9242 = 2:  321d4d44 lib/fs/readlink/: readlinknul(): Fix return type

v2d

• Rebase

$ git range-diff master..gh/readlink shadow/master..readlink 
1:  f3ff9482 = 1:  a3656c70 lib/fs/readlink/readlinknul.h: readlinknul(): Silence warning
2:  321d4d44 = 2:  effb3787 lib/fs/readlink/: readlinknul(): Fix return type

v2e

• Rebase

$ git range-diff master..gh/readlink shadow/master..readlink 
1:  a3656c70 = 1:  fbc78bca lib/fs/readlink/readlinknul.h: readlinknul(): Silence warning
2:  effb3787 = 2:  1c3d86c8 lib/fs/readlink/: readlinknul(): Fix return type

v3

• Rename local variables, and return the signed one. [@hallyn ]

$ git range-diff --creation-factor=99 shadow/master gh/readlink readlink 
1:  fbc78bca ! 1:  302f144a lib/fs/readlink/readlinknul.h: readlinknul(): Silence warning
    @@ lib/fs/readlink/readlinknul.h: inline int readlinknul(const char *restrict link,
      readlinknul(const char *restrict link, char *restrict buf, size_t size)
      {
     -  ssize_t  len;
    -+  size_t   len;
    -+  ssize_t  r;
    ++  size_t   ulen;
    ++  ssize_t  slen;
      
     -  len = readlink(link, buf, size);
     -  if (len == -1)
    -+  r = readlink(link, buf, size);
    -+  if (r == -1)
    ++  slen = readlink(link, buf, size);
    ++  if (slen == -1)
                return -1;
      
    -+  len = r;
    -   if (len == size) {
    +-  if (len == size) {
    ++  ulen = slen;
    ++  if (ulen == size) {
                stpcpy(&buf[size-1], "");
                errno = E2BIG;
    +           return -1;
    +   }
    + 
    +-  stpcpy(&buf[len], "");
    +-  return len;
    ++  stpcpy(&buf[ulen], "");
    ++
    ++  return slen;
    + }
    + 
    + 
2:  1c3d86c8 ! 2:  42fc0318 lib/fs/readlink/: readlinknul(): Fix return type
    @@ lib/fs/readlink/readlinknul.h
     +inline ssize_t
      readlinknul(const char *restrict link, char *restrict buf, size_t size)
      {
    -   size_t   len;
    +   size_t   ulen;

[alejandro-colomar]

Queued after the release of 4.17.0.

[alejandro-colomar]

Actually, this fixes a minor bug. I'll re-open. @hallyn , please merge when you're happy.

[ikerexxe]

LGTM!

[alejandro-colomar]

Thanks! Feel free to merge.

Addressed. The function now matches the comment.