X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.c;h=974a29eac035afca6a158deafbe4e56bfae2be52;hb=b7a5d1ddb9fa3a650c2886efc3d92142f028ea0d;hp=1addb323673814a5d8375f3114efaa654fa652f5;hpb=e71b0716ca4c0a3df8ffae073d66535a7f61d70e;p=collectd.git

diff --git a/src/common.c b/src/common.c
index 1addb323..974a29ea 100644
--- a/src/common.c
+++ b/src/common.c
@@ -27,8 +27,12 @@
 #include "common.h"
 #include "plugin.h"
 
+#if HAVE_PTHREAD_H
+# include <pthread.h>
+#endif
+
 #ifdef HAVE_MATH_H
-#  include <math.h>
+# include <math.h>
 #endif
 
 /* for ntohl and htonl */
@@ -40,6 +44,10 @@
 extern kstat_ctl_t *kc;
 #endif
 
+#if !HAVE_GETPWNAM_R
+static pthread_mutex_t getpwnam_r_lock = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
 void sstrncpy (char *d, const char *s, int len)
 {
 	strncpy (d, s, len);
@@ -62,12 +70,35 @@ char *sstrdup (const char *s)
 	return (r);
 }
 
-/* Don't use the return value of `strerror_r', because the GNU-people got
- * inventive there.. -octo */
+/* Even though Posix requires "strerror_r" to return an "int",
+ * some systems (e.g. the GNU libc) return a "char *" _and_
+ * ignore the second argument ... -tokkee */
 char *sstrerror (int errnum, char *buf, size_t buflen)
 {
 	buf[0] = '\0';
-	strerror_r (errnum, buf, buflen);
+#ifdef STRERROR_R_CHAR_P
+	{
+		char *temp;
+		temp = strerror_r (errnum, buf, buflen);
+		if (buf[0] == '\0')
+		{
+			if ((temp != NULL) && (temp != buf) && (temp[0] != '\0'))
+				strncpy (buf, temp, buflen);
+			else
+				strncpy (buf, "strerror_r did not return "
+						"an error message", buflen);
+			buf[buflen - 1] = '\0';
+		}
+	}
+#else
+	if (strerror_r (errnum, buf, buflen) != 0)
+	{
+		snprintf (buf, buflen, "Error #%i; "
+				"Additionally, strerror_r failed.",
+				errnum);
+	}
+#endif /* STRERROR_R_CHAR_P */
+	buf[buflen - 1] = '\0';
 	return (buf);
 } /* char *sstrerror */
 
@@ -390,7 +421,7 @@ int check_create_dir (const char *file_orig)
 				if (mkdir (dir, 0755) == -1)
 				{
 					char errbuf[1024];
-					ERROR ("mkdir (%s): %s", dir,
+					ERROR ("check_create_dir: mkdir (%s): %s", dir,
 							sstrerror (errno,
 								errbuf, sizeof (errbuf)));
 					return (-1);
@@ -413,7 +444,7 @@ int check_create_dir (const char *file_orig)
 	}
 
 	return (0);
-}
+} /* check_create_dir */
 
 #ifdef HAVE_LIBKSTAT
 int get_kstat (kstat_t **ksp_ptr, char *module, int instance, char *name)
@@ -643,3 +674,56 @@ int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds)
 		return (-1);
 	return (0);
 } /* int parse_values */
+
+#if !HAVE_GETPWNAM_R
+int getpwnam_r (const char *name, struct passwd *pwbuf, char *buf,
+		size_t buflen, struct passwd **pwbufp)
+{
+	int status = 0;
+	struct passwd *pw;
+
+	memset (pwbuf, '\0', sizeof (struct passwd));
+
+	pthread_mutex_lock (&getpwnam_r_lock);
+
+	do
+	{
+		pw = getpwnam (name);
+		if (pw == NULL)
+		{
+			status = (errno != 0) ? errno : ENOENT;
+			break;
+		}
+
+#define GETPWNAM_COPY_MEMBER(member) \
+		if (pw->member != NULL) \
+		{ \
+			int len = strlen (pw->member); \
+			if (len >= buflen) \
+			{ \
+				status = ENOMEM; \
+				break; \
+			} \
+			sstrncpy (buf, pw->member, buflen); \
+			pwbuf->member = buf; \
+			buf    += (len + 1); \
+			buflen -= (len + 1); \
+		}
+		GETPWNAM_COPY_MEMBER(pw_name);
+		GETPWNAM_COPY_MEMBER(pw_passwd);
+		GETPWNAM_COPY_MEMBER(pw_gecos);
+		GETPWNAM_COPY_MEMBER(pw_dir);
+		GETPWNAM_COPY_MEMBER(pw_shell);
+
+		pwbuf->pw_uid = pw->pw_uid;
+		pwbuf->pw_gid = pw->pw_gid;
+
+		if (pwbufp != NULL)
+			*pwbufp = pwbuf;
+	} while (0);
+
+	pthread_mutex_unlock (&getpwnam_r_lock);
+
+	return (status);
+} /* int getpwnam_r */
+#endif