Index: uspace/app/bdsh/cmds/modules/cat/cat.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 9af1c61b92a35908b9af07874373f345e922fede)
+++ uspace/app/bdsh/cmds/modules/cat/cat.c	(revision e1724290c4104a6acf5a433238f7faa147e83cb6)
@@ -195,6 +195,10 @@
 		/* Allow storing the whole UTF-8 character. */
 		blen = STR_BOUNDS(1);
-	} else
-		fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
+	} else {
+		int rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
+		if (rc != EOK) {
+			fd = -1;
+		}
+	}
 	
 	if (fd < 0) {
Index: uspace/app/bdsh/cmds/modules/cmp/cmp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cmp/cmp.c	(revision 9af1c61b92a35908b9af07874373f345e922fede)
+++ uspace/app/bdsh/cmds/modules/cmp/cmp.c	(revision e1724290c4104a6acf5a433238f7faa147e83cb6)
@@ -80,7 +80,6 @@
 
 	for (int i = 0; i < 2; i++) {
-		fd[i] = vfs_lookup_open(fn[i], WALK_REGULAR, MODE_READ);
-		if (fd[i] < 0) {
-			rc = fd[i];
+		rc = vfs_lookup_open(fn[i], WALK_REGULAR, MODE_READ, &(fd[i]));
+		if (rc != EOK) {
 			printf("Unable to open %s\n", fn[i]);
 			goto end;
Index: uspace/app/bdsh/cmds/modules/cp/cp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 9af1c61b92a35908b9af07874373f345e922fede)
+++ uspace/app/bdsh/cmds/modules/cp/cp.c	(revision e1724290c4104a6acf5a433238f7faa147e83cb6)
@@ -394,12 +394,12 @@
 		printf("Copying %s to %s\n", src, dest);
 
-	fd1 = vfs_lookup_open(src, WALK_REGULAR, MODE_READ);
-	if (fd1 < 0) {
+	rc = vfs_lookup_open(src, WALK_REGULAR, MODE_READ, &fd1);
+	if (rc != EOK) {
 		printf("Unable to open source file %s\n", src);
 		return -1;
 	}
 
-	fd2 = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE);
-	if (fd2 < 0) {
+	rc = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE, &fd2);
+	if (rc != EOK) {
 		printf("Unable to open destination file %s\n", dest);
 		vfs_put(fd1);
Index: uspace/app/bdsh/cmds/modules/mkfile/mkfile.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision 9af1c61b92a35908b9af07874373f345e922fede)
+++ uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision e1724290c4104a6acf5a433238f7faa147e83cb6)
@@ -163,6 +163,6 @@
 	file_name = argv[optind];
 
-	fd = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MUST_CREATE, MODE_WRITE);
-	if (fd < 0) {
+	rc = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MUST_CREATE, MODE_WRITE, &fd);
+	if (rc != EOK) {
 		printf("%s: failed to create file %s.\n", cmdname, file_name);
 		return CMD_FAILURE;
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 9af1c61b92a35908b9af07874373f345e922fede)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision e1724290c4104a6acf5a433238f7faa147e83cb6)
@@ -149,6 +149,5 @@
 	}
 
-	fd = vfs_lookup(path, WALK_REGULAR);
-	if (fd >= 0) {
+	if (vfs_lookup(path, WALK_REGULAR, &fd) == EOK) {
 		vfs_put(fd);
 		return RM_FILE;
Index: uspace/app/bdsh/cmds/modules/touch/touch.c
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 9af1c61b92a35908b9af07874373f345e922fede)
+++ uspace/app/bdsh/cmds/modules/touch/touch.c	(revision e1724290c4104a6acf5a433238f7faa147e83cb6)
@@ -123,5 +123,8 @@
 		if ((!no_create) ||
 		    ((no_create) && (vfs_stat_path(buff, &file_stat) == EOK))) {
-			fd = vfs_lookup(buff, WALK_REGULAR | WALK_MAY_CREATE);
+			int rc = vfs_lookup(buff, WALK_REGULAR | WALK_MAY_CREATE, &fd);
+			if (rc != EOK) {
+				fd = -1;
+			}
 		}