diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 13 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | fuse/Makefile.am | 11 | ||||
| -rw-r--r-- | fuse/main.c | 97 |
5 files changed, 2 insertions, 123 deletions
diff --git a/Makefile.am b/Makefile.am index 7aa00878..479df74c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = common sdpd hcid daemon \ network input audio sync \ tools rfcomm dund pand hidd \ - cups fuse alsa test scripts + cups alsa test scripts MAINTAINERCLEANFILES = Makefile.in \ aclocal.m4 configure config.h.in config.sub config.guess \ diff --git a/acinclude.m4 b/acinclude.m4 index 88488064..4acaa9bd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -102,12 +102,6 @@ AC_DEFUN([AC_PATH_GSTREAMER], [ AC_SUBST(GSTREAMER_LIBS) ]) -AC_DEFUN([AC_PATH_FUSE], [ - PKG_CHECK_MODULES(FUSE, fuse, fuse_found=yes, AC_MSG_RESULT(no)) - AC_SUBST(FUSE_CFLAGS) - AC_SUBST(FUSE_LIBS) -]) - AC_DEFUN([AC_PATH_ALSA], [ PKG_CHECK_MODULES(ALSA, alsa, alsa_found=yes, AC_MSG_RESULT(no)) AC_SUBST(ALSA_CFLAGS) @@ -143,7 +137,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ glib_enable=no obex_enable=${openobex_found} sync_enable=${opensync_found} - fuse_enable=no alsa_enable=no hcid_enable=yes sdpd_enable=no @@ -172,7 +165,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AC_ARG_ENABLE(all, AC_HELP_STRING([--enable-all], [enable all extra options below]), [ dbus_enable=${enableval} obex_enable=${enableval} - fuse_enable=${enableval} alsa_enable=${enableval} hcid_enable=${enableval} sdpd_enable=${enableval} @@ -207,10 +199,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ sync_enable=${enableval} ]) - AC_ARG_ENABLE(fuse, AC_HELP_STRING([--enable-fuse], [enable FUSE support]), [ - fuse_enable=${enableval} - ]) - AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa], [enable ALSA support]), [ alsa_enable=${enableval} ]) @@ -281,7 +269,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(GLIB, test "${glib_enable}" = "yes" && test "${glib_found}" = "yes") AM_CONDITIONAL(OBEX, test "${obex_enable}" = "yes" && test "${openobex_found}" = "yes") AM_CONDITIONAL(SYNC, test "${sync_enable}" = "yes" && test "${opensync_found}" = "yes") - AM_CONDITIONAL(FUSE, test "${fuse_enable}" = "yes" && test "${openobex_found}" = "yes" && test "${fuse_found}" = "yes") AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes") AM_CONDITIONAL(HCID, test "${hcid_enable}" = "yes") AM_CONDITIONAL(SDPD, test "${sdpd_enable}" = "yes") diff --git a/configure.in b/configure.in index 90784ef0..b33e92bb 100644 --- a/configure.in +++ b/configure.in @@ -37,4 +37,4 @@ AC_PATH_INOTIFY AC_ARG_BLUEZ -AC_OUTPUT(Makefile common/Makefile daemon/Makefile network/Makefile input/Makefile audio/Makefile sync/Makefile tools/Makefile rfcomm/Makefile hcid/Makefile sdpd/Makefile dund/Makefile pand/Makefile hidd/Makefile cups/Makefile fuse/Makefile alsa/Makefile test/Makefile scripts/Makefile) +AC_OUTPUT(Makefile common/Makefile daemon/Makefile network/Makefile input/Makefile audio/Makefile sync/Makefile tools/Makefile rfcomm/Makefile hcid/Makefile sdpd/Makefile dund/Makefile pand/Makefile hidd/Makefile cups/Makefile alsa/Makefile test/Makefile scripts/Makefile) diff --git a/fuse/Makefile.am b/fuse/Makefile.am deleted file mode 100644 index 1fd42311..00000000 --- a/fuse/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -if FUSE -noinst_PROGRAMS = btfs - -btfs_SOURCES = main.c -btfs_LDADD = @FUSE_LIBS@ @OPENOBEX_LIBS@ @BLUEZ_LIBS@ - -AM_CFLAGS = @BLUEZ_CFLAGS@ @OPENOBEX_CFLAGS@ @FUSE_CFLAGS@ -endif - -MAINTAINERCLEANFILES = Makefile.in diff --git a/fuse/main.c b/fuse/main.c deleted file mode 100644 index fe8086aa..00000000 --- a/fuse/main.c +++ /dev/null @@ -1,97 +0,0 @@ -/* - * - * BlueZ - Bluetooth protocol stack for Linux - * - * Copyright (C) 2004-2006 Marcel Holtmann <marcel@holtmann.org> - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <stdio.h> -#include <errno.h> -#include <fcntl.h> -#include <string.h> - -#include <fuse.h> - -static int btfs_getattr(const char *path, struct stat *stbuf) -{ - int err = 0; - - memset(stbuf, 0, sizeof(struct stat)); - - if (!strcmp(path, "/")) { - stbuf->st_mode = S_IFDIR | 0755; - stbuf->st_nlink = 2; - } else if (!strcmp(path, "/test")) { - stbuf->st_mode = S_IFREG | 0444; - stbuf->st_nlink = 1; - stbuf->st_size = strlen("/test"); - } else - err = -ENOENT; - - return err; -} - -static int btfs_getdir(const char *path, fuse_dirh_t h, fuse_dirfil_t filler) -{ - if (strcmp(path, "/")) - return -ENOENT; - - filler(h, ".", 0); - filler(h, "..", 0); - filler(h, "test", 0); - - return 0; -} - -static int btfs_open(const char *path, int flags) -{ - if (strcmp(path, "/test")) - return -ENOENT; - - if ((flags & 3) != O_RDONLY) - return -EACCES; - - return 0; -} - -static int btfs_read(const char *path, char *buf, size_t size, off_t offset) -{ - if (strcmp(path, "/test")) - return -ENOENT; - - memcpy(buf, "Test" + offset, size); - - return size; -} - -static struct fuse_operations btfs_ops = { - .getattr = btfs_getattr, - .getdir = btfs_getdir, - .open = btfs_open, - .read = btfs_read, -}; - -int main(int argc, char *argv[]) -{ - return fuse_main(argc, argv, &btfs_ops); -} |