From: Andre Noll <maan@systemlinux.org>
Date: Sun, 4 Dec 2011 23:13:32 +0000 (+0100)
Subject: Merge branch 't/interactive'
X-Git-Tag: v0.4.9~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=ef1f130a1f9ac61a51da10ee56c5bd9ef1b52366

Merge branch 't/interactive'

Conflicts:
	string.h
---

ef1f130a1f9ac61a51da10ee56c5bd9ef1b52366
diff --cc NEWS
index 8bb2862e,d4a58fd1..1c6d821d
--- a/NEWS
+++ b/NEWS
@@@ -2,12 -2,8 +2,16 @@@
  0.4.9 (to be announced) "hybrid causality"
  ------------------------------------------
  
- Support for another audio format and many small improvements/fixes
- all over the place.
++Support for another audio format, interactive mode for para_client
++and para_audiod and many small improvements/fixes all over the place.
 +
 +	- Support for flac, the free lossless audio codec.
  	- Fix for an endless loop in the mp3 decoder for certain
  	  (corrupt) mp3 files.
++	- When executed without specifying a command, para_client
++	  and para_audioc start an interactive shell (requires
++	  libreadline being installed). The interactive mode offers
++	  full tab completion and command line history.
  	- autogen.sh now detects a distcc setup and adjusts the
  	  parameter for the -j option of make accordingly.
  	- Shared memory areas are no longer restricted to 64K. We now
diff --cc string.h
index 403b9c6f,23b79002..30af1fdb
--- a/string.h
+++ b/string.h
@@@ -83,5 -83,4 +83,6 @@@ int create_argv(const char *buf, const 
  void free_argv(char **argv);
  int para_regcomp(regex_t *preg, const char *regex, int cflags);
  void freep(void *arg);
+ int compute_word_num(const char *buf, const char *delim, int offset);
 +char *safe_strdup(const char *src, size_t len);
 +char *key_value_copy(const char *src, size_t len, const char *key);