Use krb5_error_code for return value of krb5 library functions.

[moira.git] / lib / strs.c

diff --git a/lib/strs.c b/lib/strs.c
index 2980e9b38f9df2ba00d2cd907ed3605fef6b4d0a..36598ed2f7a2fff586b85b548fd295b4497ffc5d 100644 (file)
--- a/lib/strs.c
+++ b/lib/strs.c
@@ -1,4 +1,4 @@
-/* $Id $
+/* $Id$
  *
  * Miscellaneous string functions.
  *
@@ -27,7 +27,8 @@ char *strtrim(char *save)
   /* skip to end of string */
   if (*s == '\0')
     {
-      *save = '\0';
+      if (*save)
+       *save = '\0';
       return save;
     }
 
@@ -74,3 +75,43 @@ char *lowercase(char *s)
     }
   return s;
 }
+
+#ifndef HAVE_STRLCPY
+/* Copy as much of SRC will fit into a DST of size SIZE, always
+ * NUL-terminating. (Originally from OpenBSD.)
+ */
+size_t strlcpy(char *dst, const char *src, size_t size)
+{
+  size_t len = strlen(src);
+
+  if (len < size)
+    memcpy(dst, src, len + 1);
+  else
+    {
+      memcpy(dst, src, size - 1);
+      dst[size - 1] = '\0';
+    }
+  return len;
+}
+#endif
+
+#ifndef HAVE_STRLCAT
+/* Catenate as must of SRC will fit onto the end of DST, which is
+ * in a buffer of size SIZE, always NUL-terminating. (Originally
+ * from OpenBSD.)
+ */
+size_t strlcat(char *dst, const char *src, size_t size)
+{
+  size_t dlen = strlen(dst);
+  size_t slen = strlen(src);
+
+  if (dlen + slen < size)
+    memcpy(dst + dlen, src, slen + 1);
+  else
+    {
+      memcpy(dst + dlen, src, size - dlen - 1);
+      dst[size - 1] = '\0';
+    }
+  return dlen + slen;
+}
+#endif