Merge branch 't/interactive'

Conflicts:
	string.h

diff --cc FEATURES
Simple merge

diff --cc NEWS
index 8bb2862e93012c815d50be0513dee99c2b8eda87,d4a58fd1e9a4e24f2a2d7e0b4d00ce1431602db1..1c6d821dbbc362ae77190724a37c2cc497d7fcd6
--- 1/NEWS
--- 2/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 afs.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc error.h
Simple merge

diff --cc string.c
Simple merge

diff --cc string.h
index 403b9c6f15d15404076eeed7ea641b8b22ed600f,23b790021277475ea281e12a9b2a39d05e7ffb62..30af1fdb647f6701086b235324a6ff2867210822
--- 1/string.h
--- 2/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);

diff --cc web/manual.m4
Simple merge