projects
/
rrq
/
fusefile.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5a6058d
)
revised internal options
author
Ralph Ronnquist
<ralph.ronnquist@gmail.com>
Sat, 16 Jul 2022 00:02:06 +0000
(10:02 +1000)
committer
Ralph Ronnquist
<ralph.ronnquist@gmail.com>
Sat, 16 Jul 2022 00:02:06 +0000
(10:02 +1000)
fusefile.c
patch
|
blob
|
history
diff --git
a/fusefile.c
b/fusefile.c
index 8e09b588316719670810ebdc1013c5e1076e60c7..a976660e29fb56a5c73297e27e24ab0e212db5a7 100644
(file)
--- a/
fusefile.c
+++ b/
fusefile.c
@@
-420,28
+420,31
@@
static void usage() {
/**
* Set up the arguments for the fuse_main call, adding our own.
/**
* Set up the arguments for the fuse_main call, adding our own.
+ * argv[argc] is the mount point argument
*/
static int setup_argv(int argc,char ***argv) {
*/
static int setup_argv(int argc,char ***argv) {
+ // note: (*argv)[ argc ] is the mount point argument
char *OURS[] = {
"-odefault_permissions",
char *OURS[] = {
"-odefault_permissions",
- (*argv)[
--argc ] // note: (*argv)[ argc-1 ] = the mount point
+ (*argv)[
argc ]
};
#define OURSN ( sizeof( OURS ) / sizeof( char* ) )
};
#define OURSN ( sizeof( OURS ) / sizeof( char* ) )
- int N = argc + OURSN; // new argv-tobe size, excluding null
- char **out = malloc( ( N + 1 ) * sizeof( char* ) );
+ int N = argc + OURSN;
+ // Allocate new arg array plus terminating null pointer
+ char **out = malloc( ( N + 1 ) * sizeof( char* ) );
int i;
for ( i = 0; i < argc; i++ ) {
out[ i ] = (*argv)[i];
int i;
for ( i = 0; i < argc; i++ ) {
out[ i ] = (*argv)[i];
- fprintf( stderr, " %s", out[ i ] );
+
//
fprintf( stderr, " %s", out[ i ] );
}
for ( i = 0; i < OURSN; i++ ) {
out[ argc + i ] = OURS[i];
}
for ( i = 0; i < OURSN; i++ ) {
out[ argc + i ] = OURS[i];
- fprintf( stderr, " %s", out[ i ] );
+
//
fprintf( stderr, " %s", out[ i ] );
}
out[ N ] = 0;
}
out[ N ] = 0;
- fprintf( stderr, "\n" );
+
//
fprintf( stderr, "\n" );
(*argv) = out;
(*argv) = out;
- return N;
+ return N;
// Don't include the terminating null pointer
}
/**
}
/**
@@
-466,8
+469,8
@@
int main(int argc, char *argv[])
if ( i > argc - 2 ) { // At least mount point plus one source
usage();
}
if ( i > argc - 2 ) { // At least mount point plus one source
usage();
}
- mnt = argv[ i++ ]; // First non-option argument is the mount pount
fuseargc = i;
fuseargc = i;
+ mnt = argv[ i++ ]; // First non-option argument is the mount pount
if ( setup_sources( argv, i, argc-i ) ) {
return 1;
}
if ( setup_sources( argv, i, argc-i ) ) {
return 1;
}