restyle fish modules to match project style

Reduces lint errors from 60 to 60 (-0%). Line count from 5599 to 4925 (-12%).

Another step in resolving issue #2902.

1 files changed, 168 insertions, 266 deletions

diff --git a/src/fish.cpp b/src/fish.cpp
index 128a529c..dcad6c8b 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -1,3 +1,4 @@
+// The main loop of the fish program.
 /*
 Copyright (C) 2005-2008 Axel Liljencrantz
 
@@ -14,85 +15,79 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
-
-/** \file fish.c
-	The main loop of <tt>fish</tt>.
-*/
 #include "config.h"
 
 #include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <getopt.h>
 #include <limits.h>
+#include <locale.h>
+#include <pwd.h>
+#include <stdbool.h>
 #include <stdint.h>
-#include <sys/stat.h>
-#include <string>
-#include <vector>
-#include <stdlib.h>
 #include <stdio.h>
-#include <wchar.h>
+#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/socket.h> // IWYU pragma: keep
+#include <sys/socket.h>  // IWYU pragma: keep
+#include <sys/stat.h>
 #include <sys/un.h>
-#include <pwd.h>
-#include <locale.h>
+#include <unistd.h>
+#include <wchar.h>
 #include <memory>
-#include <stdbool.h>
+#include <string>
+#include <vector>
 
-#include "fallback.h" // IWYU pragma: keep
-#include "common.h"
-#include "reader.h"
 #include "builtin.h"
-#include "function.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "common.h"
 #include "env.h"
-#include "proc.h"
-#include "parser.h"
-#include "expand.h"
 #include "event.h"
+#include "expand.h"
+#include "fallback.h"  // IWYU pragma: keep
+#include "fish_version.h"
+#include "function.h"
 #include "history.h"
-#include "path.h"
 #include "input.h"
-#include "io.h"
-#include "fish_version.h"
 #include "input_common.h"
+#include "io.h"
+#include "parser.h"
+#include "path.h"
+#include "proc.h"
+#include "reader.h"
 #include "wildcard.h"
+#include "wutil.h"  // IWYU pragma: keep
 
 // PATH_MAX may not exist.
 #ifndef PATH_MAX
 #define PATH_MAX 4096
 #endif
 
-/* If we are doing profiling, the filename to output to */
+/// If we are doing profiling, the filename to output to.
 static const char *s_profiling_output_filename = NULL;
 
