Loading...
--- Libc/Libc-391.5.21/string/FreeBSD/strcat.3.patch
+++ Libc/Libc-763.12/string/FreeBSD/strcat.3.patch
@@ -1,6 +1,67 @@
---- strcat.3.orig Fri May 28 16:23:18 2004
-+++ strcat.3 Fri May 28 16:23:32 2004
-@@ -114,7 +114,7 @@
+--- strcat.3.orig 2010-06-17 08:44:44.000000000 -0700
++++ strcat.3 2010-06-17 08:46:22.000000000 -0700
+@@ -44,9 +44,16 @@
+ .Sh SYNOPSIS
+ .In string.h
+ .Ft char *
+-.Fn strcat "char * restrict s" "const char * restrict append"
++.Fo strcat
++.Fa "char *restrict s1"
++.Fa "const char *restrict s2"
++.Fc
+ .Ft char *
+-.Fn strncat "char * restrict s" "const char * restrict append" "size_t count"
++.Fo strncat
++.Fa "char *restrict s1"
++.Fa "const char *restrict s2"
++.Fa "size_t n"
++.Fc
+ .Sh DESCRIPTION
+ The
+ .Fn strcat
+@@ -54,24 +61,27 @@ and
+ .Fn strncat
+ functions
+ append a copy of the null-terminated string
+-.Fa append
++.Fa s2
+ to the end of the null-terminated string
+-.Fa s ,
++.Fa s1 ,
+ then add a terminating
+ .Ql \e0 .
+ The string
+-.Fa s
++.Fa s1
+ must have sufficient space to hold the result.
+ .Pp
+ The
+ .Fn strncat
+ function
+ appends not more than
+-.Fa count
++.Fa n
+ characters from
+-.Fa append ,
++.Fa s2 ,
+ and then adds a terminating
+ .Ql \e0 .
++.Pp
++The source and destination strings should not overlap, as the
++behavior is undefined.
+ .Sh RETURN VALUES
+ The
+ .Fn strcat
+@@ -79,7 +89,7 @@ and
+ .Fn strncat
+ functions
+ return the pointer
+-.Fa s .
++.Fa s1 .
+ .Sh SECURITY CONSIDERATIONS
+ The
+ .Fn strcat
+@@ -111,7 +121,7 @@ Example:
void
foo(const char *arbitrary_string)
{
@@ -9,15 +70,3 @@
#if defined(BAD)
/*
-@@ -149,11 +149,6 @@
- .Xr strcpy 3 ,
- .Xr strlcat 3 ,
- .Xr strlcpy 3
--.Rs
--.%T "The FreeBSD Security Architecture"
--.Re
--(See
--.Pa "/usr/share/doc/{to be decided}" . )
- .Sh STANDARDS
- The
- .Fn strcat