From da68cf3a858b6229636bb5d7096890455dc441ed Mon Sep 17 00:00:00 2001
From: "Antonio S. Musumeci" <Antonio.Musumeci@morganstanley.com>
Date: Sat, 18 Apr 2026 01:01:00 -0400
Subject: [PATCH] Formatting: normalize brace style and parameter alignment

No functional change: libfuse/helper.cpp (fuse_daemonize,
fuse_helper_opt_proc, fuse_parse_cmdline) and mergerfs
fuse_init.cpp (_want helpers) reformatted to match the project's
GNU-style brace placement and aligned parameter lists.
---
 src/fuse_init.cpp               |   8 +--
 vendored/libfuse/lib/helper.cpp | 100 +++++++++++++++++---------------
 2 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/src/fuse_init.cpp b/src/fuse_init.cpp
index ecf58bf2..91d90893 100644
--- a/src/fuse_init.cpp
+++ b/src/fuse_init.cpp
@@ -45,7 +45,7 @@ _want(fuse_conn_info_t *conn_,
 static
 bool
 _capable(fuse_conn_info_t *conn_,
-         const int       flag_)
+         const int         flag_)
 {
   return !!(conn_->capable & flag_);
 }
@@ -53,7 +53,7 @@ _capable(fuse_conn_info_t *conn_,
 static
 void
 _want_if_capable(fuse_conn_info_t *conn_,
-                 const int       flag_)
+                 const int         flag_)
 {
   if(::_capable(conn_,flag_))
     ::_want(conn_,flag_);
@@ -62,8 +62,8 @@ _want_if_capable(fuse_conn_info_t *conn_,
 static
 void
 _want_if_capable(fuse_conn_info_t *conn_,
-                 const int       flag_,
-                 ConfigBOOL     *want_)
+                 const int         flag_,
+                 ConfigBOOL       *want_)
 {
   if(*want_ && ::_capable(conn_,flag_))
     {
diff --git a/vendored/libfuse/lib/helper.cpp b/vendored/libfuse/lib/helper.cpp
index 41cf1bdf..9209f78d 100644
--- a/vendored/libfuse/lib/helper.cpp
+++ b/vendored/libfuse/lib/helper.cpp
@@ -102,7 +102,7 @@ fuse_helper_opt_proc(void             *data,
 
     default:
       return 1;
-  }
+    }
 }
 
 static int add_default_subtype(const char *progname, struct fuse_args *args)
@@ -153,58 +153,66 @@ fuse_parse_cmdline(struct fuse_args  *args_,
 
  err:
   free(hopts.mountpoint);
+
   return -1;
 }
 
-int fuse_daemonize(int foreground)
+int
+fuse_daemonize(int foreground)
 {
-  if (!foreground) {
-    int nullfd;
-    int waiter[2];
-    char completed;
+  if(!foreground)
+    {
+      int nullfd;
+      int waiter[2];
+      char completed;
 
-    if (pipe(waiter)) {
-      perror("fuse_daemonize: pipe");
-      return -1;
+      if(pipe(waiter))
+        {
+          perror("fuse_daemonize: pipe");
+          return -1;
+        }
+
+      /*
+       * demonize current process by forking it and killing the
+       * parent.  This makes current process as a child of 'init'.
+       */
+      switch(fork())
+        {
+        case -1:
+          perror("fuse_daemonize: fork");
+          return -1;
+        case 0:
+          break;
+        default:
+          read(waiter[0], &completed, sizeof(completed));
+          _exit(0);
+        }
+
+      if(setsid() == -1)
+        {
+          perror("fuse_daemonize: setsid");
+          return -1;
+        }
+
+      (void) chdir("/");
+
+      nullfd = open("/dev/null", O_RDWR, 0);
+      if(nullfd != -1)
+        {
+          (void) dup2(nullfd, 0);
+          (void) dup2(nullfd, 1);
+          (void) dup2(nullfd, 2);
+          if (nullfd > 2)
+            close(nullfd);
+        }
+
+      /* Propagate completion of daemon initializatation */
+      completed = 1;
+      write(waiter[1], &completed, sizeof(completed));
+      close(waiter[0]);
+      close(waiter[1]);
     }
 
-    /*
-     * demonize current process by forking it and killing the
-     * parent.  This makes current process as a child of 'init'.
-     */
-    switch(fork()) {
-    case -1:
-      perror("fuse_daemonize: fork");
-      return -1;
-    case 0:
-      break;
-    default:
-      read(waiter[0], &completed, sizeof(completed));
-      _exit(0);
-    }
-
-    if (setsid() == -1) {
-      perror("fuse_daemonize: setsid");
-      return -1;
-    }
-
-    (void) chdir("/");
-
-    nullfd = open("/dev/null", O_RDWR, 0);
-    if (nullfd != -1) {
-      (void) dup2(nullfd, 0);
-      (void) dup2(nullfd, 1);
-      (void) dup2(nullfd, 2);
-      if (nullfd > 2)
-        close(nullfd);
-    }
-
-    /* Propagate completion of daemon initializatation */
-    completed = 1;
-    write(waiter[1], &completed, sizeof(completed));
-    close(waiter[0]);
-    close(waiter[1]);
-  }
   return 0;
 }