dlm: master - dlm_controld: fix long name in log entry

[David Teigland]

Gitweb:        http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=4283123f0b13eafc46...
Commit:        4283123f0b13eafc46d825050c5142cf44be79c3
Parent:        fb61984c9388cbbcc02c6a09c09948b21320412d
Author:        Lidong Zhong 
AuthorDate:    Fri Apr 25 10:52:52 2014 -0500
Committer:     David Teigland 
CommitterDate: Fri Apr 25 10:55:27 2014 -0500

dlm_controld: fix long name in log entry

When the length of name_in is NAME_ID_SIZE, the last byte of the name
and a whitespace will get lost.

(Modified by [e-mail] to also
handle names longer than NAME_ID_SIZE.)

Signed-off-by: Lidong Zhong 
---
 dlm_controld/logging.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlm_controld/logging.c b/dlm_controld/logging.c
index 9347e43..4aa3406 100644
--- a/dlm_controld/logging.c
+++ b/dlm_controld/logging.c
@@ -122,17 +122,23 @@ static void log_save_str(int len, char *log_buf, unsigned int *point,
 void log_level(char *name_in, uint32_t level_in, const char *fmt, ...)
 {
    va_list ap;
-	char name[NAME_ID_SIZE + 1];
+	char name[NAME_ID_SIZE + 2];
    uint32_t level = level_in & 0x0000FFFF;
    uint32_t extra = level_in & 0xFFFF0000;
    int ret, pos = 0;
    int len = LOG_STR_LEN - 2;
+	int namelen = 0;
    int plock = extra & LOG_PLOCK;

memset(name, 0, sizeof(name));

-	if (name_in)
-		snprintf(name, NAME_ID_SIZE, "%s ", name_in);
+	if (name_in) {
+		namelen = snprintf(name, NAME_ID_SIZE + 1, "%s", name_in);
+		if (namelen > NAME_ID_SIZE)
+			namelen = NAME_ID_SIZE;
+		name[namelen] = ' ';
+		name[namelen+1] = '\0';
+	}

ret = snprintf(log_str + pos, len - pos, "%llu %s",
    	       (unsigned long long)monotime(), name);