From b26d068300f362cac80004ebd5f822116a1bf87f Mon Sep 17 00:00:00 2001 From: Sungbae Yoo Date: Thu, 17 Jan 2019 12:57:07 +0900 Subject: [PATCH] Add exception handler in volume manager It is to solve a SVACE issue. Change-Id: Ia396f11c51d37e11ba731eab808f6fc6792fd6ec Signed-off-by: Sungbae Yoo --- volume/main.cpp | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/volume/main.cpp b/volume/main.cpp index a2fa0db..6c3024f 100755 --- a/volume/main.cpp +++ b/volume/main.cpp @@ -163,22 +163,26 @@ int main(int argc, char* argv[]) {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "ag:m:", options, &index)) != -1) { - switch (opt) { - case 'a': - ret = mountEcryptfsToAll(); - break; - case 'g': - ret = generateKey(optarg); - break; - case 'm': - ret = mountEcryptfs("/home/" + std::string(optarg), optarg); - break; - default: - std::cerr << "unknown" << std::endl; - usage(argv[0]); - break; + try { + while ((opt = getopt_long(argc, argv, "ag:m:", options, &index)) != -1) { + switch (opt) { + case 'a': + ret = mountEcryptfsToAll(); + break; + case 'g': + ret = generateKey(optarg); + break; + case 'm': + ret = mountEcryptfs("/home/" + std::string(optarg), optarg); + break; + default: + std::cerr << "unknown" << std::endl; + usage(argv[0]); + break; + } } + } catch (klay::Exception &e) { + ret = -1; } if (ret != 0) { -- 2.7.4