From 216cf2acb664e8d7f8a47857a942adba43d0fec2 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 4 Jan 2010 13:34:39 +0200
Subject: [PATCH] Remove unneeded strdup() replacement in misc/ - rpmio's own
 version is always there and portable, this is not needed

---
 misc/Makefile.am |  2 +-
 misc/strdup.c    | 43 -------------------------------------------
 rpmio/stubs.c    |  4 ----
 3 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 misc/strdup.c

diff --git a/misc/Makefile.am b/misc/Makefile.am
index b85b027..eb921ee 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = \
 	getcwd.c	getmntent.c	\
 	getwd.c		glob.c		glob.h		\
 	myrealloc.c	putenv.c	realpath.c	\
-	setenv.c	stpcpy.c	stpncpy.c	strdup.c
+	setenv.c	stpcpy.c	stpncpy.c
 
 noinst_LTLIBRARIES = libmisc.la
 
diff --git a/misc/strdup.c b/misc/strdup.c
deleted file mode 100644
index cc50aa4..0000000
--- a/misc/strdup.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* strdup.c -- return a newly allocated copy of a string
-   Copyright (C) 1990 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef STDC_HEADERS
-#include <string.h>
-#include <stdlib.h>
-#else
-char *malloc ();
-char *strcpy ();
-#endif
-
-/* Return a newly allocated copy of STR,
-   or 0 if out of memory. */
-
-char *
-strdup (str)
-     const char *str;
-{
-  char *newstr;
-
-  newstr = (char *) malloc (strlen (str) + 1);
-  if (newstr)
-    strcpy (newstr, str);
-  return newstr;
-}
diff --git a/rpmio/stubs.c b/rpmio/stubs.c
index 520c832..68d6426 100644
--- a/rpmio/stubs.c
+++ b/rpmio/stubs.c
@@ -42,10 +42,6 @@
 #include "misc/stpncpy.c"
 #endif
 
-#if !defined(HAVE_STRSPN)
-#include "misc/strdup.c"
-#endif
-
 #if defined(USE_GNU_GLOB)
 #include "misc/fnmatch.h"
 #include "misc/fnmatch.c"
-- 
2.7.4