-static bool has_suffix(const std::string &path, const char *suffix, bool ignore_case)
-{
+static bool has_suffix(const std::string &path, const char *suffix, bool ignore_case) {
     size_t pathlen = path.size(), suffixlen = strlen(suffix);
-    return pathlen >= suffixlen && !(ignore_case ? strcasecmp : strcmp)(path.c_str() + pathlen - suffixlen, suffix);
+    return pathlen >= suffixlen &&
+           !(ignore_case ? strcasecmp : strcmp)(path.c_str() + pathlen - suffixlen, suffix);
 }
 
-/* Modifies the given path by calling realpath. Returns true if realpath succeeded, false otherwise */
-static bool get_realpath(std::string &path)
-{
+/// Modifies the given path by calling realpath. Returns true if realpath succeeded, false
+/// otherwise.
+static bool get_realpath(std::string &path) {
     char buff[PATH_MAX], *ptr;
-    if ((ptr = realpath(path.c_str(), buff)))
-    {
+    if ((ptr = realpath(path.c_str(), buff))) {
         path = ptr;
     }
     return ptr != NULL;
 }
 
-/* OS X function for getting the executable path */
+// OS X function for getting the executable path.
 extern "C" {
-    int _NSGetExecutablePath(char* buf, uint32_t* bufsize);
+int _NSGetExecutablePath(char *buf, uint32_t *bufsize);
 }
 
-// Return the path to the current executable. This needs to be realpath'd.
-static std::string get_executable_path(const char *argv0)
-{
+/// Return the path to the current executable. This needs to be realpath'd.
+static std::string get_executable_path(const char *argv0) {
     char buff[PATH_MAX];
 
 #if __APPLE__
@@ -121,35 +116,32 @@ static std::string get_executable_path(const char *argv0)
     return std::string(argv0 ? argv0 : "");
 }
 
-
-static struct config_paths_t determine_config_directory_paths(const char *argv0)
-{
+static struct config_paths_t determine_config_directory_paths(const char *argv0) {
     struct config_paths_t paths;
     bool done = false;
     std::string exec_path = get_executable_path(argv0);
-    if (get_realpath(exec_path))
-    {
+    if (get_realpath(exec_path)) {
 #if __APPLE__
 
-        /* On OS X, maybe we're an app bundle, and should use the bundle's files. Since we don't link CF, use this lame approach to test it: see if the resolved path ends with /Contents/MacOS/fish, case insensitive since HFS+ usually is.
-         */
-        if (! done)
-        {
+        // On OS X, maybe we're an app bundle, and should use the bundle's files. Since we don't
+        // link CF, use this lame approach to test it: see if the resolved path ends with
+        // /Contents/MacOS/fish, case insensitive since HFS+ usually is.
+        if (!done) {
             const char *suffix = "/Contents/MacOS/fish";
             const size_t suffixlen = strlen(suffix);
-            if (has_suffix(exec_path, suffix, true))
-            {
-                /* Looks like we're a bundle. Cut the string at the / prefixing /Contents... and then the rest */
+            if (has_suffix(exec_path, suffix, true)) {
+                // Looks like we're a bundle. Cut the string at the / prefixing /Contents... and
+                // then the rest.
                 wcstring wide_resolved_path = str2wcstring(exec_path);
                 wide_resolved_path.resize(exec_path.size() - suffixlen);
                 wide_resolved_path.append(L"/Contents/Resources/");
 
-                /* Append share, etc, doc */
+                // Append share, etc, doc.
                 paths.data = wide_resolved_path + L"share/fish";
                 paths.sysconf = wide_resolved_path + L"etc/fish";
                 paths.doc = wide_resolved_path + L"doc/fish";
 
-                /* But the bin_dir is the resolved_path, minus fish (aka the MacOS directory) */
+                // But the bin_dir is the resolved_path, minus fish (aka the MacOS directory).
                 paths.bin = str2wcstring(exec_path);
                 paths.bin.resize(paths.bin.size() - strlen("/fish"));
 
@@ -158,18 +150,13 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
         }
 #endif
 
-        if (! done)
-        {
-            /* The next check is that we are in a reloctable directory tree like this:
-                 bin/fish
-                 etc/fish
-                 share/fish
-
-                 Check it!
-            */
+        if (!done) {
+            // The next check is that we are in a reloctable directory tree like this:
+            //   bin/fish
+            //   etc/fish
+            //   share/fish
             const char *suffix = "/bin/fish";
-            if (has_suffix(exec_path, suffix, false))
-            {
+            if (has_suffix(exec_path, suffix, false)) {
                 wcstring base_path = str2wcstring(exec_path);
                 base_path.resize(base_path.size() - strlen(suffix));
 
@@ -178,13 +165,12 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
                 paths.doc = base_path + L"/share/doc/fish";
                 paths.bin = base_path + L"/bin";
 
-                /* Check only that the data and sysconf directories exist. Handle the doc directories separately */
+                // Check only that the data and sysconf directories exist. Handle the doc
+                // directories separately.
                 struct stat buf;
-                if (0 == wstat(paths.data, &buf) && 0 == wstat(paths.sysconf, &buf))
-                {
-                    /* The docs dir may not exist; in that case fall back to the compiled in path */
-                    if (0 != wstat(paths.doc, &buf))
-                    {
+                if (0 == wstat(paths.data, &buf) && 0 == wstat(paths.sysconf, &buf)) {
+                    // The docs dir may not exist; in that case fall back to the compiled in path.
+                    if (0 != wstat(paths.doc, &buf)) {
                         paths.doc = L"" DOCDIR;
                     }
                     done = true;
@@ -193,9 +179,8 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
         }
     }
 
-    if (! done)
-    {
-        /* Fall back to what got compiled in. */
+    if (!done) {
+        // Fall back to what got compiled in.
         paths.data = L"" DATADIR "/fish";
         paths.sysconf = L"" SYSCONFDIR "/fish";
         paths.doc = L"" DOCDIR;
@@ -208,21 +193,19 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
 }
 
 // Source the file config.fish in the given directory.
-static void source_config_in_directory(const wcstring &dir)
-{
-    // If the config.fish file doesn't exist or isn't readable silently return.
-    // Fish versions up thru 2.2.0 would instead try to source the file with
-    // stderr redirected to /dev/null to deal with that possibility.
+static void source_config_in_directory(const wcstring &dir) {
+    // If the config.fish file doesn't exist or isn't readable silently return. Fish versions up
+    // thru 2.2.0 would instead try to source the file with stderr redirected to /dev/null to deal
+    // with that possibility.
     //
-    // This introduces a race condition since the readability of the file can
-    // change between this test and the execution of the 'source' command.
-    // However, that is not a security problem in this context so we ignore it.
+    // This introduces a race condition since the readability of the file can change between this
+    // test and the execution of the 'source' command. However, that is not a security problem in
+    // this context so we ignore it.
     const wcstring config_pathname = dir + L"/config.fish";
     const wcstring escaped_dir = escape_string(dir, ESCAPE_ALL);
     const wcstring escaped_pathname = escaped_dir + L"/config.fish";
     if (waccess(config_pathname, R_OK) != 0) {
-        debug(2, L"not sourcing %ls (not readable or does not exist)",
-                escaped_pathname.c_str());
+        debug(2, L"not sourcing %ls (not readable or does not exist)", escaped_pathname.c_str());
         return;
     }
     debug(2, L"sourcing %ls", escaped_pathname.c_str());
@@ -234,21 +217,14 @@ static void source_config_in_directory(const wcstring &dir)
     parser.set_is_within_fish_initialization(false);
 }
 
-static int try_connect_socket(std::string &name)
-{
+static int try_connect_socket(std::string &name) {
     int s, r, ret = -1;
 
-    /** Connect to a DGRAM socket rather than the expected STREAM.
-      This avoids any notification to a remote socket that we have connected,
-      preventing any surprising behaviour.
-      If the connection fails with EPROTOTYPE, the connection is probably a
-      STREAM; if it succeeds or fails any other way, there is no cause for
-      alarm.
-      With thanks to Andrew Lutomirski <github.com/amluto>
-    */
-
-    if ((s = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
-    {
+    /// Connect to a DGRAM socket rather than the expected STREAM. This avoids any notification to a
+    /// remote socket that we have connected, preventing any surprising behaviour. If the connection
+    /// fails with EPROTOTYPE, the connection is probably a STREAM; if it succeeds or fails any
+    /// other way, there is no cause for alarm. With thanks to Andrew Lutomirski <github.com/amluto>
+    if ((s = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1) {
         wperror(L"socket");
         return -1;
     }
@@ -261,8 +237,7 @@ static int try_connect_socket(std::string &name)
 
     r = connect(s, (struct sockaddr *)&local, sizeof local);
 
-    if (r == -1 && errno == EPROTOTYPE)
-    {
+    if (r == -1 && errno == EPROTOTYPE) {
         ret = 0;
     }
 
@@ -270,24 +245,19 @@ static int try_connect_socket(std::string &name)
     return ret;
 }
 
-/**
-   Check for a running fishd from old versions and warn about not being able
-   to share variables.
-   https://github.com/fish-shell/fish-shell/issues/1730
-*/
-static void check_running_fishd()
-{
-    /* There are two paths to check:
-       $FISHD_SOCKET_DIR/fishd.socket.$USER or /tmp/fishd.socket.$USER
-         - referred to as the "old socket"
-       $XDG_RUNTIME_DIR/fishd.socket or /tmp/fish.$USER/fishd.socket
-         - referred to as the "new socket"
-       All existing versions of fish attempt to create the old socket, but
-       failure in newer versions is not treated as critical, so both need
-       to be checked. */
+/// Check for a running fishd from old versions and warn about not being able to share variables.
+/// https://github.com/fish-shell/fish-shell/issues/1730
+static void check_running_fishd() {
+    // There are two paths to check:
+    // $FISHD_SOCKET_DIR/fishd.socket.$USER or /tmp/fishd.socket.$USER
+    //   - referred to as the "old socket"
+    // $XDG_RUNTIME_DIR/fishd.socket or /tmp/fish.$USER/fishd.socket
+    //   - referred to as the "new socket"
+    // All existing versions of fish attempt to create the old socket, but
+    // failure in newer versions is not treated as critical, so both need
+    // to be checked.
     const char *uname = getenv("USER");
-    if (uname == NULL)
-    {
+    if (uname == NULL) {
         const struct passwd *pw = getpwuid(getuid());
         uname = pw->pw_name;
     }
@@ -295,12 +265,9 @@ static void check_running_fishd()
     const char *dir_old_socket = getenv("FISHD_SOCKET_DIR");
     std::string path_old_socket;
 
-    if (dir_old_socket == NULL)
-    {
+    if (dir_old_socket == NULL) {
         path_old_socket = "/tmp/";
-    }
-    else
-    {
+    } else {
         path_old_socket.append(dir_old_socket);
     }
 
@@ -309,146 +276,107 @@ static void check_running_fishd()
 
     const char *dir_new_socket = getenv("XDG_RUNTIME_DIR");
     std::string path_new_socket;
-    if (dir_new_socket == NULL)
-    {
+    if (dir_new_socket == NULL) {
         path_new_socket = "/tmp/fish.";
         path_new_socket.append(uname);
         path_new_socket.push_back('/');
-    }
-    else
-    {
+    } else {
         path_new_socket.append(dir_new_socket);
     }
 
     path_new_socket.append("fishd.socket");
 
-    if (try_connect_socket(path_old_socket) == 0 || try_connect_socket(path_new_socket) == 0)
-    {
-        debug(1, _(L"Old versions of fish appear to be running. You will not be able to share variable values between old and new fish sessions. For best results, restart all running instances of fish."));
+    if (try_connect_socket(path_old_socket) == 0 || try_connect_socket(path_new_socket) == 0) {
+        debug(1, _(L"Old versions of fish appear to be running. You will not be able to share "
+                   L"variable values between old and new fish sessions. For best results, restart "
+                   L"all running instances of fish."));
     }
-
 }
 
-/**
-   Parse init files. exec_path is the path of fish executable as determined by argv[0].
-*/
-static int read_init(const struct config_paths_t &paths)
-{
+/// Parse init files. exec_path is the path of fish executable as determined by argv[0].
+static int read_init(const struct config_paths_t &paths) {
     source_config_in_directory(paths.data);
     source_config_in_directory(paths.sysconf);
 
-    /* We need to get the configuration directory before we can source the user configuration file. If path_get_config returns false then we have no configuration directory and no custom config to load. */
+    // We need to get the configuration directory before we can source the user configuration file.
+    // If path_get_config returns false then we have no configuration directory and no custom config
+    // to load.
     wcstring config_dir;
-    if (path_get_config(config_dir))
-    {
+    if (path_get_config(config_dir)) {
         source_config_in_directory(config_dir);
     }
 
     return 1;
 }
 
-/**
-  Parse the argument list, return the index of the first non-switch
-  arguments.
- */
-static int fish_parse_opt(int argc, char **argv, std::vector<std::string> *cmds)
-{
+/// Parse the argument list, return the index of the first non-switch arguments.
+static int fish_parse_opt(int argc, char **argv, std::vector<std::string> *cmds) {
     const char *short_opts = "+hilnvc:p:d:";
-    const struct option long_opts[] =
-    {
-        { "command", required_argument, NULL, 'c' },
-        { "debug-level", required_argument, NULL, 'd' },
-        { "interactive", no_argument, NULL, 'i' } ,
-        { "login", no_argument, NULL, 'l' },
-        { "no-execute", no_argument, NULL, 'n' },
-        { "profile", required_argument, NULL, 'p' },
-        { "help", no_argument, NULL, 'h' },
-        { "version", no_argument, NULL, 'v' },
-        { NULL, 0, NULL, 0 }
-    };
+    const struct option long_opts[] = {{"command", required_argument, NULL, 'c'},
+                                       {"debug-level", required_argument, NULL, 'd'},
+                                       {"interactive", no_argument, NULL, 'i'},
+                                       {"login", no_argument, NULL, 'l'},
+                                       {"no-execute", no_argument, NULL, 'n'},
+                                       {"profile", required_argument, NULL, 'p'},
+                                       {"help", no_argument, NULL, 'h'},
+                                       {"version", no_argument, NULL, 'v'},
+                                       {NULL, 0, NULL, 0}};
 
     int opt;
-    while ((opt = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1)
-    {
-        switch (opt)
-        {
-            case 0:
-            {
+    while ((opt = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) {
+        switch (opt) {
+            case 0: {
                 fwprintf(stderr, _(L"getopt_long() unexpectedly returned zero\n"));
                 exit(127);
             }
-
-            case 'c':
-            {
+            case 'c': {
                 cmds->push_back(optarg);
                 break;
             }
-
-            case 'd':
-            {
+            case 'd': {
                 char *end;
                 long tmp;
 
                 errno = 0;
                 tmp = strtol(optarg, &end, 10);
 
-                if (tmp >= 0 && tmp <=10 && !*end && !errno)
-                {
+                if (tmp >= 0 && tmp <= 10 && !*end && !errno) {
                     debug_level = (int)tmp;
-                }
-                else
-                {
-                    fwprintf(stderr, _(L"Invalid value '%s' for debug level switch"),
-                            optarg);
+                } else {
+                    fwprintf(stderr, _(L"Invalid value '%s' for debug level switch"), optarg);
                     exit(1);
                 }
                 break;
             }
-
-            case 'h':
-            {
+            case 'h': {
                 cmds->push_back("__fish_print_help fish");
                 break;
             }
-
-            case 'i':
-            {
+            case 'i': {
                 is_interactive_session = 1;
                 break;
             }
-
-            case 'l':
-            {
+            case 'l': {
                 is_login = 1;
                 break;
             }
-
-            case 'n':
-            {
+            case 'n': {
                 no_exec = 1;
                 break;
             }
-
-            case 'p':
-            {
+            case 'p': {
                 s_profiling_output_filename = optarg;
                 g_profiling_active = true;
                 break;
             }
-
-            case 'v':
-            {
-                fwprintf(stdout, _(L"%s, version %s\n"), PACKAGE_NAME,
-                         get_fish_version());
+            case 'v': {
+                fwprintf(stdout, _(L"%s, version %s\n"), PACKAGE_NAME, get_fish_version());
                 exit(0);
             }
-
-            default:
-            {
+            default: {
                 // We assume getopt_long() has already emitted a diagnostic msg.
                 exit(1);
             }
-
         }
     }
 
@@ -458,51 +386,43 @@ static int fish_parse_opt(int argc, char **argv, std::vector<std::string> *cmds)
     // We are an interactive session if we have not been given an explicit
     // command or file to execute and stdin is a tty. Note that the -i or
     // --interactive options also force interactive mode.
-    if (cmds->size() == 0 && optind == argc && isatty(STDIN_FILENO))
-    {
+    if (cmds->size() == 0 && optind == argc && isatty(STDIN_FILENO)) {
         is_interactive_session = 1;
     }
 
     return optind;
 }
 
-int main(int argc, char **argv)
-{
-    int res=1;
-    int my_optind=0;
+int main(int argc, char **argv) {
+    int res = 1;
+    int my_optind = 0;
 
     // We can't do this at compile time due to the use of enum symbols.
-    assert(EXPAND_SENTINAL >= EXPAND_RESERVED_BASE &&
-           EXPAND_SENTINAL <= EXPAND_RESERVED_END);
-    assert(ANY_SENTINAL >= WILDCARD_RESERVED_BASE &&
-           ANY_SENTINAL <= WILDCARD_RESERVED_END);
-    assert(R_SENTINAL >= INPUT_COMMON_BASE &&
-           R_SENTINAL <= INPUT_COMMON_END);
+    assert(EXPAND_SENTINAL >= EXPAND_RESERVED_BASE && EXPAND_SENTINAL <= EXPAND_RESERVED_END);
+    assert(ANY_SENTINAL >= WILDCARD_RESERVED_BASE && ANY_SENTINAL <= WILDCARD_RESERVED_END);
+    assert(R_SENTINAL >= INPUT_COMMON_BASE && R_SENTINAL <= INPUT_COMMON_END);
 
     set_main_thread();
     setup_fork_guards();
 
     wsetlocale(LC_ALL, L"");
-    program_name=L"fish";
+    program_name = L"fish";
 
-    //struct stat tmp;
-    //stat("----------FISH_HIT_MAIN----------", &tmp);
+    // struct stat tmp;
+    // stat("----------FISH_HIT_MAIN----------", &tmp);
 
     std::vector<std::string> cmds;
     my_optind = fish_parse_opt(argc, argv, &cmds);
 
-    /*
-      No-exec is prohibited when in interactive mode
-    */
-    if (is_interactive_session && no_exec)
-    {
+    // No-exec is prohibited when in interactive mode.
+    if (is_interactive_session && no_exec) {
         debug(1, _(L"Can not use the no-execute mode when running an interactive session"));
         no_exec = 0;
     }
 
-    /* Only save (and therefore restore) the fg process group if we are interactive. See #197, #1002 */
-    if (is_interactive_session)
-    {
+    // Only save (and therefore restore) the fg process group if we are interactive. See issues
+    // #197 and #1002.
+    if (is_interactive_session) {
         save_term_foreground_process_group();
     }
 
@@ -515,63 +435,48 @@ int main(int argc, char **argv)
     env_init(&paths);
     reader_init();
     history_init();
-    /* For setcolor to support term256 in config.fish (#1022) */
+    // For set_color to support term256 in config.fish (issue #1022).
     update_fish_color_support();
 
     parser_t &parser = parser_t::principal_parser();
 
-    if (g_log_forks)
-        printf("%d: g_fork_count: %d\n", __LINE__, g_fork_count);
+    if (g_log_forks) printf("%d: g_fork_count: %d\n", __LINE__, g_fork_count);
 
     const io_chain_t empty_ios;
-    if (read_init(paths))
-    {
-        /* Stomp the exit status of any initialization commands (#635) */
+    if (read_init(paths)) {
+        // Stomp the exit status of any initialization commands (issue #635).
         proc_set_last_status(STATUS_BUILTIN_OK);
 
-        /* Run the commands specified as arguments, if any */
-        if (! cmds.empty())
-        {
-            /* Do something nasty to support OpenSUSE assuming we're bash. This may modify cmds. */
-            if (is_login)
-            {
+        // Run the commands specified as arguments, if any.
+        if (!cmds.empty()) {
+            // Do something nasty to support OpenSUSE assuming we're bash. This may modify cmds.
+            if (is_login) {
                 fish_xdm_login_hack_hack_hack_hack(&cmds, argc - my_optind, argv + my_optind);
             }
-            for (size_t i=0; i < cmds.size(); i++)
-            {
+            for (size_t i = 0; i < cmds.size(); i++) {
                 const wcstring cmd_wcs = str2wcstring(cmds.at(i));
                 res = parser.eval(cmd_wcs, empty_ios, TOP);
             }
             reader_exit(0, 0);
-        }
-        else if (my_optind == argc)
-        {
+        } else if (my_optind == argc) {
             // Interactive mode
             check_running_fishd();
             res = reader_read(STDIN_FILENO, empty_ios);
-        }
-        else
-        {
-            char *file = *(argv+(my_optind++));
+        } else {
+            char *file = *(argv + (my_optind++));
             int fd = open(file, O_RDONLY);
-            if (fd == -1)
-            {
+            if (fd == -1) {
                 perror(file);
-            }
-            else
-            {
-                // OK to not do this atomically since we cannot have gone multithreaded yet
+            } else {
+                // OK to not do this atomically since we cannot have gone multithreaded yet.
                 set_cloexec(fd);
 
-                if (*(argv+my_optind))
-                {
+                if (*(argv + my_optind)) {
                     wcstring sb;
                     char **ptr;
                     int i;
-                    for (i=1,ptr = argv+my_optind; *ptr; i++, ptr++)
-                    {
-                        if (i != 1)
-                            sb.append(ARRAY_SEP_STR);
+                    for (i = 1, ptr = argv + my_optind; *ptr; i++, ptr++) {
+                        if (i != 1) sb.append(ARRAY_SEP_STR);
                         sb.append(str2wcstring(*ptr));
                     }
 
@@ -584,11 +489,10 @@ int main(int argc, char **argv)
 
                 res = reader_read(fd, empty_ios);
 
-                if (res)
-                {
-                    debug(1,
-                          _(L"Error while reading file %ls\n"),
-                          reader_current_filename()?reader_current_filename(): _(L"Standard input"));
+                if (res) {
+                    debug(1, _(L"Error while reading file %ls\n"), reader_current_filename()
+                                                                       ? reader_current_filename()
+                                                                       : _(L"Standard input"));
                 }
                 reader_pop_current_filename();
             }
@@ -602,8 +506,7 @@ int main(int argc, char **argv)
     restore_term_mode();
     restore_term_foreground_process_group();
 
-    if (g_profiling_active)
-    {
+    if (g_profiling_active) {
         parser.emit_profiling(s_profiling_output_filename);
     }
 
@@ -613,9 +516,8 @@ int main(int argc, char **argv)
     reader_destroy();
     event_destroy();
 
-    if (g_log_forks)
-        printf("%d: g_fork_count: %d\n", __LINE__, g_fork_count);
+    if (g_log_forks) printf("%d: g_fork_count: %d\n", __LINE__, g_fork_count);
 
     exit_without_destructors(exit_status);
-    return EXIT_FAILURE; //above line should always exit
+    return EXIT_FAILURE;  // above line should always exit
 }