diff --git a/src/chmod.c b/src/chmod.c
index 96c04a2..24969e9 100644
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -10,6 +10,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COMMON_MODE
+#include "common.c"
+
 
 #define OPT_R 1
 
@@ -114,7 +117,6 @@ int main(int argc, char * argv[])
 	int opts = 0;
 	mode_t mode;
 	int o;
-	char * p;
 
 	while((o = getopt(argc, argv, "R")) != -1)
 		switch(o)
@@ -127,9 +129,7 @@ int main(int argc, char * argv[])
 		}
 	if(argc - optind < 2)
 		return _usage();
-	/* FIXME mode may be an expression */
-	mode = strtol(argv[optind], &p, 8);
-	if(argv[optind][0] == '\0' || *p != '\0')
+	if(_mode(argv[optind], &mode) != 0)
 		return _usage();
 	return _chmod(opts, mode, argc - optind - 1, &argv[optind+1]);
 }
diff --git a/src/mkdir.c b/src/mkdir.c
index e76a03c..c30554f 100644
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -8,6 +8,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#define COMMON_MODE
+#include "common.c"
+
 
 /* mkdir */
 static int _mkdir_error(char * message, int ret);
@@ -77,15 +80,12 @@ int main(int argc, char * argv[])
 	mode_t mode = 0777;
 	int flagp = 0;
 	int o;
-	char * p;
 
 	while((o = getopt(argc, argv, "pm:")) != -1)
 		switch(o)
 		{
 			case 'm':
-				/* FIXME mode may be an expression */
-				mode = strtol(optarg, &p, 8);
-				if(*optarg == '\0' || *p != '\0')
+				if(_mode(optarg, &mode) != 0)
 					return _usage();
 				break;
 			case 'p':