Fix: use zmalloc() in lttng list.c

[lttng-tools.git] / src / bin / lttng / commands / list.c

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 1a46bb72b221f2d75f9cd82ea94a13b3ef457450..5f452e58958d1e5a0fa2a4eff4a919a6e1141e46 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -107,7 +107,7 @@ static char *get_cmdline_by_pid(pid_t pid)
        int ret;
        FILE *fp;
        char *cmdline = NULL;
-       char path[24];  /* Can't go bigger than /proc/65535/cmdline */
+       char path[20];  /* Can't go bigger than /proc/65535/cmdline */
 
        snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
        fp = fopen(path, "r");
@@ -116,7 +116,11 @@ static char *get_cmdline_by_pid(pid_t pid)
        }
 
        /* Caller must free() *cmdline */
-       cmdline = malloc(PATH_MAX);
+       cmdline = zmalloc(PATH_MAX);
+       if (!cmdline) {
+               perror("malloc cmdline");
+               goto end;
+       }
        ret = fread(cmdline, 1, PATH_MAX, fp);
        if (ret < 0) {
                perror("fread proc list");
@@ -220,12 +224,14 @@ static const char *loglevel_string(int value)
 static const char *logleveltype_string(enum lttng_loglevel_type value)
 {
        switch (value) {
+       case LTTNG_EVENT_LOGLEVEL_ALL:
+               return ":";
        case LTTNG_EVENT_LOGLEVEL_RANGE:
-               return "<=";
+               return " <=";
        case LTTNG_EVENT_LOGLEVEL_SINGLE:
-               return "==";
+               return " ==";
        default:
-               return "<<TYPE UNKN>>";
+               return " <<TYPE UNKN>>";
        }
 }
 
@@ -238,7 +244,7 @@ static void print_events(struct lttng_event *event)
        case LTTNG_EVENT_TRACEPOINT:
        {
                if (event->loglevel != -1) {
-                       MSG("%s%s (loglevel %s %s (%d)) (type: tracepoint)%s%s%s",
+                       MSG("%s%s (loglevel%s %s (%d)) (type: tracepoint)%s%s%s",
                                indent6,
                                event->name,
                                logleveltype_string(event->loglevel_type),
@@ -682,7 +688,7 @@ static int list_channels(const char *channel_name)
                goto error_channels;
        }
 
-       if (channel_name == NULL) {
+       if (count) {
                MSG("Channels:\n-------------");
        }