[xiph-commits] r12527 - trunk/ezstream/src
moritz at svn.xiph.org
moritz at svn.xiph.org
Sat Feb 24 12:57:05 PST 2007
Author: moritz
Date: 2007-02-24 12:57:02 -0800 (Sat, 24 Feb 2007)
New Revision: 12527
Added:
trunk/ezstream/src/strlcat.c
trunk/ezstream/src/strlcpy.c
trunk/ezstream/src/strlfctns.h
Modified:
trunk/ezstream/src/Makefile.am
Log:
Add files with safe strlc*() string functions, and hook all new files into
Makefile.am. Also let "make clean" clean up coredumps and editor backup files.
Modified: trunk/ezstream/src/Makefile.am
===================================================================
--- trunk/ezstream/src/Makefile.am 2007-02-24 20:52:57 UTC (rev 12526)
+++ trunk/ezstream/src/Makefile.am 2007-02-24 20:57:02 UTC (rev 12527)
@@ -4,14 +4,15 @@
bin_PROGRAMS = ezstream
-ezstream_SOURCES = ezstream.c configfile.c
-ezstream_LDADD = @XIPH_LIBS@
+ezstream_SOURCES = ezstream.c configfile.c playlist.c util.c
+ezstream_LDADD = @LIBOBJS@ @XIPH_LIBS@
AM_CFLAGS = @XIPH_CFLAGS@
AM_CPPFLAGS = @XIPH_CPPFLAGS@
-EXTRA_DIST = getopt.c getopt.h configfile.h
+EXTRA_DIST = ezsignals.h getopt.h strlfctns.h configfile.h playlist.h util.h
+CLEANFILES = core *.core *~ .*~
debug:
$(MAKE) all CFLAGS="@DEBUG@"
Added: trunk/ezstream/src/strlcat.c
===================================================================
--- trunk/ezstream/src/strlcat.c 2007-02-24 20:52:57 UTC (rev 12526)
+++ trunk/ezstream/src/strlcat.c 2007-02-24 20:57:02 UTC (rev 12527)
@@ -0,0 +1,61 @@
+/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller at 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <string.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
+local_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 */
+}
Added: trunk/ezstream/src/strlcpy.c
===================================================================
--- trunk/ezstream/src/strlcpy.c 2007-02-24 20:52:57 UTC (rev 12526)
+++ trunk/ezstream/src/strlcpy.c 2007-02-24 20:57:02 UTC (rev 12527)
@@ -0,0 +1,57 @@
+/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller at 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <string.h>
+
+/*
+ * Copy src to string dst of size siz. At most siz-1 characters
+ * will be copied. Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+local_strlcpy(char *dst, const char *src, size_t siz)
+{
+ char *d = dst;
+ const char *s = src;
+ size_t n = siz;
+
+ /* Copy as many bytes as will fit */
+ if (n != 0) {
+ while (--n != 0) {
+ if ((*d++ = *s++) == '\0')
+ break;
+ }
+ }
+
+ /* Not enough room in dst, add NUL and traverse rest of src */
+ if (n == 0) {
+ if (siz != 0)
+ *d = '\0'; /* NUL-terminate dst */
+ while (*s++)
+ ;
+ }
+
+ return(s - src - 1); /* count does not include NUL */
+}
Added: trunk/ezstream/src/strlfctns.h
===================================================================
--- trunk/ezstream/src/strlfctns.h 2007-02-24 20:52:57 UTC (rev 12526)
+++ trunk/ezstream/src/strlfctns.h 2007-02-24 20:57:02 UTC (rev 12527)
@@ -0,0 +1,18 @@
+#ifndef __STRLFCTNS_H__
+#define __STRLFCTNS_H__
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifndef HAVE_STRLCAT
+# define strlcat local_strlcat
+#endif
+size_t local_strlcat(char *, const char *, size_t);
+
+#ifndef HAVE_STRLCPY
+# define strlcpy local_strlcpy
+#endif
+size_t local_strlcpy(char *, const char *, size_t);
+
+#endif /* __STRLFCTNS_H__ */
More information about the commits
mailing list