From: Jo-Philipp Wich <jo@mein.io>
Date: Thu, 22 Nov 2018 15:25:39 +0000 (+0100)
Subject: main: fix logic bug when not specifying a timeout option
X-Git-Url: http://git.openwrt.org/?p=project%2Frpcd.git;a=commitdiff_plain;h=c79ef222858abf65a7d6fc5f869ec45385dd9021

main: fix logic bug when not specifying a timeout option

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/main.c b/main.c
index b246997..4ea5f2c 100644
--- a/main.c
+++ b/main.c
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 			break;
 
 		case 't':
-			exec_timeout = strtol(optarg, NULL, 0);
+			exec_timeout = 1000 * strtol(optarg, NULL, 0);
 			break;
 
 		default:
@@ -82,13 +82,11 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (exec_timeout < 1 || exec_timeout > 600) {
+	if (exec_timeout < 1000 || exec_timeout > 600000) {
 		fprintf(stderr, "Invalid execution timeout specified\n");
 		return -1;
 	}
 
-	exec_timeout *= 1000;
-
 	if (stat(RPC_UCI_DIR_PREFIX, &s))
 		mkdir(RPC_UCI_DIR_PREFIX, 0700);