Index: uspace/app/bdsh/cmds/modules/cat/cat.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 5b61171402bf41905f2575034ebd820663168e72)
+++ uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 948222e45b757067cc0c8605fb69b04c5ba6f5a8)
@@ -338,5 +338,10 @@
 	argc = cli_count_args(argv);
 
-	for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
+	c = 0;
+	optreset = 1;
+	optind = 0;
+	opt_ind = 0;
+
+	while (c != -1) {
 		c = getopt_long(argc, argv, "xhvmH:t:b:sn", long_options, &opt_ind);
 		switch (c) {
Index: uspace/app/bdsh/cmds/modules/cmp/cmp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cmp/cmp.c	(revision 5b61171402bf41905f2575034ebd820663168e72)
+++ uspace/app/bdsh/cmds/modules/cmp/cmp.c	(revision 948222e45b757067cc0c8605fb69b04c5ba6f5a8)
@@ -123,5 +123,10 @@
 	argc = cli_count_args(argv);
 
-	for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
+	c = 0;
+	optreset = 1;
+	optind = 0;
+	opt_ind = 0;
+
+	while (c != -1) {
 		c = getopt_long(argc, argv, "hv", long_options, &opt_ind);
 		switch (c) {
Index: uspace/app/bdsh/cmds/modules/cp/cp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 5b61171402bf41905f2575034ebd820663168e72)
+++ uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 948222e45b757067cc0c8605fb69b04c5ba6f5a8)
@@ -484,5 +484,10 @@
 	argc = cli_count_args(argv);
 
-	for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
+	c = 0;
+	optreset = 1;
+	optind = 0;
+	opt_ind = 0;
+
+	while (c != -1) {
 		c = getopt_long(argc, argv, "hvVfirb:", long_options, &opt_ind);
 		switch (c) {
Index: uspace/app/bdsh/cmds/modules/ls/ls.c
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 5b61171402bf41905f2575034ebd820663168e72)
+++ uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 948222e45b757067cc0c8605fb69b04c5ba6f5a8)
@@ -356,5 +356,10 @@
 	argc = cli_count_args(argv);
 
-	for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
+	c = 0;
+	optreset = 1;
+	optind = 0;
+	opt_ind = 0;
+
+	while (c != -1) {
 		c = getopt_long(argc, argv, "hur", long_options, &opt_ind);
 		switch (c) {
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 5b61171402bf41905f2575034ebd820663168e72)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 948222e45b757067cc0c8605fb69b04c5ba6f5a8)
@@ -168,5 +168,10 @@
 	argc = cli_count_args(argv);
 
-	for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
+	c = 0;
+	optreset = 1;
+	optind = 0;
+	opt_ind = 0;
+
+	while (c != -1) {
 		c = getopt_long(argc, argv, "pvhVfm:", long_options, &opt_ind);
 		switch (c) {
Index: uspace/app/bdsh/cmds/modules/mkfile/mkfile.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision 5b61171402bf41905f2575034ebd820663168e72)
+++ uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision 948222e45b757067cc0c8605fb69b04c5ba6f5a8)
@@ -133,5 +133,10 @@
 	argc = cli_count_args(argv);
 
-	for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
+	c = 0;
+	optreset = 1;
+	optind = 0;
+	opt_ind = 0;
+
+	while (c != -1) {
 		c = getopt_long(argc, argv, "ps:h", long_options, &opt_ind);
 		switch (c) {
Index: uspace/app/bdsh/cmds/modules/mount/mount.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mount/mount.c	(revision 5b61171402bf41905f2575034ebd820663168e72)
+++ uspace/app/bdsh/cmds/modules/mount/mount.c	(revision 948222e45b757067cc0c8605fb69b04c5ba6f5a8)
@@ -141,5 +141,10 @@
 	argc = cli_count_args(argv);
 
-	for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
+	c = 0;
+	optreset = 1;
+	optind = 0;
+	opt_ind = 0;
+
+	while (c != -1) {
 		c = getopt_long(argc, argv, "i:ht", long_options, &opt_ind);
 		switch (c) {
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 5b61171402bf41905f2575034ebd820663168e72)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 948222e45b757067cc0c8605fb69b04c5ba6f5a8)
@@ -260,5 +260,10 @@
 	}
 
-	for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
+	c = 0;
+	optreset = 1;
+	optind = 0;
+	opt_ind = 0;
+
+	while (c != -1) {
 		c = getopt_long(argc, argv, "hvrfs", long_options, &opt_ind);
 		switch (c) {
Index: uspace/app/bdsh/cmds/modules/touch/touch.c
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 5b61171402bf41905f2575034ebd820663168e72)
+++ uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 948222e45b757067cc0c8605fb69b04c5ba6f5a8)
@@ -88,5 +88,10 @@
 	DIR *dirp;
 
-	for (c = 0, optreset = 1, optind = 0, longind = 0; c != -1; ) {
+	c = 0;
+	optreset = 1;
+	optind = 0;
+	longind = 0;
+
+	while (c != -1) {
 		c = getopt_long(argc, argv, "c", long_options, &longind);
 		switch (c) {
Index: uspace/lib/c/generic/str.c
===================================================================
--- uspace/lib/c/generic/str.c	(revision 5b61171402bf41905f2575034ebd820663168e72)
+++ uspace/lib/c/generic/str.c	(revision 948222e45b757067cc0c8605fb69b04c5ba6f5a8)
@@ -1360,12 +1360,13 @@
 
 	/* Skip over leading delimiters. */
-	for (tmp = cur = 0;
-	    (ch = str_decode(s, &tmp, len)) && str_chr(delim, ch); /**/)
+	tmp = 0;
+	cur = 0;
+	while ((ch = str_decode(s, &tmp, len)) && str_chr(delim, ch))
 		cur = tmp;
 	start = &s[cur];
 
 	/* Skip over token characters. */
-	for (tmp = cur;
-	    (ch = str_decode(s, &tmp, len)) && !str_chr(delim, ch); /**/)
+	tmp = cur;
+	while ((ch = str_decode(s, &tmp, len)) && !str_chr(delim, ch))
 		cur = tmp;
 	end = &s[cur];