Fix bt_context_add_traces_recursive
authorJulien Desfossez <julien.desfossez@efficios.com>
Wed, 25 Apr 2012 23:05:35 +0000 (19:05 -0400)
committerJulien Desfossez <julien.desfossez@efficios.com>
Wed, 25 Apr 2012 23:05:35 +0000 (19:05 -0400)
When an empty directory (readable by the user) is passed to this
function, set the appropriate error code.

Signed-off-by: Julien Desfossez <julien.desfossez@efficios.com>
src/lttngtop.c

index f2df936769e7f8e15190483e1673e875c1173afa..5ab8e947f150544a5cf134792fb0a22fde5da30a 100644 (file)
@@ -513,11 +513,9 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
                }
                metafd = openat(dirfd, "metadata", O_RDONLY);
                if (metafd < 0) {
-                       ret = close(dirfd);
-                       if (ret < 0) {
-                               perror("close");
-                               goto error;
-                       }
+                       close(dirfd);
+                       ret = -1;
+                       continue;
                } else {
                        int trace_id;
 
This page took 0.031759 seconds and 4 git commands to generate.