ncmixer

ncurses audio mixer for DJ'ing
git clone git://git.2f30.org/ncmixer.git
Log | Files | Refs | README | LICENSE

commit 19e10ab036157daff682f965233cb3ec350b4d5d
parent c31dd101cf991146aebb311d70083f97ba7f973a
Author: lostd <lostd@2f30.org>
Date:   Fri, 18 Nov 2016 11:45:18 +0000

Fix Makefile and build on Linux

Diffstat:
Makefile | 17+++++++++++------
mixerd.c | 1+
ncmixerc.c | 1+
strlcat.c | 55+++++++++++++++++++++++++++++++++++++++++++++++++++++++
strlcpy.c | 50++++++++++++++++++++++++++++++++++++++++++++++++++
util.h | 4++++
6 files changed, 122 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile @@ -2,17 +2,22 @@ VERSION = 0.1 CPPFLAGS = -DDEBUG -I/usr/local/include CFLAGS = -Wall -g LDFLAGS = -L/usr/local/lib -LDLIBS = -lsndio -lcurses -lm -lshout -lmp3lame -DISTFILES = arg.h mixerd.c ncmixerc.c proto.h LICENSE Makefile README patches -NCMIXERC_OBJ = ncmixerc.o +DISTFILES = arg.h mixerd.c ncmixerc.c proto.h LICENSE Makefile README patches\ + util.h strlcpy.c strlcat.c NCMIXERC_BIN = ncmixerc -MIXERD_OBJ = mixerd.o +NCMIXERC_OBJ = ncmixerc.o strlcpy.o +NCMIXERC_LIBS = -lcurses -lm MIXERD_BIN = mixerd +MIXERD_OBJ = mixerd.o strlcpy.o strlcat.o +MIXERD_LIBS = -lsndio -lshout -lmp3lame all: $(NCMIXERC_BIN) $(MIXERD_BIN) -NCMIXERC_BIN: $(NCMIXERC_OBJ) -MIXERD_BIN: $(MIXERD_OBJ) +$(NCMIXERC_BIN): $(NCMIXERC_OBJ) + $(CC) -o $@ $(NCMIXERC_OBJ) $(LDFLAGS) $(NCMIXERC_LIBS) + +$(MIXERD_BIN): $(MIXERD_OBJ) + $(CC) -o $@ $(MIXERD_OBJ) $(LDFLAGS) $(MIXERD_LIBS) dist: mkdir -p ncmixer-$(VERSION) diff --git a/mixerd.c b/mixerd.c @@ -22,6 +22,7 @@ #include "arg.h" #include "proto.h" +#include "util.h" #define LEN(x) (sizeof (x) / sizeof *(x)) #undef MIN diff --git a/ncmixerc.c b/ncmixerc.c @@ -13,6 +13,7 @@ #include <unistd.h> #include "proto.h" +#include "util.h" #define LEN(x) (sizeof (x) / sizeof *(x)) #undef MIN diff --git a/strlcat.c b/strlcat.c @@ -0,0 +1,55 @@ +/* + * 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> + +#include "util.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 */ +} diff --git a/strlcpy.c b/strlcpy.c @@ -0,0 +1,50 @@ +/* + * 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> + +#include "util.h" + +/* + * Copy string src to buffer dst of size dsize. At most dsize-1 + * chars will be copied. Always NUL terminates (unless dsize == 0). + * Returns strlen(src); if retval >= dsize, truncation occurred. + */ +size_t +strlcpy(char *dst, const char *src, size_t dsize) +{ + const char *osrc = src; + size_t nleft = dsize; + + /* Copy as many bytes as will fit. */ + if (nleft != 0) { + while (--nleft != 0) { + if ((*dst++ = *src++) == '\0') + break; + } + } + + /* Not enough room in dst, add NUL and traverse rest of src. */ + if (nleft == 0) { + if (dsize != 0) + *dst = '\0'; /* NUL-terminate dst */ + while (*src++) + ; + } + + return(src - osrc - 1); /* count does not include NUL */ +} diff --git a/util.h b/util.h @@ -0,0 +1,4 @@ +#undef strlcat +size_t strlcat(char *, const char *, size_t); +#undef strlcpy +size_t strlcpy(char *, const char *, size_t);