[hackers] [wmii] Add strlcat to util.c instead of using the implementation from libixp.

changeset: 1990:d5df7522b510
tag: tip
user: Kris Maglione <jg_AT_suckless.org>
date: Sat Mar 03 12:36:44 2007 -0500
summary: Add strlcat to util.c instead of using the implementation from libixp.

diff -r c37613f80f35 -r d5df7522b510 client.c
--- a/client.c Sat Mar 03 12:09:36 2007 -0500
+++ b/client.c Sat Mar 03 12:36:44 2007 -0500
@@ -851,7 +851,7 @@ apply_tags(Client *c, const char *tags)
                 if(tags[n] != ' ' && tags[n] != '\t') break;
         if(tags[n] == '+' || tags[n] == '-')
                 strncpy(buf, c->tags, sizeof(c->tags));
- ixp_strlcat(buf, &tags[n], sizeof(buf));
+ strlcat(buf, &tags[n], sizeof(buf));
         trim(buf, " \t/");
 
         n = 0;
@@ -915,8 +915,8 @@ apply_tags(Client *c, const char *tags)
         for(i=0, n=0; i < j; i++)
                 if(!n || strcmp(toks[i], toks[n-1])) {
                         if(i)
- ixp_strlcat(c->tags, "+", sizeof(c->tags));
- ixp_strlcat(c->tags, toks[i], sizeof(c->tags));
+ strlcat(c->tags, "+", sizeof(c->tags));
+ strlcat(c->tags, toks[i], sizeof(c->tags));
                         toks[n++] = toks[i];
                 }
         toks[n] = nil;
diff -r c37613f80f35 -r d5df7522b510 util.c
--- a/util.c Sat Mar 03 12:09:36 2007 -0500
+++ b/util.c Sat Mar 03 12:36:44 2007 -0500
@@ -79,3 +79,67 @@ str_nil(char *s) {
                 return s;
         return "<nil>";
 }
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller_AT_courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * 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.
+ */
+uint
+strlcat(char *dst, const char *src, unsigned int siz) {
+ const char *s;
+ char *d;
+ unsigned int n, dlen;
+
+ n = siz;
+ s = src;
+ d = dst;
+
+ /* 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 -r c37613f80f35 -r d5df7522b510 wmii.h
--- a/wmii.h Sat Mar 03 12:09:36 2007 -0500
+++ b/wmii.h Sat Mar 03 12:36:44 2007 -0500
@@ -408,6 +408,7 @@ void fatal(const char *fmt, ...);
 void fatal(const char *fmt, ...);
 int max(int a, int b);
 char *str_nil(char *s);
+uint strlcat(char *dst, const char *src, unsigned int siz);
 
 /* view.c */
 void arrange_view(View *v);
Received on Sat Mar 03 2007 - 18:39:02 UTC