X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=string.c;h=d8bd027b7010a149be59b8883b3e5ee685fb3c01;hb=HEAD;hp=46b346235f17ffb696f43d22d3dcfde4c75ba4ca;hpb=68c0deb1ae25af923fde02952159c1129a281813;p=paraslash.git

diff --git a/string.c b/string.c
index 46b34623..d8bd027b 100644
--- a/string.c
+++ b/string.c
@@ -308,15 +308,32 @@ __must_check __malloc char *para_logname(void)
 }
 
 /**
- * Get the home directory of the current user.
+ * Get the home directory of the calling user.
  *
  * \return A dynamically allocated string that must be freed by the caller. If
- * the home directory could not be found, this function returns "/tmp".
+ * no entry is found which matches the UID of the calling process, or any other
+ * error occurs, the function prints an error message and aborts.
+ *
+ * \sa getpwuid(3), getuid(2).
  */
 __must_check __malloc char *para_homedir(void)
 {
-	struct passwd *pw = getpwuid(getuid());
-	return para_strdup(pw? pw->pw_dir : "/tmp");
+	struct passwd *pw;
+
+	/*
+	 * To distinguish between the error case and the "not found" case we
+	 * have to check errno after getpwuid(3). The manual page recommends to
+	 * set it to zero before the call.
+	 */
+	errno = 0;
+	pw = getpwuid(getuid());
+	if (pw)
+		return para_strdup(pw->pw_dir);
+	if (errno != 0)
+		PARA_EMERG_LOG("getpwuid error: %s\n", strerror(errno));
+	else
+		PARA_EMERG_LOG("no pw entry for uid %u\n", (unsigned)getuid());
+	exit(EXIT_FAILURE);
 }
 
 /**
@@ -739,13 +756,11 @@ void free_argv(char **argv)
 static int create_argv_offset(int offset, const char *buf, const char *delim,
 		char ***result)
 {
-	char *word, **argv = arr_alloc(offset + 1, sizeof(char *));
+	char *word, **argv = arr_zalloc(offset + 1, sizeof(char *));
 	const char *p;
 	int i, ret;
 
-	for (i = 0; i < offset; i++)
-		argv[i] = NULL;
-	for (p = buf; p && *p; p += ret, i++) {
+	for (p = buf, i = offset; p && *p; p += ret, i++) {
 		ret = get_next_word(p, delim, &word);
 		if (ret < 0)
 			goto err;