Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From cc0cd6f71f6ef96fca2d7b730a3f0f6722fec696 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 7 May 2022 12:15:22 -0700 |
| 4 | Subject: [PATCH] Define strndupa if it does not exist |
| 5 | |
| 6 | musl e.g. does not supply strndupa, unlike glibc |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 10 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 11 | --- |
| 12 | etc/systemd/system-generators/zfs-mount-generator.c | 9 +++++++++ |
| 13 | 1 file changed, 9 insertions(+) |
| 14 | |
| 15 | diff --git a/etc/systemd/system-generators/zfs-mount-generator.c b/etc/systemd/system-generators/zfs-mount-generator.c |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 16 | index f4c6c26..255bee4 100644 |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 17 | --- a/etc/systemd/system-generators/zfs-mount-generator.c |
| 18 | +++ b/etc/systemd/system-generators/zfs-mount-generator.c |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 19 | @@ -193,6 +193,15 @@ fopenat(int dirfd, const char *pathname, int flags, |
| 20 | return (fdopen(fd, stream_mode)); |
| 21 | } |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 22 | |
| 23 | +#ifndef strndupa |
| 24 | +#define strndupa(s, n) \ |
| 25 | + (__extension__ ({const char *__in = (s); \ |
| 26 | + size_t __len = strnlen (__in, (n)) + 1; \ |
| 27 | + char *__out = (char *) alloca (__len); \ |
| 28 | + __out[__len-1] = '\0'; \ |
| 29 | + (char *) memcpy (__out, __in, __len-1);})) |
| 30 | +#endif |
| 31 | + |
| 32 | static int |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 33 | line_worker(char *line, const char *cachefile) |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 34 | { |