sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

r416: add a newline to the debuglevel message returned string

Browse Source 
and have smbcontrol print the PID with it
This commit is contained in:
Herb Lewis 2004-04-29 23:05:58 +00:00 committed by Gerald (Jerry) Carter
parent 164ff9a192
commit d3edf71885
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/lib/debug.c
View File

@ -208,8 +208,8 @@ static char *debug_list_class_names_and_levels(void)
dim += l;
}
/* create single string list */
b = buf = malloc(dim);
/* create single string list - add space for newline */
b = buf = malloc(dim+1);
if (!buf) {
err = True;
goto done;
@ -219,7 +219,8 @@ static char *debug_list_class_names_and_levels(void)
strncpy(b, list[i], l);
b = b + l;
}
b[-1] = '\0';
b[-1] = '\n'; /* replace last space with newline */
b[0] = '\0'; /* null terminate string */
done:
/* free strings list */

10
source/utils/smbcontrol.c
View File

@ -82,6 +82,14 @@ static void wait_replies(BOOL multiple_replies)
} while (timeout - (time(NULL) - start_time) > 0);
}
/* Message handler callback that displays the PID and a string on stdout */
static void print_pid_string_cb(int msg_type, pid_t pid, void *buf, size_t len)
{
printf("PID %u: %.*s", (unsigned int)pid, (int)len, (const char *)buf);
num_replies++;
}
/* Message handler callback that displays a string on stdout */
static void print_string_cb(int msg_type, pid_t pid, void *buf, size_t len)
@ -281,7 +289,7 @@ static BOOL do_debuglevel(const pid_t pid, const int argc, const char **argv)
if (!send_message(pid, MSG_REQ_DEBUGLEVEL, NULL, 0, False))
return False;
message_register(MSG_DEBUGLEVEL, print_string_cb);
message_register(MSG_DEBUGLEVEL, print_pid_string_cb);
wait_replies(pid == 0);