Diff

Differences From Artifact [616c3164a5]:

To Artifact [71ddae3095]:


   714    714   
   715    715   	return(TCL_OK);
   716    716   }
   717    717   
   718    718   /*
   719    719    * FUSE operations structure
   720    720    */
   721         -static struct fuse_operations appfs_oper = {
          721  +static struct fuse_operations appfs_operations = {
   722    722   	.getattr   = appfs_fuse_getattr,
   723    723   	.readdir   = appfs_fuse_readdir,
   724    724   	.readlink  = appfs_fuse_readlink,
   725    725   	.open      = appfs_fuse_open,
   726    726   	.release   = appfs_fuse_close,
   727    727   	.read      = appfs_fuse_read
   728    728   };
   729    729   
   730    730   /*
   731    731    * Entry point into this program.
   732    732    */
   733    733   int main(int argc, char **argv) {
          734  +	struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
   734    735   	const char *cachedir = APPFS_CACHEDIR;
   735    736   	int pthread_ret;
   736    737   
   737    738   	/*
   738    739   	 * Set global variables, these should be configuration options.
   739    740   	 */
   740    741   	globalThread.cachedir = cachedir;
................................................................................
   777    778   	 * Tcl mode, for running raw Tcl in the same environment AppFSd would
   778    779   	 * run code.
   779    780   	 */
   780    781   	if (argc == 3 && strcmp(argv[1], "-tcl") == 0) {
   781    782   		return(appfs_tcl(argv[2]));
   782    783   	}
   783    784   
          785  +	/*
          786  +	 * Add FUSE arguments which we always supply
          787  +	 */
          788  +	fuse_opt_parse(&args, NULL, NULL, NULL);
          789  +	fuse_opt_add_arg(&args, "-odefault_permissions,fsname=appfs,use_ino,kernel_cache,entry_timeout=60,attr_timeout=3600,intr,big_writes");
          790  +
   784    791   	/*
   785    792   	 * Enter the FUSE main loop -- this will process any arguments
   786    793   	 * and start servicing requests.
   787    794   	 */
   788         -	return(fuse_main(argc, argv, &appfs_oper, NULL));
          795  +	return(fuse_main(args.argc, args.argv, &appfs_operations, NULL));
   789    796   }
   790    797