X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.c;h=aa3bcbddabe425cc823e3ad5e567f707f70dbccb;hp=f7d70353db977d6543055c19c7bd68a17b83a3ce;hb=b55f405f8005821ffa369b929bc0b419da62683d;hpb=1b218c4cde1c14c5bfbd8f52321ceb16b006de52

diff --git a/string.c b/string.c
index f7d70353..aa3bcbdd 100644
--- a/string.c
+++ b/string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -114,6 +114,65 @@ __must_check __malloc char *para_strdup(const char *s)
 	exit(EXIT_FAILURE);
 }
 
+/**
+ * Print a formated message to a dynamically allocated string.
+ *
+ * \param result The formated string is returned here.
+ * \param fmt The format string.
+ * \param ap Initialized list of arguments.
+ *
+ * This function is similar to vasprintf(), a GNU extension which is not in C
+ * or POSIX. It allocates a string large enough to hold the output including
+ * the terminating null byte. The allocated string is returned via the first
+ * argument and must be freed by the caller. However, unlike vasprintf(), this
+ * function calls exit() if insufficient memory is available, while vasprintf()
+ * returns -1 in this case.
+ *
+ * \return Number of bytes written, not including the terminating \p NULL
+ * character.
+ *
+ * \sa printf(3), vsnprintf(3), va_start(3), vasprintf(3), \ref xasprintf().
+ */
+__printf_2_0 unsigned xvasprintf(char **result, const char *fmt, va_list ap)
+{
+	int ret;
+	size_t size;
+	va_list aq;
+
+	va_copy(aq, ap);
+	ret = vsnprintf(NULL, 0, fmt, aq);
+	va_end(aq);
+	assert(ret >= 0);
+	size = ret + 1;
+	*result = para_malloc(size);
+	va_copy(aq, ap);
+	ret = vsnprintf(*result, size, fmt, aq);
+	va_end(aq);
+	assert(ret >= 0 && ret < size);
+	return ret;
+}
+
+/**
+ * Print to a dynamically allocated string, variable number of arguments.
+ *
+ * \param result See \ref xvasprintf().
+ * \param fmt Usual format string.
+ *
+ * \return The return value of the underlying call to \ref xvasprintf().
+ *
+ * \sa \ref xvasprintf() and the references mentioned there.
+ */
+__printf_2_3 unsigned xasprintf(char **result, const char *fmt, ...)
+{
+	va_list ap;
+	unsigned ret;
+
+	va_start(ap, fmt);
+	ret = xvasprintf(result, fmt, ap);
+	va_end(ap);
+	return ret;
+}
+
 /**
  * Allocate a sufficiently large string and print into it.
  *
@@ -125,13 +184,16 @@ __must_check __malloc char *para_strdup(const char *s)
  * \return This function either returns a pointer to a string that must be
  * freed by the caller or aborts without returning.
  *
- * \sa printf(3).
+ * \sa printf(3), xasprintf().
  */
 __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
 {
 	char *msg;
+	va_list ap;
 
-	PARA_VSPRINTF(fmt, msg);
+	va_start(ap, fmt);
+	xvasprintf(&msg, fmt, ap);
+	va_end(ap);
 	return msg;
 }
 
@@ -711,6 +773,32 @@ out:
 	return ret;
 }
 
+/**
+ * Get the number of the word the cursor is on.
+ *
+ * \param buf The zero-terminated line buffer.
+ * \param delim Characters that separate words.
+ * \param point The cursor position.
+ *
+ * \return Zero-based word number.
+ */
+int compute_word_num(const char *buf, const char *delim, int point)
+{
+	int ret, num_words;
+	const char *p;
+	char *word;
+
+	for (p = buf, num_words = 0; ; p += ret, num_words++) {
+		ret = get_next_word(p, delim, &word);
+		if (ret <= 0)
+			break;
+		free(word);
+		if (p + ret >= buf + point)
+			break;
+	}
+	return num_words;
+}
+
 /**
  * Free an array of words created by create_argv().
  *