Merge remote branch 'fml/v0.2' into v0.2

diff --git a/fade.ggo b/fade.ggo
index f467c1996ac9cfd68487a475cc67e34a8819a6b0..a2bb31127ea12148bcd7a1d8f296d827cef9ae42 100644 (file)
--- a/fade.ggo
+++ b/fade.ggo
@@ -65,9 +65,9 @@ playing if unset"
 
 option "wake_hour" H
 #~~~~~~~~~~~~~~~~~~~
- "(0-23)"
+"(0-23) (default: now + 8 hours)"
+
        int typestr="hour"
-       default="8"
        optional
 
 option "wake_min" M

diff --git a/net.c b/net.c
index 88eb20e56eefe69328b9336ce8842b69fe8532d3..032b02c3f85497724db0f7a580b5acd1d610743c 100644 (file)
--- a/net.c
+++ b/net.c
@@ -120,7 +120,7 @@ static int sendall(int fd, const char *buf, size_t *len)
                total += n;
                bytesleft -= n;
                if (total < *len)
-                       PARA_DEBUG_LOG("short write (%zd byte(s) left)",
+                       PARA_DEBUG_LOG("short write (%zd byte(s) left)\n",
                                *len - total);
        }
        *len = total; /* return number actually sent here */

diff --git a/server.c b/server.c
index e39354e769ec04dc629c63f0bd590df30893dc8d..b2242e070e7937985b5a6666b91d26ef6b86f60f 100644 (file)
--- a/server.c
+++ b/server.c
@@ -216,7 +216,7 @@ static void parse_config(int override)
        char *cf;
 
        if (conf.config_file_given)
-               cf = conf.config_file_arg;
+               cf = para_strdup(conf.config_file_arg);
        else
                cf = make_message("%s/.paraslash/server.conf", home);
        free(user_list_file);