Merge remote branch 'fml/next' into next

diff --git a/NEWS b/NEWS
index a4e06762097f9cdb243d119e037f60a8a6349144..19f181c0753e10f293be0c5a0957a108a53e9b6a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,8 +17,9 @@ provided for conversion of the 0.3 database to the new 0.4 format.
        - the new parser-friendly listing mode for the ls and stat commands
        - mandatory rc4 encryption
        - major audio format handler cleanups
-       - improved tag handling
-       - lots of new mood methods
+       - (id3,...) tags are no longer stored as a combined string in the database
+       - new mood methods: artist_matches, title_matches, comment_matches,
+         album_matches, year_maches, year.
 
 -------------------------------------------------
 0.3.5 (to be announced) "symplectic separability"

diff --git a/afs.cmd b/afs.cmd
index 65d815c74d0bbbe2ead826d215a562ba3840ba26..f05519989c9bd20ec4c9b7f5aa952b983efb39c2 100644 (file)
--- a/afs.cmd
+++ b/afs.cmd
@@ -200,7 +200,7 @@ H:
 H: -l  Set lastplayed time. The last time this audio file was selected.
 H:     Must be given as the number of seconds since the epoch. Example:
 H:
-H:             touch -l $(date +%s) file
+H:             touch -l=$(date +%s) file
 H:
 H:     sets the lastplayed time of 'file' to the current time.
 H:

diff --git a/daemon.c b/daemon.c
index 7f4aa6f528ef20b49f6dcd5234798db072436b6c..0bc4b116e621726a0f1cb963436881c94fa4e6bc 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -105,7 +105,7 @@ void daemon_set_logfile(char *logfile_name)
 }
 
 /**
- * Supress log messages with severity lower than the given loglevel.
+ * Suppress log messages with severity lower than the given loglevel.
  *
  * \param loglevel The smallest level that should be logged.
  */
@@ -169,7 +169,6 @@ void daemonize(void)
                goto err;
        if (chdir("/") < 0)
                goto err;
-       umask(0);
        null = open("/dev/null", O_RDONLY);
        if (null < 0)
                goto err;
@@ -286,7 +285,7 @@ void drop_privileges_or_die(const char *username, const char *groupname)
  * set_or_get equal to \p UPTIME_GET return the uptime.
 
  * \return Zero if called with \a set_or_get equal to \p UPTIME_SET, the number
- * of seconds ellapsed since the last reset otherwise.
+ * of seconds elapsed since the last reset otherwise.
  *
  * \sa time(2), difftime(3).
  */

diff --git a/gui.c b/gui.c
index b37f8fbd5d6db608b9c3086f508809aa52500737..5b44819c05afc074fadca3a5a7d5c1ece9fe8b8f 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -309,7 +309,7 @@ static int align_str(WINDOW* win, char *str, unsigned int len,
                num = 0;
        }
        /* replace newlines by spaces */
-       for (i = 0; i < len; i++) {
+       for (i = 0; i < len && str[i]; i++) {
                if (str[i] == '\n')
                        str[i] = ' ';
        }