Ignore -S if there is no swap

Instead of exiting with a fatal error, ignore "-S" if there is zero swap space. #97
rfjakob · Nov 3, 2018 · 582ac1b · 582ac1b
1 parent a8f30d7
commit 582ac1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/main.c b/main.c
@@ -115,6 +115,10 @@ int main(int argc, char* argv[])
             have_M = 1;
             break;
         case 'S':
+            if (m.SwapTotalKiB == 0) {
+                warn("warning: -S: total swap is zero, using default percentages\n");
+                break;
+            }
             tuple = parse_term_kill_tuple(optarg, m.SwapTotalKiB * 100 / 99);
             if (strlen(tuple.err)) {
                 fatal(16, "-S: %s", tuple.err);

diff --git a/tests/cli_test.go b/tests/cli_test.go
@@ -86,7 +86,6 @@ func TestCli(t *testing.T) {
 		{args: []string{"-s", "-10"}, code: 16, stderrContains: "fatal", stdoutEmpty: true},
 		{args: []string{"-M", mem1percent}, code: -1, stderrContains: " 1 %", stdoutContains: memReport},
 		{args: []string{"-M", "9999999999999999"}, code: 15, stderrContains: "fatal", stdoutEmpty: true},
-		{args: []string{"-S", "9999999999999999"}, code: 16, stderrContains: "fatal", stdoutEmpty: true},
 		{args: []string{"-r", "0"}, code: -1, stderrContains: startupMsg, stdoutEmpty: true},
 		{args: []string{"-r", "0.1"}, code: -1, stderrContains: startupMsg, stdoutContains: memReport},
 		// Test --avoid and --prefer