Index: uspace/app/bdsh/cmds/builtins/batch/batch.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/batch/batch.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/builtins/batch/batch.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -85,5 +85,5 @@
 	}
 
-	int rc = EOK;
+	errno_t rc = EOK;
 	FILE *batch = fopen(argv[1], "r");
 	if (batch == NULL) {
Index: uspace/app/bdsh/cmds/builtins/cd/cd.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -51,8 +51,8 @@
 static bool previous_directory_set = false;
 
-static int chdir_and_remember(const char *new_dir)
+static errno_t chdir_and_remember(const char *new_dir)
 {
 
-	int rc = vfs_cwd_get(previous_directory_tmp, PATH_MAX);
+	errno_t rc = vfs_cwd_get(previous_directory_tmp, PATH_MAX);
 	previous_directory_valid = (rc == EOK);
 	previous_directory_set = true;
@@ -86,5 +86,5 @@
 {
 	int argc;
-	int rc = EOK;
+	errno_t rc = EOK;
 
 	argc = cli_count_args(argv);
Index: uspace/app/bdsh/cmds/modules/cat/cat.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/cat/cat.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -187,5 +187,5 @@
 	off64_t file_size = 0, length = 0;
 	aoff64_t pos = 0;
-	int rc;
+	errno_t rc;
 
 	bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0);
@@ -196,5 +196,5 @@
 		blen = STR_BOUNDS(1);
 	} else {
-		int rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
+		errno_t rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
 		if (rc != EOK) {
 			fd = -1;
@@ -316,5 +316,5 @@
 	bool tailFirst = false;
 	sysarg_t rows, cols;
-	int rc;
+	errno_t rc;
 	
 	/*
Index: uspace/app/bdsh/cmds/modules/cmp/cmp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cmp/cmp.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/cmp/cmp.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -70,7 +70,7 @@
 }
 
-static int cmp_files(const char *fn0, const char *fn1)
+static errno_t cmp_files(const char *fn0, const char *fn1)
 {
-	int rc = EOK;
+	errno_t rc = EOK;
 	const char *fn[2] = {fn0, fn1};
 	int fd[2] = {-1, -1};
@@ -117,5 +117,5 @@
 int cmd_cmp(char **argv)
 {
-	int rc;
+	errno_t rc;
 	unsigned int argc;
 	int c, opt_ind;
Index: uspace/app/bdsh/cmds/modules/cp/cp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/cp/cp.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -82,5 +82,5 @@
 	struct stat s;
 
-	int r = vfs_stat_path(path, &s);
+	errno_t r = vfs_stat_path(path, &s);
 
 	if (r != EOK)
@@ -176,8 +176,8 @@
 }
 
-static int do_copy(const char *src, const char *dest,
+static errno_t do_copy(const char *src, const char *dest,
     size_t blen, int vb, int recursive, int force, int interactive)
 {
-	int rc = EOK;
+	errno_t rc = EOK;
 	char dest_path[PATH_MAX];
 	char src_path[PATH_MAX];
@@ -388,5 +388,5 @@
 	int fd1, fd2;
 	size_t rbytes, wbytes;
-	int rc;
+	errno_t rc;
 	off64_t total;
 	char *buff = NULL;
@@ -479,5 +479,5 @@
 	int force = 0, interactive = 0;
 	int c, opt_ind;
-	int ret;
+	errno_t ret;
 
 	con = console_init(stdin, stdout);
Index: uspace/app/bdsh/cmds/modules/ls/ls.c
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/ls/ls.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -135,5 +135,5 @@
 	int i;
 	int nbdirs = 0;
-	int rc;
+	errno_t rc;
 	int len;
 	char *buff;
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -94,5 +94,5 @@
 
 	int ret = 0;
-	int rc;
+	errno_t rc;
 
 	if (!create_parents) {
Index: uspace/app/bdsh/cmds/modules/mkfile/mkfile.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -89,5 +89,5 @@
  * @return	EOK on success or an error code
  */
-static int read_size(const char *str, size_t *rsize)
+static errno_t read_size(const char *str, size_t *rsize)
 {
 	size_t number, unit;
@@ -123,5 +123,5 @@
 	size_t to_write;
 	size_t nwritten;
-	int rc;
+	errno_t rc;
 	char *file_name;
 	void *buffer;
Index: uspace/app/bdsh/cmds/modules/mount/mount.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mount/mount.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/mount/mount.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -78,5 +78,5 @@
 	mtab_ent_t *old_ent = NULL;
 	char *svc_name;
-	int rc;
+	errno_t rc;
 
 	vfs_get_mtab_list(&mtab_list);
@@ -109,5 +109,5 @@
 static void print_fstypes(void)
 {
-	int rc;
+	errno_t rc;
 	vfs_fstypes_t fstypes;
 	char **p;
@@ -132,5 +132,5 @@
 	const char *mopts = "";
 	const char *dev = "";
-	int rc;
+	errno_t rc;
 	int c, opt_ind;
 	unsigned int instance = 0;
Index: uspace/app/bdsh/cmds/modules/mv/mv.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mv/mv.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/mv/mv.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -52,5 +52,5 @@
 {
 	unsigned int argc;
-	int rc;
+	errno_t rc;
 
 	argc = cli_count_args(argv);
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -195,5 +195,5 @@
 static unsigned int rm_recursive(const char *path)
 {
-	int rc;
+	errno_t rc;
 	unsigned int ret = 0;
 
Index: uspace/app/bdsh/cmds/modules/sleep/sleep.c
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -62,7 +62,7 @@
  * @return EOK if conversion was successful.
  */
-static int decimal_to_useconds(const char *nptr, useconds_t *result)
+static errno_t decimal_to_useconds(const char *nptr, useconds_t *result)
 {
-	int ret;
+	errno_t ret;
 	uint64_t whole_seconds;
 	uint64_t frac_seconds;
@@ -112,5 +112,5 @@
 int cmd_sleep(char **argv)
 {
-	int ret;
+	errno_t ret;
 	unsigned int argc;
 	useconds_t duration = 0;
Index: uspace/app/bdsh/cmds/modules/touch/touch.c
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/touch/touch.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -123,5 +123,5 @@
 		if ((!no_create) ||
 		    ((no_create) && (vfs_stat_path(buff, &file_stat) == EOK))) {
-			int rc = vfs_lookup(buff, WALK_REGULAR | WALK_MAY_CREATE, &fd);
+			errno_t rc = vfs_lookup(buff, WALK_REGULAR | WALK_MAY_CREATE, &fd);
 			if (rc != EOK) {
 				fd = -1;
Index: uspace/app/bdsh/cmds/modules/unmount/unmount.c
===================================================================
--- uspace/app/bdsh/cmds/modules/unmount/unmount.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/bdsh/cmds/modules/unmount/unmount.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -57,5 +57,5 @@
 {
 	unsigned int argc;
-	int rc;
+	errno_t rc;
 
 	argc = cli_count_args(argv);