-/*
- * $Source$
- * $Author$
- * $Header$
+/* $Id$
*
- * Copyright (C) 1987 by the Massachusetts Institute of Technology
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Miscellaneous string functions.
*
- * Miscellaneous string functions.
+ * Copyright (C) 1987-1998 by the Massachusetts Institute of Technology
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
*/
-#ifndef lint
-static char *rcsid_strs_c = "$Header$";
-#endif lint
-
#include <mit-copyright.h>
-#include <sys/types.h>
-#include <string.h>
-#include <ctype.h>
+#include <moira.h>
-extern char *malloc(), *realloc();
+#include <ctype.h>
-/*
- * Random string functions which should be in the C library..
- */
+RCSID("$Header$");
-/*
- * Make a copy of a string.
- */
-char *
-strsave(s)
- char *s;
-{
- register int len;
- register char *p;
- /* Kludge for sloppy string semantics */
- if (!s) {
- printf("NULL != \"\" !!!!\r\n");
- p = malloc(1);
- *p = '\0';
- return p;
- }
- len = strlen(s) + 1;
- p = malloc((u_int)len);
- if (p) bcopy(s, p, len);
- return p;
-}
/*
* Trim whitespace off both ends of a string.
*/
-char *strtrim(save)
- register char *save;
+char *strtrim(char *save)
{
- register char *t, *s;
-
- s = save;
- while (isspace(*s)) s++;
- /* skip to end of string */
- if (*s == '\0') {
+ char *t, *s;
+
+ s = save;
+ while (isspace(*s))
+ s++;
+ /* skip to end of string */
+ if (*s == '\0')
+ {
+ if (*save)
*save = '\0';
- return(save);
+ return save;
}
- for (t = s; *t; t++) continue;
- while (t > s) {
- --t;
- if (!isspace(*t)) {
- t++;
- break;
+ for (t = s; *t; t++)
+ continue;
+ while (t > s)
+ {
+ --t;
+ if (!isspace(*t))
+ {
+ t++;
+ break;
}
}
+ if (*t)
*t = '\0';
- return s;
+ return s;
}
/* Modify a string for all of the letters to be uppercase. */
-char *uppercase(s)
-char *s;
+char *uppercase(char *s)
{
- register char *p;
+ char *p;
- for (p = s; *p; p++)
+ for (p = s; *p; p++)
+ {
if (islower(*p))
*p = toupper(*p);
- return(s);
+ }
+ return s;
}
-char *lowercase(s)
-char *s;
+char *lowercase(char *s)
{
- register char *p;
+ char *p;
- for (p = s; *p; p++)
+ for (p = s; *p; p++)
+ {
if (isupper(*p))
*p = tolower(*p);
- return(s);
+ }
+ return s;
}
-
-#ifdef NEED_STRCASECMP
-
-/* Case independant string comparison. Only compile this if your C
- * library doesn't have a local routine which is faster.
+#ifndef HAVE_STRLCPY
+/* Copy as much of SRC will fit into a DST of size SIZE, always
+ * NUL-terminating. (Originally from OpenBSD.)
*/
-
-static char map[] = {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- ' ', '!', '"', '#', '$', '%', '&', '\'',
- '(', ')', '*', '+', ',', '-', '.', '/',
- '0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', ':', ';', '<', '=', '>', '?',
- '@', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
- 'h', 'i', 'k', 'j', 'l', 'm', 'n', 'o',
- 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
- 'x', 'y', 'z', '[', '\\', ']', '^', '_',
- '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
- 'h', 'i', 'k', 'j', 'l', 'm', 'n', 'o',
- 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
- 'x', 'y', 'z', '{', '|', '}', '~', 127,
- 128, 129, 130, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151,
- 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167,
- 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199,
- 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215,
- 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 225, 226, 227, 228, 229, 230, 231,
- 232, 233, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247,
- 248, 249, 250, 251, 252, 253, 254, 255
-};
-
-
-int strcasecmp(s1, s2)
-char *s1;
-char *s2;
+size_t strlcpy(char *dst, const char *src, size_t size)
{
- while (map[*s1] == map[*s2]) {
- if (*s1 == 0)
- return(0);
- s1++;
- s2++;
+ size_t len = strlen(src);
+
+ if (len < size)
+ memcpy(dst, src, len + 1);
+ else
+ {
+ memcpy(dst, src, size - 1);
+ dst[size - 1] = '\0';
}
- return(map[*s1] - map[*s2]);
+ return len;
}
+#endif
-#endif /* NEED_STRCASECMP */
+#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
andersk / moira.git / blobdiff