1 files changed, 10 insertions, 52 deletions

diff --git a/src/lib/libc/string/__strsignal.c b/src/lib/libc/string/stpcpy.c
index 1937e2d608..d3d61e0f14 100644
--- a/src/lib/libc/string/__strsignal.c
+++ b/src/lib/libc/string/stpcpy.c
@@ -1,3 +1,5 @@
+/*      $OpenBSD: stpcpy.c,v 1.1 2012/01/17 02:48:01 guenther Exp $     */
+
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -10,11 +12,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,56 +29,16 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)strerror.c   5.6 (Berkeley) 5/4/91";*/
-static char *rcsid = "$Id: __strsignal.c,v 1.1.1.1 1995/10/18 08:42:20 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
+#include <string.h>
 
-#ifdef NLS
-#define catclose        _catclose
-#define catgets         _catgets
-#define catopen         _catopen
-#include <nl_types.h>
+#if defined(APIWARN)
+__warn_references(stpcpy,
+    "warning: stpcpy() is dangerous GNU crap; don't use it");
 #endif
 
-#define sys_siglist     _sys_siglist
-
-#include <stdio.h>
-#include <signal.h>
-#include <string.h>
-
 char *
-__strsignal(num, buf)
-        int num;
-        char *buf;
+stpcpy(char *to, const char *from)
 {
-#define UPREFIX "Unknown signal: %u"
-        register unsigned int signum;
-
-#ifdef NLS
-        nl_catd catd ;
-        catd = catopen("libc", 0);
-#endif
-
-        signum = num;                           /* convert to unsigned */
-        if (signum < NSIG) {
-#ifdef NLS
-                strcpy(buf, catgets(catd, 2, signum,
-                    (char *)sys_siglist[signum])); 
-#else
-                return((char *)sys_siglist[signum]);
-#endif
-        } else {
-#ifdef NLS
-                sprintf(buf, catgets(catd, 1, 0xffff, UPREFIX), signum);
-#else
-                sprintf(buf, UPREFIX, signum);
-#endif
-        }
-
-#ifdef NLS
-        catclose(catd);
-#endif
-
-        return buf;
+        for (; (*to = *from) != '\0'; ++from, ++to);
+        return(to);
 }