Merge commit 'fml/master' into next

diff --combined fade.c
index 0304f4c6637a00fb89d9c5e43c6f04c78b616d16,8fb02d402f5881542409b9e22583fc4aa191b146..aa7997eb94b87ee34dc8b3d334c9e7a200ddf88d
--- 1/fade.c
--- 2/fade.c
+++ b/fade.c
@@@ -6,9 -6,13 +6,9 @@@
  
  /** \file fade.c A volume fader and alarm clock for linux. */
  
 +#include <regex.h>
  #include <sys/types.h>
  #include <dirent.h>
 -
 -#include "fade.cmdline.h"
 -#include "para.h"
 -#include "fd.h"
 -
  #include <sys/ioctl.h>
  #include <ctype.h>
  #include <stdlib.h> /* EXIT_SUCCESS */
@@@ -17,13 -21,10 +17,13 @@@
  #include <string.h>
  #include <limits.h>
  #include <sys/soundcard.h>
 +
 +#include "fade.cmdline.h"
 +#include "para.h"
 +#include "fd.h"
  #include "string.h"
  #include "error.h"
  
 -
  INIT_FADE_ERRLISTS;
  struct fade_args_info conf;
  
@@@ -216,7 -217,7 +216,7 @@@ static int sweet_dreams(void
                tm->tm_sec = 0;
        } else {
                t1 += 9 * 60 * 60; /* nine hours from now */
-               PARA_INFO_LOG("default wake time: %lu\n", t1);
+               PARA_INFO_LOG("default wake time: %lu\n", (long unsigned)t1);
                tm = localtime(&t1);
        }
        wake_time_epoch = mktime(tm);

diff --combined filter.c
index 4113690439184012724c33908ae535e23c29b12a,17b7f2fdd938678431e5a294071602807ebdd3e2..99b12217b8cc1e701c428928478a03a00ccd0c74
--- 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"
@@@ -122,6 -121,7 +122,7 @@@ static int parse_config(int argc, char 
        HANDLE_VERSION_FLAG("filter", conf);
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();
+       loglevel = get_loglevel_by_name(conf.loglevel_arg);
        if (!cf) {
                char *home = para_homedir();
                cf = make_message("%s/.paraslash/filter.conf", home);
@@@ -164,7 -164,6 +165,6 @@@ int main(int argc, char *argv[]
        ret = parse_config(argc, argv);
        if (ret < 0)
                goto out;
-       loglevel = get_loglevel_by_name(conf.loglevel_arg);
        ret = init_filter_chain();
        if (ret < 0)
                goto out;

diff --combined recv.c
index 42fd335f1466a7c01419b59872d29d5be679f907,fc34279a3820869633994a2de2cc7390982e05ad..d01dab68847fc93912edb7e9c7a1e873cf11a1e5
--- 1/recv.c
--- 2/recv.c
+++ b/recv.c
@@@ -6,7 -6,6 +6,7 @@@
  
  /** \file recv.c the stand-alone audio stream receiver */
  
 +#include <regex.h>
  #include <sys/types.h>
  #include <dirent.h>
  
@@@ -53,6 -52,7 +53,7 @@@ static void *parse_config(int argc, cha
        HANDLE_VERSION_FLAG("recv", conf);
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();
+       loglevel = get_loglevel_by_name(conf.loglevel_arg);
        return check_receiver_arg(conf.receiver_arg, receiver_num);
  }
  
@@@ -87,7 -87,6 +88,6 @@@ int main(int argc, char *argv[]
                PARA_EMERG_LOG("parse failed\n");
                goto out;
        }
-       loglevel = get_loglevel_by_name(conf.loglevel_arg);
        r = &receivers[receiver_num];
        rn.receiver = r;
        ret = r->open(&rn);