github/mergerfs
4
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2026-10-19 16:16:48 +00:00
Code Issues Releases Wiki Activity

Formatting: normalize brace style and parameter alignment

Browse Source 
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.
This commit is contained in:
Antonio S. Musumeci
2026-04-18 13:47:23 -05:00
committed by trapexit
parent ec40866091
commit da68cf3a85
2 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fuse_init.cpp
+4 -4
View File
@@ -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_))
{
vendored/libfuse/lib/helper.cpp
+54 -46
View File
@@ -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;
}