build fixes

diff --git a/.cvsignore b/.cvsignore
index 993b68fff7ff728f4cb8ca0c27a7acd6102bc169..4a877a2793fb73d803259a5463e26c3ad7e49386 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,6 +6,5 @@ install-sh
 mkinstalldirs
 missing
 config.log
-config.h
 config.cache
 config.status

diff --git a/Makefile.am b/Makefile.am
index e9b161a956422c3538fa3cf24369b6814f9703ea..dc261451bdb0972303dfee2d4fd2464f985af3bf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = kernel lib example
+SUBDIRS = kernel lib example include

diff --git a/configure.in b/configure.in
index df5a45705adb839b6dde42ff8c02d539c088f98d..7451681f6634dfce1aefacd3166e7ddcc2b53982 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -29,6 +29,6 @@ AC_MSG_RESULT([$kernelsrc])
 KERNINCLUDE=$kernelsrc/include
 AC_SUBST(KERNINCLUDE)
 
-AC_OUTPUT([Makefile kernel/Makefile lib/Makefile example/Makefile])
+AC_OUTPUT([Makefile kernel/Makefile lib/Makefile example/Makefile include/Makefile include/linux/Makefile])
 
 

diff --git a/include/.cvsignore b/include/.cvsignore
index 0513d7d6350b555e345c6a7d1140523d525b3f20..c8a83bfd5974cec6934867403b61e5cd8b8f45f6 100644 (file)
--- a/include/.cvsignore
+++ b/include/.cvsignore
@@ -1,3 +1,6 @@
+Makefile.in
+Makefile
 config.h.in
+config.h
 stamp-h.in
 stamp-h

diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644 (file)
index 0000000..9e67b61
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,5 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = linux
+
+include_HEADERS = fuse.h

diff --git a/include/fuse.h b/include/fuse.h
index 4cddaaf13168d024033ee5c33bd922f43cd5f6bb..14b64516cab44fe0ceed9154720c1d7647dff9e2 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -83,8 +83,13 @@ struct fuse_operations {
 };
 
 /* FUSE flags: */
+
+/** Process requests in multiple threads */
 #define FUSE_MULTITHREAD (1 << 0)
 
+/** Enable debuging output */
+#define FUSE_DEBUG       (1 << 1)
+
 /**
  * Create a new FUSE filesystem. The filesystem is not yet mounted
  *

diff --git a/include/linux/.cvsignore b/include/linux/.cvsignore
new file mode 100644 (file)
index 0000000..3dda729
--- /dev/null
+++ b/include/linux/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
new file mode 100644 (file)
index 0000000..173f647
--- /dev/null
+++ b/include/linux/Makefile.am
@@ -0,0 +1,3 @@
+## Process this file with automake to produce Makefile.in
+
+noinst_HEADERS = fuse.h

diff --git a/lib/fuse.c b/lib/fuse.c
index 2776adc4c7cf170ded762738ac60d5b8b24f0ade..fc2358be8a30fbd4fc644076ad1e1738ee916f08 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -347,9 +347,11 @@ static void send_reply(struct fuse *f, struct fuse_in_header *in, int error,
     if(argsize != 0)
         memcpy(outbuf + sizeof(struct fuse_out_header), arg, argsize);
 
-    printf("   unique: %i, error: %i (%s), outsize: %i\n", out->unique,
-           out->error, strerror(-out->error), outsize);
-    fflush(stdout);
+    if((f->flags & FUSE_DEBUG)) {
+        printf("   unique: %i, error: %i (%s), outsize: %i\n", out->unique,
+               out->error, strerror(-out->error), outsize);
+        fflush(stdout);
+    }
                 
     res = write(f->fd, outbuf, outsize);
     if(res == -1)
@@ -755,9 +757,11 @@ static void *do_command(void *data)
     size_t argsize;
     struct fuse *f = cmd->f;
 
-    printf("unique: %i, opcode: %i, ino: %li, insize: %i\n", in->unique,
-           in->opcode, in->ino, cmd->buflen);
-    fflush(stdout);
+    if((f->flags & FUSE_DEBUG)) {
+        printf("unique: %i, opcode: %i, ino: %li, insize: %i\n", in->unique,
+               in->opcode, in->ino, cmd->buflen);
+        fflush(stdout);
+    }
     
     argsize = cmd->buflen - sizeof(struct fuse_in_header);