Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

Conflicts:

	mp3_afh.c

Fix the conflict and add more detailed error message to para_mmap().

diff --cc fd.c
index 1116f9e880b8013207fdd58e8d7a06808e0e48db,1116f9e880b8013207fdd58e8d7a06808e0e48db..db1825cdbf991c3426270c5dc8a00ad0b9cd6499
--- 1/fd.c
--- 2/fd.c
+++ b/fd.c
@@@ -163,7 -163,7 +163,9 @@@ void *para_mmap(size_t length, int prot
        void *ret = mmap(NULL, length, prot, flags, fd, offset);
        if (ret != MAP_FAILED)
                return ret;
--      PARA_EMERG_LOG("mmap failed: %s", strerror(errno));
++      PARA_EMERG_LOG("mmap failed: %s\n", strerror(errno));
++      PARA_EMERG_LOG("length: %zu, flags: %d, fd: %d, offset: %zu\n",
++              length, flags, fd, offset);
        exit(EXIT_FAILURE);
  }
  

diff --cc mp3_afh.c
index 0c8efbdc5a7c59b84d0b64ada3e7b8c648c833d4,8ca319b4705c9c12492ef2f26a418affb4cd39c3..9ef5dffb76a6c46542d827d3674e202ee27204a9
--- 1/mp3_afh.c
--- 2/mp3_afh.c
+++ b/mp3_afh.c
@@@ -116,9 -111,18 +111,18 @@@ static const char *header_mode(struct m
        return mode_text[h->mode];
  }
  
+ static int header_channels(struct mp3header *h)
+ {
+       if (h->mode > 3)
+               return 0;
+       if (h->mode < 3)
+               return 2;
+       return 1;
+ }
+ 
  static int header_bitrate(struct mp3header *h)
  {
 -      if (h->layer > 3 || h->bitrate > 14)
 +      if (!h->layer || h->layer > 3 || h->bitrate > 14 || !h->bitrate)
                return -E_HEADER_BITRATE;
        return mp3info_bitrate[h->version & 1][3 - h->layer][h->bitrate - 1];
  }