CVS log for src/lib/libwrap/expandm.c

Up to [cvs.NetBSD.org] / src / lib / libwrap

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

libwrap: fix lint warning about "effectively discards 'const'"

lib/libwrap/expandm.c(57): warning: call to 'strstr' effectively
discards 'const' from argument [346]

No binary change.

Sync with HEAD

Sync with HEAD

file expandm.c was added on branch phil-wifi on 2019-06-10 22:05:28 +0000

remove the new check for tlen >= PTRDIFF_MAX.  the prior
checks assure the condition is met and GCC7 is happy.

suggested by kre.

And as long as we're attempting to achieve perfection in code
that is never going to be executed, let's also check for possible
overflow in a sum that will never be computed...

There's no point setting errno, it is just overwritten by err
in the exit path ... this function never fails, it simply sometimes
doesn't actually expand the %m and just leaves the format string
intact.

And declare variables at the head of their scope, not at some random
place in the middle of the code, whatever C allows, that is just ugly.

limit allocation to PTRDIFF_T to appease gcc-7, from mrg@

Synch with HEAD

file expandm.c was added on branch pgoyette-compat on 2019-01-18 08:50:11 +0000

Whitespace (indent with tabs, rather than spaces), and rearrange one
line that needed wrapping so it no longer does, and is (IMO) clearer.
WHile here, note that this was created in 2019, not 2018, for the
copyright notice...

NFCI.

Always return from expandm() with errno unaltered, so on the
off chance it failed, there's still the possibility that whatever
processes the result will be able to deal with the %m that would
(presumably) be left in the format string.

And as a frill, don't call strerror() until we know we are
going to use its result (still call it only once, no matter
how many %m's are in the format string).

check for *. integer overflow over ptrdiff. Pointed out by kre@

Make expandm() return a const char * so we can do away with __UNCONST()
and more importantly, so that we don't accidentally return a value
that is a const char * in reality (pointer to read only string) as a
char *.

Don't do %%m -> %%%m escaping, requested by gson@.

Return the buffer that has not been freed, so it can be later,
rather than the one that already was.

Provide an extra argument to store the returned pointer so we can use
the function directly as the return format (before assigning it to a
variable) to appease clang.

Use a utility function to expand %m correctly...