X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.c;h=701448e041cfa9ff86dc1a6cccf37cd088b76c20;hp=38e25b09c5f3ff2b289d6e943a0f7bde3bfc23ad;hb=a7b65e41e2062c44c535f7cb4609e7988fc8ac0d;hpb=79d6515d49cdb0a91ff7c4a599f2d63cb5678032

diff --git a/string.c b/string.c
index 38e25b09..701448e0 100644
--- a/string.c
+++ b/string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -31,12 +31,12 @@
  * A wrapper for realloc(3). It calls \p exit(\p EXIT_FAILURE) on errors,
  * i.e. there is no need to check the return value in the caller.
  *
- * \return A pointer to  the newly allocated memory, which is suitably aligned
- * for any kind of variable and may be different from \a p.
+ * \return A pointer to newly allocated memory which is suitably aligned for
+ * any kind of variable and may be different from \a p.
  *
  * \sa realloc(3).
  */
-__must_check __malloc void *para_realloc(void *p, size_t size)
+__must_check void *para_realloc(void *p, size_t size)
 {
 	/*
 	 * No need to check for NULL pointers: If p is NULL, the call
@@ -298,24 +298,6 @@ __must_check char *para_basename(const char *name)
 	return ret;
 }
 
-/**
- * Cut trailing newline.
- *
- * \param buf The string to be chopped.
- *
- * Replace the last character in \p buf by zero if it is equal to
- * the newline character.
- */
-void chop(char *buf)
-{
-	int n = strlen(buf);
-
-	if (!n)
-		return;
-	if (buf[n - 1] == '\n')
-		buf[n - 1] = '\0';
-}
-
 /**
  * Get the logname of the current user.
  *
@@ -398,14 +380,13 @@ int for_each_line(unsigned flags, char *buf, size_t size,
 		char *next_cr;
 
 		next_cr = memchr(start, '\n', buf + size - start);
-		next_null = memchr(start, '\0', buf + size - start);
+		next_null = memchr(start, '\0', next_cr?
+			next_cr - start : buf + size - start);
 		if (!next_cr && !next_null)
 			break;
-		if (next_cr && next_null) {
-			end = next_cr < next_null? next_cr : next_null;
-		} else if (next_null) {
+		if (next_null)
 			end = next_null;
-		} else
+		else
 			end = next_cr;
 		num_lines++;
 		if (!(flags & FELF_DISCARD_FIRST) || start != buf) {
@@ -581,10 +562,18 @@ int para_atoi64(const char *str, int64_t *value)
 	tmp = strtoll(str, &endptr, 10);
 	if (errno == ERANGE && (tmp == LLONG_MAX || tmp == LLONG_MIN))
 		return -E_ATOI_OVERFLOW;
-	if (errno != 0 && tmp == 0) /* other error */
-		return -E_STRTOLL;
+	/*
+	 * If there were no digits at all, strtoll() stores the original value
+	 * of str in *endptr.
+	 */
 	if (endptr == str)
 		return -E_ATOI_NO_DIGITS;
+	/*
+	 * The implementation may also set errno and return 0 in case no
+	 * conversion was performed.
+	 */
+	if (errno != 0 && tmp == 0)
+		return -E_ATOI_NO_DIGITS;
 	if (*endptr != '\0') /* Further characters after number */
 		return -E_ATOI_JUNK_AT_END;
 	*value = tmp;
@@ -644,7 +633,7 @@ int get_loglevel_by_name(const char *txt)
 		return LL_CRIT;
 	if (loglevel_equal(txt, "emerg"))
 		return LL_EMERG;
-	return -1;
+	return -E_BAD_LL;
 }
 
 static int get_next_word(const char *buf, const char *delim, char **word)
@@ -1084,7 +1073,7 @@ __must_check int strwidth(const char *s, size_t *result)
 		return -ERRNO_TO_PARA_ERROR(errno);
 	if (num_wchars == 0)
 		return 0;
-	dest = para_malloc(num_wchars * sizeof(*dest));
+	dest = para_malloc((num_wchars + 1) * sizeof(*dest));
 	src = s;
 	memset(&state, 0, sizeof(state));
 	num_wchars = mbsrtowcs(dest, &src, num_wchars, &state);