Fossil SCM

Backout the fusefs change. The correct solution is to run "./configure" followed by "make clean fossil" in order to rebuild when updating from historical sources.

drh 2016-10-31 18:57 trunk

Commit 08f0ac0cb4f466444e96a62997817b6a09ed4fa9

Parent d13fc6a6b79e71b…

1 file changed +3 -7

~ src/fusefs.c

M src/fusefs.c

+3 -7

		--- src/fusefs.c
		+++ src/fusefs.c
		@@ -20,20 +20,20 @@
20	20	**
21	21	** This module is a mostly a no-op unless compiled with -DFOSSIL_HAVE_FUSEFS.
22	22	** The FOSSIL_HAVE_FUSEFS should be omitted on systems that lack support for
23	23	** the Fuse Filesystem, of course.
24	24	*/
25		-#include "config.h"
26		-#include "fusefs.h"
27	25	#ifdef FOSSIL_HAVE_FUSEFS
	26	+#include "config.h"
28	27	#include <stdio.h>
29	28	#include <string.h>
30	29	#include <errno.h>
31	30	#include <fcntl.h>
32	31	#include <stdlib.h>
33	32	#include <unistd.h>
34	33	#include <sys/types.h>
	34	+#include "fusefs.h"
35	35
36	36	#define FUSE_USE_VERSION 26
37	37	#include <fuse.h>
38	38
39	39	/*
		@@ -283,11 +283,10 @@
283	283	static struct fuse_operations fusefs_methods = {
284	284	.getattr = fusefs_getattr,
285	285	.readdir = fusefs_readdir,
286	286	.read = fusefs_read,
287	287	};
288		-#endif /* FOSSIL_HAVE_FUSEFS */
289	288
290	289	/*
291	290	** COMMAND: fusefs
292	291	**
293	292	** Usage: %fossil fusefs [--debug] DIRECTORY
		@@ -315,13 +314,10 @@
315	314	** After stopping the "fossil fusefs" command, it might also be necessary
316	315	** to run "fusermount -u DIRECTORY" to reset the FuseFS before using it
317	316	** again.
318	317	*/
319	318	void fusefs_cmd(void){
320		-#ifndef FOSSIL_HAVE_FUSEFS
321		- fossil_fatal("fusefs not supported in this build");
322		-#else
323	319	char *zMountPoint;
324	320	char *azNewArgv[5];
325	321	int doDebug = find_option("debug","d",0)!=0;
326	322
327	323	db_find_and_open_repository(0,0);
		@@ -339,7 +335,7 @@
339	335	azNewArgv[4] = 0;
340	336	g.localOpen = 0; /* Prevent tags like "current" and "prev" */
341	337	fuse_main(4, azNewArgv, &fusefs_methods, NULL);
342	338	fusefs_reset();
343	339	fusefs_clear_path();
344		-#endif
345	340	}
	341	+#endif /* FOSSIL_HAVE_FUSEFS */
346	342

	--- src/fusefs.c
	+++ src/fusefs.c
	@@ -20,20 +20,20 @@
20	**
21	** This module is a mostly a no-op unless compiled with -DFOSSIL_HAVE_FUSEFS.
22	** The FOSSIL_HAVE_FUSEFS should be omitted on systems that lack support for
23	** the Fuse Filesystem, of course.
24	*/
25	#include "config.h"
26	#include "fusefs.h"
27	#ifdef FOSSIL_HAVE_FUSEFS

28	#include <stdio.h>
29	#include <string.h>
30	#include <errno.h>
31	#include <fcntl.h>
32	#include <stdlib.h>
33	#include <unistd.h>
34	#include <sys/types.h>

35
36	#define FUSE_USE_VERSION 26
37	#include <fuse.h>
38
39	/*
	@@ -283,11 +283,10 @@
283	static struct fuse_operations fusefs_methods = {
284	.getattr = fusefs_getattr,
285	.readdir = fusefs_readdir,
286	.read = fusefs_read,
287	};
288	#endif /* FOSSIL_HAVE_FUSEFS */
289
290	/*
291	** COMMAND: fusefs
292	**
293	** Usage: %fossil fusefs [--debug] DIRECTORY
	@@ -315,13 +314,10 @@
315	** After stopping the "fossil fusefs" command, it might also be necessary
316	** to run "fusermount -u DIRECTORY" to reset the FuseFS before using it
317	** again.
318	*/
319	void fusefs_cmd(void){
320	#ifndef FOSSIL_HAVE_FUSEFS
321	fossil_fatal("fusefs not supported in this build");
322	#else
323	char *zMountPoint;
324	char *azNewArgv[5];
325	int doDebug = find_option("debug","d",0)!=0;
326
327	db_find_and_open_repository(0,0);
	@@ -339,7 +335,7 @@
339	azNewArgv[4] = 0;
340	g.localOpen = 0; /* Prevent tags like "current" and "prev" */
341	fuse_main(4, azNewArgv, &fusefs_methods, NULL);
342	fusefs_reset();
343	fusefs_clear_path();
344	#endif
345	}

346

	--- src/fusefs.c
	+++ src/fusefs.c
	@@ -20,20 +20,20 @@
20	**
21	** This module is a mostly a no-op unless compiled with -DFOSSIL_HAVE_FUSEFS.
22	** The FOSSIL_HAVE_FUSEFS should be omitted on systems that lack support for
23	** the Fuse Filesystem, of course.
24	*/


25	#ifdef FOSSIL_HAVE_FUSEFS
26	#include "config.h"
27	#include <stdio.h>
28	#include <string.h>
29	#include <errno.h>
30	#include <fcntl.h>
31	#include <stdlib.h>
32	#include <unistd.h>
33	#include <sys/types.h>
34	#include "fusefs.h"
35
36	#define FUSE_USE_VERSION 26
37	#include <fuse.h>
38
39	/*
	@@ -283,11 +283,10 @@
283	static struct fuse_operations fusefs_methods = {
284	.getattr = fusefs_getattr,
285	.readdir = fusefs_readdir,
286	.read = fusefs_read,
287	};

288
289	/*
290	** COMMAND: fusefs
291	**
292	** Usage: %fossil fusefs [--debug] DIRECTORY
	@@ -315,13 +314,10 @@
314	** After stopping the "fossil fusefs" command, it might also be necessary
315	** to run "fusermount -u DIRECTORY" to reset the FuseFS before using it
316	** again.
317	*/
318	void fusefs_cmd(void){



319	char *zMountPoint;
320	char *azNewArgv[5];
321	int doDebug = find_option("debug","d",0)!=0;
322
323	db_find_and_open_repository(0,0);
	@@ -339,7 +335,7 @@
335	azNewArgv[4] = 0;
336	g.localOpen = 0; /* Prevent tags like "current" and "prev" */
337	fuse_main(4, azNewArgv, &fusefs_methods, NULL);
338	fusefs_reset();
339	fusefs_clear_path();

340	}
341	#endif /* FOSSIL_HAVE_FUSEFS */
342

Fossil SCM

Keyboard Shortcuts