diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2008-02-13 16:59:41 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2008-02-13 16:59:41 +0000 |
| commit | bfff9aaa8f2645840e401572f1d554605fc59810 (patch) | |
| tree | 7c55521bb6cabb268053fd597e247ba47601c875 | |
| parent | 3936f7291bf1f144bc3cda3eb980b7cb19c54c4c (diff) | |
| download | libgphoto2-bfff9aaa8f2645840e401572f1d554605fc59810.tar.gz | |
do not recursively go into "gphotofs" mounts when using gphotofs.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10949 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | libgphoto2_port/ChangeLog | 5 | ||||
| -rw-r--r-- | libgphoto2_port/disk/disk.c | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/libgphoto2_port/ChangeLog b/libgphoto2_port/ChangeLog index 7a8e64e98..bf6522838 100644 --- a/libgphoto2_port/ChangeLog +++ b/libgphoto2_port/ChangeLog @@ -1,3 +1,8 @@ +2008-02-13 Marcus Meissner <meissner@suse.de> + + * disk/disk.c: Do not check "gphotofs" filesystems, to avoid + recursion in gphotofs. + 2007-12-28 Marcus Meissner <marcus@jet.franken.de> * Migrated libgphoto2_port to use symbol versions. diff --git a/libgphoto2_port/disk/disk.c b/libgphoto2_port/disk/disk.c index 9ae76d476..d1f694125 100644 --- a/libgphoto2_port/disk/disk.c +++ b/libgphoto2_port/disk/disk.c @@ -206,10 +206,11 @@ gp_port_library_list (GPPortInfoList *list) gp_log(GP_LOG_DEBUG, "gphoto2-port/disk", "found fstab fsname %s", mntent->mnt_fsname); - if ((NULL != strstr(mntent->mnt_fsname,"fd")) || + if ((NULL != strstr(mntent->mnt_fsname,"fd")) || (NULL != strstr(mntent->mnt_fsname,"floppy")) || - (NULL != strstr(mntent->mnt_fsname, "fuse"))) - { + (NULL != strstr(mntent->mnt_fsname,"fuse")) || + (NULL != strstr(mntent->mnt_fsname,"gphotofs")) + ) { continue; } snprintf (path, sizeof(path), "%s/DCIM", mntent->mnt_dir); @@ -233,10 +234,11 @@ gp_port_library_list (GPPortInfoList *list) gp_log(GP_LOG_DEBUG, "gphoto2-port/disk", "found mtab fsname %s", mntent->mnt_fsname); - if ((NULL != strstr(mntent->mnt_fsname,"fd")) || + if ((NULL != strstr(mntent->mnt_fsname,"fd")) || (NULL != strstr(mntent->mnt_fsname,"floppy")) || - (NULL != strstr(mntent->mnt_fsname, "fuse"))) - { + (NULL != strstr(mntent->mnt_fsname,"fuse")) || + (NULL != strstr(mntent->mnt_fsname,"gphotofs")) + ) { continue; } |