mxqd: Use mx_strtobytes() to parse --memory and --max-memory-per-slot…

… options
mariux · Aug 26, 2015 · 1cf6306 · 1cf6306
1 parent e9222d8
commit 1cf6306
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/mxqd.c b/mxqd.c
@@ -290,17 +290,27 @@ int server_init(struct mxq_server *server, int argc, char *argv[])
 
             case 'm':
                 if (mx_strtoul(optctl.optarg, &memory_total) < 0) {
-                    mx_log_err("Invalid argument supplied for option --memory '%s': %m", optctl.optarg);
-                    exit(1);
+                    unsigned long long int bytes;
+
+                    if(mx_strtobytes(optctl.optarg, &bytes) < 0) {
+                        mx_log_err("Invalid argument supplied for option --memory '%s': %m", optctl.optarg);
+                        exit(1);
+                    }
+                    memory_total = bytes/1024/1024;
                 }
                 if (!memory_total)
                     memory_total = 2048;
                 break;
 
             case 'x':
                 if (mx_strtoul(optctl.optarg, &memory_max) < 0) {
-                    mx_log_err("Invalid argument supplied for option --max-memory-per-slot '%s': %m", optctl.optarg);
-                    exit(1);
+                    unsigned long long int bytes;
+
+                    if(mx_strtobytes(optctl.optarg, &bytes) < 0) {
+                        mx_log_err("Invalid argument supplied for option --max-memory-per-slot '%s': %m", optctl.optarg);
+                        exit(1);
+                    }
+                    memory_max = bytes/1024/1024;
                 }
                 break;