davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

CCAN: update to suppress path_readlink warning.

Browse Source 
Reported-by: Chirimen-Jako
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-08-01 11:04:05 +09:30
committed by Christian Decker
parent 4f89d9be86
commit 79345cc0b9
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ccan/README
View File

@@ -1,3 +1,3 @@
CCAN imported from http://ccodearchive.net. CCAN imported from http://ccodearchive.net.
CCAN version: init-2483-g920ca95d CCAN version: init-2484-ge16aa40b

13
ccan/ccan/tal/path/path.c
View File

@@ -302,7 +302,7 @@ fail_take_to:
char *path_readlink(const tal_t *ctx, const char *linkname) char *path_readlink(const tal_t *ctx, const char *linkname)
{ {
ssize_t len, maxlen = 64; /* good first guess. */ ssize_t maxlen = 64; /* good first guess. */
char *ret = NULL; char *ret = NULL;
if (unlikely(!linkname) && is_taken(linkname)) if (unlikely(!linkname) && is_taken(linkname))
@@ -311,19 +311,20 @@ fail_take_to:
ret = tal_arr(ctx, char, maxlen + 1); ret = tal_arr(ctx, char, maxlen + 1);
while (ret) { while (ret) {
len = readlink(linkname, ret, maxlen); ssize_t len = readlink(linkname, ret, maxlen);
if (len < 0) if (len < 0)
goto fail; goto fail;
if (len < maxlen)
if (len < maxlen) {
ret[len] = '\0';
break; break;
}
if (!tal_resize(&ret, maxlen *= 2 + 1)) if (!tal_resize(&ret, maxlen *= 2 + 1))
goto fail; goto fail;
} }
if (ret)
ret[len] = '\0';
out: out:
if (taken(linkname)) if (taken(linkname))
tal_free(linkname); tal_free(linkname);