summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2006-09-27 16:29:46 +0000
committerTom Lane2006-09-27 16:29:46 +0000
commit3d774406804d8ec859d9a8f554cca836bd1a709a (patch)
tree545b0d187aa2d94a21f5de1cbeada645c2fa411a
parent49677f4100787d83db7b83c491d66cf3100eb70d (diff)
Add strlcpy() to the set of functions supported by src/port/ when not
available directly on the platform. Per discussion, this function is sufficiently widely recognized to be treated as standard.
-rwxr-xr-xconfigure3
-rw-r--r--configure.in2
-rw-r--r--src/include/pg_config.h.in3
-rw-r--r--src/include/port.h6
-rw-r--r--src/port/strlcpy.c67
5 files changed, 78 insertions, 3 deletions
diff --git a/configure b/configure
index 5396f8a81e..9372e37f36 100755
--- a/configure
+++ b/configure
@@ -14505,7 +14505,8 @@ fi
-for ac_func in crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strtol strtoul unsetenv
+
+for ac_func in crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strlcpy strtol strtoul unsetenv
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/configure.in b/configure.in
index 0f055f3dee..76bf261132 100644
--- a/configure.in
+++ b/configure.in
@@ -958,7 +958,7 @@ else
AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break])
fi
-AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strtol strtoul unsetenv])
+AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strlcpy strtol strtoul unsetenv])
# System's version of getaddrinfo(), if any, may be used only if we found
# a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 2acfac6318..7098eafb6f 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -375,6 +375,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
/* Define to 1 if you have the `strtol' function. */
#undef HAVE_STRTOL
diff --git a/src/include/port.h b/src/include/port.h
index 6bc7022ce7..e3cf7d816a 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -329,7 +329,11 @@ extern int inet_aton(const char *cp, struct in_addr * addr);
#endif
#ifndef HAVE_STRDUP
-extern char *strdup(char const *);
+extern char *strdup(const char *str);
+#endif
+
+#ifndef HAVE_STRLCPY
+extern size_t strlcpy(char *dst, const char *src, size_t siz);
#endif
#ifndef HAVE_RANDOM
diff --git a/src/port/strlcpy.c b/src/port/strlcpy.c
new file mode 100644
index 0000000000..7da5d3e290
--- /dev/null
+++ b/src/port/strlcpy.c
@@ -0,0 +1,67 @@
+/*-------------------------------------------------------------------------
+ *
+ * strlcpy.c
+ * strncpy done right
+ *
+ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ * $PostgreSQL$
+ *
+ * This file was taken from OpenBSD and is used on platforms that don't
+ * provide strlcpy(). The OpenBSD copyright terms follow.
+ *-------------------------------------------------------------------------
+ */
+
+/* $OpenBSD$ */
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <[email protected]>
+ *
+ * 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 "c.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
+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 */
+}