From 005324c8387dc9e1440954a5906e61f52e1712b4 Mon Sep 17 00:00:00 2001 From: Davin McCall Date: Sat, 27 Oct 2018 14:09:33 +0100 Subject: [PATCH] Fix indentation. --- src/dinit.cc | 126 +++++++++++++++++++++++++-------------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/src/dinit.cc b/src/dinit.cc index 126f467..c9392f8 100644 --- a/src/dinit.cc +++ b/src/dinit.cc @@ -188,83 +188,83 @@ int dinit_main(int argc, char **argv) // shell). We can treat them as service names. In the worst case we can't find any of the named // services, and so we'll start the "boot" service by default. if (argc > 1) { - for (int i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - // An option... - if (strcmp(argv[i], "--env-file") == 0 || strcmp(argv[i], "-e") == 0) { - if (++i < argc) { - env_file_set = true; - env_file = argv[i]; + for (int i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + // An option... + if (strcmp(argv[i], "--env-file") == 0 || strcmp(argv[i], "-e") == 0) { + if (++i < argc) { + env_file_set = true; + env_file = argv[i]; + } + else { + cerr << "dinit: '--env-file' (-e) requires an argument" << endl; + } } - else { - cerr << "dinit: '--env-file' (-e) requires an argument" << endl; + else if (strcmp(argv[i], "--services-dir") == 0 || strcmp(argv[i], "-d") == 0) { + if (++i < argc) { + service_dir = argv[i]; + } + else { + cerr << "dinit: '--services-dir' (-d) requires an argument" << endl; + return 1; + } } - } - else if (strcmp(argv[i], "--services-dir") == 0 || strcmp(argv[i], "-d") == 0) { - if (++i < argc) { - service_dir = argv[i]; + else if (strcmp(argv[i], "--system") == 0 || strcmp(argv[i], "-s") == 0) { + am_system_init = true; } - else { - cerr << "dinit: '--services-dir' (-d) requires an argument" << endl; - return 1; + else if (strcmp(argv[i], "--socket-path") == 0 || strcmp(argv[i], "-p") == 0) { + if (++i < argc) { + control_socket_path = argv[i]; + control_socket_path_set = true; + } + else { + cerr << "dinit: '--socket-path' (-p) requires an argument" << endl; + return 1; + } } - } - else if (strcmp(argv[i], "--system") == 0 || strcmp(argv[i], "-s") == 0) { - am_system_init = true; - } - else if (strcmp(argv[i], "--socket-path") == 0 || strcmp(argv[i], "-p") == 0) { - if (++i < argc) { - control_socket_path = argv[i]; - control_socket_path_set = true; + else if (strcmp(argv[i], "--log-file") == 0 || strcmp(argv[i], "-l") == 0) { + if (++i < argc) { + log_path = argv[i]; + log_is_syslog = false; + } + else { + cerr << "dinit: '--log-file' (-l) requires an argument" << endl; + return 1; + } } - else { - cerr << "dinit: '--socket-path' (-p) requires an argument" << endl; - return 1; - } - } - else if (strcmp(argv[i], "--log-file") == 0 || strcmp(argv[i], "-l") == 0) { - if (++i < argc) { - log_path = argv[i]; - log_is_syslog = false; + else if (strcmp(argv[i], "--help") == 0) { + cout << "dinit, an init with dependency management\n" + " --help display help\n" + " --env-file , -e \n" + " environment variable initialisation file\n" + " --services-dir , -d \n" + " set base directory for service description\n" + " files (-d )\n" + " --system, -s run as the system init process\n" + " --socket-path , -p \n" + " path to control socket\n" + " start service with name \n"; + return 0; } else { - cerr << "dinit: '--log-file' (-l) requires an argument" << endl; - return 1; + // unrecognized + if (! am_system_init) { + cerr << "dinit: Unrecognized option: " << argv[i] << endl; + return 1; + } } } - else if (strcmp(argv[i], "--help") == 0) { - cout << "dinit, an init with dependency management\n" - " --help display help\n" - " --env-file , -e \n" - " environment variable initialisation file\n" - " --services-dir , -d \n" - " set base directory for service description\n" - " files (-d )\n" - " --system, -s run as the system init process\n" - " --socket-path , -p \n" - " path to control socket\n" - " start service with name \n"; - return 0; - } else { - // unrecognized - if (! am_system_init) { - cerr << "dinit: Unrecognized option: " << argv[i] << endl; - return 1; - } - } - } - else { #ifdef __linux__ - // LILO puts "auto" on the kernel command line for unattended boots; we'll filter it. - if (! am_system_init || strcmp(argv[i], "auto") != 0) { - services_to_start.push_back(argv[i]); - } + // LILO puts "auto" on the kernel command line for unattended boots; we'll filter it. + if (! am_system_init || strcmp(argv[i], "auto") != 0) { + services_to_start.push_back(argv[i]); + } #else - services_to_start.push_back(argv[i]); + services_to_start.push_back(argv[i]); #endif + } } - } } if (am_system_init) { -- 2.25.1