removed strlcat dependency (was used only once)
This commit is contained in:
parent
32bb92453a
commit
688e2e783d
55
extern/strlcat.h
vendored
55
extern/strlcat.h
vendored
@ -1,55 +0,0 @@
|
|||||||
/* $OpenBSD: strlcat.c,v 1.16 2015/08/31 02:53:57 guenther Exp $ */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
|
|
||||||
*
|
|
||||||
* Permission to use, copy, modify, and distribute this software for any
|
|
||||||
* purpose with or without fee is hereby granted, provided that the above
|
|
||||||
* copyright notice and this permission notice appear in all copies.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
||||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
||||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
||||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
||||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
||||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
||||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Appends src to string dst of size dsize (unlike strncat, dsize is the
|
|
||||||
* full size of dst, not space left). At most dsize-1 characters
|
|
||||||
* will be copied. Always NUL terminates (unless dsize <= strlen(dst)).
|
|
||||||
* Returns strlen(src) + MIN(dsize, strlen(initial dst)).
|
|
||||||
* If retval >= dsize, truncation occurred.
|
|
||||||
*/
|
|
||||||
size_t
|
|
||||||
strlcat(char *dst, const char *src, size_t dsize)
|
|
||||||
{
|
|
||||||
const char *odst = dst;
|
|
||||||
const char *osrc = src;
|
|
||||||
size_t n = dsize;
|
|
||||||
size_t dlen;
|
|
||||||
|
|
||||||
/* Find the end of dst and adjust bytes left but don't go past end. */
|
|
||||||
while (n-- != 0 && *dst != '\0')
|
|
||||||
dst++;
|
|
||||||
dlen = dst - odst;
|
|
||||||
n = dsize - dlen;
|
|
||||||
|
|
||||||
if (n-- == 0)
|
|
||||||
return(dlen + strlen(src));
|
|
||||||
while (*src != '\0') {
|
|
||||||
if (n != 0) {
|
|
||||||
*dst++ = *src;
|
|
||||||
n--;
|
|
||||||
}
|
|
||||||
src++;
|
|
||||||
}
|
|
||||||
*dst = '\0';
|
|
||||||
|
|
||||||
return(dlen + (src - osrc)); /* count does not include NUL */
|
|
||||||
}
|
|
@ -25,10 +25,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
|
|
||||||
#undef strlcat
|
|
||||||
|
|
||||||
#include "extern/arg.h"
|
#include "extern/arg.h"
|
||||||
#include "extern/strlcat.h"
|
|
||||||
|
|
||||||
struct arg {
|
struct arg {
|
||||||
char *(*func)();
|
char *(*func)();
|
||||||
@ -811,9 +808,7 @@ main(int argc, char *argv[])
|
|||||||
element = smprintf("%s", UNKNOWN_STR);
|
element = smprintf("%s", UNKNOWN_STR);
|
||||||
warnx("Failed to format output");
|
warnx("Failed to format output");
|
||||||
}
|
}
|
||||||
if (strlcat(status_string, element, sizeof(status_string)) >= sizeof(status_string)) {
|
strncat(status_string, element, sizeof(status_string) - strlen(status_string) - 1);
|
||||||
warnx("Output too long");
|
|
||||||
}
|
|
||||||
free(res);
|
free(res);
|
||||||
free(element);
|
free(element);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user