From: Pietro Cerutti <gahr@gahr.ch>
Date: Thu, 12 Jan 2017 17:11:32 +0000 (+0000)
Subject: build: Kill any references to strdup
X-Git-Tag: neomutt-20170128~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84461dc3b41f6e91b2c01cce2a1c8b2882cc79b1;p=neomutt

build: Kill any references to strdup

Closes #296
---

diff --git a/configure.ac b/configure.ac
index 373c97ce9..849e41a9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -492,7 +492,7 @@ AC_CHECK_TYPE(ssize_t, int)
 
 AC_CHECK_FUNCS(fgetpos memmove setegid srand48 strerror)
 
-AC_REPLACE_FUNCS([setenv strcasecmp strdup strsep strtok_r wcscasecmp])
+AC_REPLACE_FUNCS([setenv strcasecmp strsep strtok_r wcscasecmp])
 AC_REPLACE_FUNCS([strcasestr mkdtemp])
 
 AC_CHECK_FUNC(getopt)
diff --git a/dotlock.c b/dotlock.c
index 6fe814449..a2a4ad747 100644
--- a/dotlock.c
+++ b/dotlock.c
@@ -97,7 +97,7 @@ static int DotlockFlags;
 static int Retry = MAXLOCKATTEMPT;
 
 #ifdef DL_STANDALONE
-static char *Hostname;
+struct utsname utsname;
 #endif
 
 #ifdef USE_SETGID
@@ -138,7 +138,6 @@ int main (int argc, char **argv)
 {
   int i;
   char *p;
-  struct utsname utsname;
 
   /* first, drop privileges */
   
@@ -149,9 +148,7 @@ int main (int argc, char **argv)
   /* determine the system's host name */
   
   uname (&utsname);
-  if (!(Hostname = strdup (utsname.nodename)))	/* __MEM_CHECKED__ */
-    return DL_EX_ERROR;
-  if ((p = strchr (Hostname, '.')))
+  if ((p = strchr (utsname.nodename, '.')))
     *p = '\0';
 
 
@@ -596,7 +593,13 @@ dotlock_lock (const char *realpath)
   time_t t;
   
   snprintf (nfslockfile, sizeof (nfslockfile), "%s.%s.%d",
-	   realpath, Hostname, (int) getpid ());
+       realpath,
+#ifdef DL_STANDALONE
+       utsname.nodename,
+#else
+       Hostname,
+#endif
+       (int) getpid ());
   snprintf (lockfile, sizeof (lockfile), "%s.lock", realpath);
 
   
diff --git a/protos.h b/protos.h
index 9fb5a1afb..583295e92 100644
--- a/protos.h
+++ b/protos.h
@@ -573,10 +573,6 @@ int strcasecmp (char *, char *);
 int strncasecmp (char *, char *, size_t);
 #endif
 
-#ifndef HAVE_STRDUP
-char *strdup (const char *);
-#endif
-
 #ifndef HAVE_STRSEP
 char *strsep (char **, const char *);
 #endif
diff --git a/strdup.c b/strdup.c
deleted file mode 100644
index 0249a058f..000000000
--- a/strdup.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ultrix doesn't have strdup */
-
-#include <string.h>
-#include <stdlib.h>
-
-char *strdup (const char *s)	/* __MEM_CHECKED__ */
-{
-  char *d;
-  
-  if (s == NULL)
-    return NULL;
-  
-  if ((d = malloc (strlen (s) + 1)) == NULL)	/* __MEM_CHECKED__ */
-    return NULL;
-
-  memcpy (d, s, strlen (s) + 1);
-  return d;
-}
-