Merge branch 'master' into next

diff --combined dccp_recv.c
index 4d4ac86db31cb28f1d2d1d9f081f13dc8a139dcc,95444588b15fffe01c99d1469bb59df504edd840..58c969a255335461d0481e8864ec79fb41269dac
--- 1/dccp_recv.c
--- 2/dccp_recv.c
+++ b/dccp_recv.c
@@@ -11,7 -11,6 +11,7 @@@
   * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
   */
  
 +#include <regex.h>
  #include <sys/types.h>
  #include <dirent.h>
  
@@@ -158,4 -157,5 +158,5 @@@ void dccp_recv_init(struct receiver *r
                .short_help = dccp_recv_args_info_help,
                .detailed_help = dccp_recv_args_info_detailed_help
        };
+       dccp_recv_cmdline_parser_free(&dummy);
  }

diff --combined filter.c
index 99b12217b8cc1e701c428928478a03a00ccd0c74,cc270172ba6073c282564a92646531e53eee5f7a..e6c75556b91e5ecc0c3ca1f005f5471056bdfb7a
--- 1/filter.c
--- 2/filter.c
+++ b/filter.c
@@@ -6,9 -6,8 +6,9 @@@
  
  /** \file filter.c The stand-alone filter program. */
  
 -#include "para.h"
 +#include <regex.h>
  
 +#include "para.h"
  #include "filter.cmdline.h"
  #include "list.h"
  #include "sched.h"
@@@ -62,6 -61,15 +62,15 @@@ static void open_filters(void
        }
  }
  
+ static void free_filter_confs(void)
+ {
+       int i;
+       struct filter_node *fn;
+ 
+       FOR_EACH_FILTER_NODE(fn, fc, i)
+               free(fn->conf);
+ }
+ 
  static int init_filter_chain(void)
  {
        int i, ret;
@@@ -70,7 -78,7 +79,7 @@@
        if (!conf.filter_given)
                return -E_NO_FILTERS;
        fc->num_filters = conf.filter_given;
-       fc->filter_nodes = para_malloc(fc->num_filters * sizeof(struct filter_node));
+       fc->filter_nodes = para_calloc(fc->num_filters * sizeof(struct filter_node));
        fc->inbufp = &sit->buf;
        fc->in_loaded = &sit->loaded;
        fc->input_error = &sit->task.error;
@@@ -93,6 -101,7 +102,7 @@@
        open_filters();
        return 1;
  err:
+       free_filter_confs();
        free(fc->filter_nodes);
        return ret;
  }
@@@ -181,6 -190,7 +191,7 @@@ int main(int argc, char *argv[]
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
        ret = schedule(&s);
+       free_filter_confs();
        close_filters(fc);
  out:
        free(sit->buf);

diff --combined http_recv.c
index f644233ba1ed1adb63fe9f21cf675ff319b5531d,7a751e4acbc846bf3feb81e22448f90ec1389002..13e9ede23d4d3cda0dcea71fbeef9dc0602dbd6f
--- 1/http_recv.c
--- 2/http_recv.c
+++ b/http_recv.c
@@@ -6,7 -6,6 +6,7 @@@
  
  /** \file http_recv.c paraslash's http receiver */
  
 +#include <regex.h>
  #include <sys/types.h>
  #include <dirent.h>
  
@@@ -204,4 -203,5 +204,5 @@@ void http_recv_init(struct receiver *r
                .short_help = http_recv_args_info_help,
                .detailed_help = http_recv_args_info_detailed_help
        };
+       http_recv_cmdline_parser_free(&dummy);
  }

diff --combined udp_recv.c
index 7bbd4b0c575a351055170bab1df3f186769c6783,e4d234040aee89dfdddb1f401eafdf5e2997406a..f9782985d113d390c70300d099546066203f188d
--- 1/udp_recv.c
--- 2/udp_recv.c
+++ b/udp_recv.c
@@@ -5,7 -5,6 +5,7 @@@
   */
  /** \file udp_recv.c Paraslash's udp receiver */
  
 +#include <regex.h>
  #include <dirent.h>
  #include <sys/socket.h>
  #include <net/if.h>
@@@ -239,4 -238,5 +239,5 @@@ void udp_recv_init(struct receiver *r
                .short_help = udp_recv_args_info_help,
                .detailed_help = udp_recv_args_info_detailed_help
        };
+       udp_recv_cmdline_parser_free(&dummy);
  }