noice

small file browser
git clone git://git.2f30.org/noice.git
Log | Files | Refs | README | LICENSE

commit f4b5df5b3af4d367f2116ecb27100ac4befcc79b
parent cc88af72ca6a18925e28748cce854c514fbc7752
Author: sin <sin@2f30.org>
Date:   Fri Nov 14 09:59:19 +0000

Replace asprintf() with strlcpy() and strlcat()

Diffstat:
Makefile | 3++-
noice.c | 14+++++++++-----
strlcat.c | 52++++++++++++++++++++++++++++++++++++++++++++++++++++
util.h | 4++++
4 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile @@ -5,7 +5,7 @@ MANPREFIX = $(PREFIX)/man #CFLAGS += -g LDLIBS = -lncursesw -OBJ = noice.o strlcpy.o +OBJ = noice.o strlcat.o strlcpy.o BIN = noice all: $(BIN) @@ -14,6 +14,7 @@ $(BIN): $(OBJ) $(CC) $(CFLAGS) -o $@ $(OBJ) $(LDLIBS) noice.o: util.h config.h +strlcat.o: util.h strlcpy.o: util.h install: all diff --git a/noice.c b/noice.c @@ -458,13 +458,17 @@ makepath(char *dir, char *name) if (name[0] == '/') { path = xstrdup(name); } else { + path = xmalloc(PATH_MAX); /* Handle root case */ - if (strcmp(dir, "/") == 0) - asprintf(&path, "/%s", name); - else - asprintf(&path, "%s/%s", dir, name); + if (strcmp(dir, "/") == 0) { + strlcpy(path, "/", PATH_MAX); + strlcat(path, name, PATH_MAX); + } else { + strlcpy(path, dir, PATH_MAX); + strlcat(path, "/", PATH_MAX); + strlcat(path, name, PATH_MAX); + } } - return path; } diff --git a/strlcat.c b/strlcat.c @@ -0,0 +1,52 @@ +/* + * Copyright (c) 1998 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> + +#include "util.h" + +/* + * Appends src to string dst of size siz (unlike strncat, siz is the + * full size of dst, not space left). At most siz-1 characters + * will be copied. Always NUL terminates (unless siz <= strlen(dst)). + * Returns strlen(src) + MIN(siz, strlen(initial dst)). + * If retval >= siz, truncation occurred. + */ +size_t +strlcat(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + size_t dlen; + /* Find the end of dst and adjust bytes left but don't go past end */ + while (n-- != 0 && *d != '\0') + d++; + dlen = d - dst; + n = siz - dlen; + if (n == 0) + return(dlen + strlen(s)); + while (*s != '\0') { + if (n != 1) { + *d++ = *s; + n--; + } + s++; + } + *d = '\0'; + return(dlen + (s - src)); /* count does not include NUL */ +} diff --git a/util.h b/util.h @@ -1,2 +1,6 @@ +#include <stdarg.h> + +#undef strlcat +size_t strlcat(char *, const char *, size_t); #undef strlcpy size_t strlcpy(char *, const char *, size_t);