--- src/calibre/devices/linux_mount_helper.c.orig	2011-11-11 23:22:34.000000000 -0500

+++ src/calibre/devices/linux_mount_helper.c	2011-11-16 13:06:45.000000000 -0500

@@ -1,7 +1,226 @@

 #include <stdlib.h>

+#include <stdio.h>

+#include <unistd.h>

+#include <string.h>

+#include <errno.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <sys/wait.h>

+#include <fcntl.h>

+

+#define MARKER ".created_by_calibre_mount_helper"

+#define False 0

+#define True 1

+

+int exists(const char *path) {

+    struct stat file_info;

+    if (stat(path, &file_info) == 0) return True;

+    return False;

+}

+

+int get_root() {

+    int res;

+    res = setreuid(0, 0);

+    if (res != 0) return False;

+    if (setregid(0, 0) != 0) return False;

+    return True;

+}

+

+void ensure_root() {

+    if (!get_root()) {

+        fprintf(stderr, "Failed to get root.\n");

+        exit(EXIT_FAILURE);

+    }

+}

+

+int do_mount(const char *dev, const char *mp) {

+    char options[1000], marker[2000];

+#ifdef __NetBSD__

+    char uids[100], gids[100];

+#endif

+    int errsv;

+

+    if (!exists(dev)) {

+        fprintf(stderr, "Specified device node does not exist\n");

+        return EXIT_FAILURE;

+    }

+    if (!exists(mp)) {

+        if (mkdir(mp, S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) != 0) {

+            errsv = errno;

+            fprintf(stderr, "Failed to create mount point with error: %s\n", strerror(errsv));

+        }

+    }

+    snprintf(marker, 2000, "%s/%s", mp, MARKER);

+    if (!exists(marker)) {

+        int fd = creat(marker, S_IRUSR|S_IWUSR);

+        if (fd == -1) {

+            int errsv = errno;

+            fprintf(stderr, "Failed to create marker with error: %s\n", strerror(errsv));

+            return EXIT_FAILURE;

+        }

+        close(fd);

+    }

+#ifdef __NetBSD__

+    snprintf(options, 1000, "rw,noexec,nosuid,sync,nodev");

+    snprintf(uids, 100, "%d", getuid());

+    snprintf(gids, 100, "%d", getgid());

+#else

+#ifdef __FreeBSD__

+    snprintf(options, 1000, "rw,noexec,nosuid,sync,-u=%d,-g=%d",getuid(),getgid());

+#else

+    snprintf(options, 1000, "rw,noexec,nosuid,sync,nodev,quiet,shortname=mixed,uid=%d,gid=%d,umask=077,fmask=0177,dmask=0077,utf8,iocharset=iso8859-1", getuid(), getgid());

+#endif

+#endif

+

+    ensure_root();

+

+#ifdef __NetBSD__

+    execlp("mount_msdos", "mount_msdos", "-u", uids, "-g", gids, "-o", options, dev, mp, NULL);

+#else

+#ifdef __FreeBSD__

+    execl("/sbin/mount", "mount", "-t", "msdosfs", "-o", options, dev, mp, NULL);

+#else

+    execlp("mount", "mount", "-t", "auto", "-o", options, dev, mp, NULL);

+#endif

+#endif

+    errsv = errno;

+    fprintf(stderr, "Failed to mount with error: %s\n", strerror(errsv));

+    return EXIT_FAILURE;

+}

+

+int call_eject(const char *dev, const char *mp) {

+    int ret, pid, errsv, i, status = EXIT_FAILURE;

+

+    pid = fork();

+    if (pid == -1) {

+        fprintf(stderr, "Failed to fork\n");

+        exit(EXIT_FAILURE);

+    }

+

+    if (pid == 0) { /* Child process */

+        ensure_root();

+#ifdef __NetBSD__

+        execlp("eject", "eject", dev, NULL);

+#else

+#ifdef __FreeBSD__

+	execl("/sbin/umount", "umount", dev, NULL);

+#else

+        execlp("eject", "eject", "-s", dev, NULL);

+#endif

+#endif

+        /* execlp failed */

+        errsv = errno;

+        fprintf(stderr, "Failed to eject with error: %s\n", strerror(errsv));

+        exit(EXIT_FAILURE);

+    } else { /* Parent */

+        for (i = 0; i < 7; i++) {

+            sleep(1);

+            ret = waitpid(pid, &status, WNOHANG);

+            if (ret == -1) return False;

+            if (ret > 0) break;

+        }

+        return WIFEXITED(status) && WEXITSTATUS(status) == 0;

+    }

+    return False;

+}

+

+int call_umount(const char *dev, const char *mp) {

+    int ret, pid, errsv, i, status = EXIT_FAILURE;

+

+    pid = fork();

+    if (pid == -1) {

+        fprintf(stderr, "Failed to fork\n");

+        exit(EXIT_FAILURE);

+    }

+

+    if (pid == 0) { /* Child process */

+        ensure_root();

+#ifdef __FreeBSD__

+        execl("/sbin/umount", "umount", mp, NULL);

+#else

+        execlp("umount", "umount", "-l", mp, NULL);

+#endif

+        /* execlp failed */

+        errsv = errno;

+        fprintf(stderr, "Failed to umount with error: %s\n", strerror(errsv));

+        exit(EXIT_FAILURE);

+    } else { /* Parent */

+        for (i = 0; i < 7; i++) {

+            sleep(1);

+            ret = waitpid(pid, &status, WNOHANG);

+            if (ret == -1) return False;

+            if (ret > 0) break;

+        }

+        return WIFEXITED(status) && WEXITSTATUS(status) == 0;

+    }

+    return False;

+}

+

+int cleanup_mount_point(const char *mp) {

+    char marker[2000];

+    int urt, rmd, errsv;

+

+    snprintf(marker, 2000, "%s/%s", mp, MARKER);

+    if (exists(marker)) {

+        urt = unlink(marker);

+        if (urt == -1) {

+            errsv = errno;

+            fprintf(stderr, "Failed to unlink marker: %s\n", strerror(errsv));

+            return EXIT_FAILURE;

+        }

+    }

+    rmd = rmdir(mp);

+    if (rmd == -1) {

+        errsv = errno;

+        fprintf(stderr, "Failed to remove mount point: %s\n", strerror(errsv));

+        return EXIT_FAILURE;

+    }

+    return EXIT_SUCCESS;

+}

+

+int do_eject(const char *dev, const char *mp) {

+    int unmounted = False;

+

+    ensure_root();

+

+    unmounted = call_eject(dev, mp);

+    if (!unmounted) call_umount(dev, mp);

+    if (unmounted) return cleanup_mount_point(mp);

+    return EXIT_FAILURE;

+}

+

+int cleanup(const char *dev, const char *mp) {

+    ensure_root();

+    call_umount(dev, mp);

+    return cleanup_mount_point(mp);

+}

 int main(int argc, char** argv)

 {

-    return EXIT_FAILURE;

+    char *action, *dev, *mp;

+    int status = EXIT_FAILURE;

+

+    /*printf("Real UID\t= %d\n", getuid());

+    printf("Effective UID\t= %d\n", geteuid());

+    printf("Real GID\t= %d\n", getgid());

+    printf("Effective GID\t= %d\n", getegid());*/

+

+    if (argc != 4) {

+        fprintf(stderr, "Needs 3 arguments: action, device node and mount point\n");

+        exit(EXIT_FAILURE);

+    }

+    action = argv[1]; dev = argv[2]; mp = argv[3];

+

+    if (strncmp(action, "mount", 5) == 0) {

+        status = do_mount(dev, mp);

+    } else if (strncmp(action, "eject", 5) == 0) {

+        status = do_eject(dev, mp);

+    } else if (strncmp(action, "cleanup", 7) == 0) {

+        status = cleanup(dev, mp);

+    } else {

+        fprintf(stderr, "Unrecognized action: must be mount, eject or cleanup\n");

+    }

+ 

+    return status;

 }

--- src/calibre/devices/usbms/device.py.orig	2011-11-11 23:22:34.000000000 -0500

+++ src/calibre/devices/usbms/device.py	2011-11-16 17:20:57.000000000 -0500

@@ -700,14 +700,12 @@

 # ------------------------------------------------------

 #

 #  open for FreeBSD

-#   find the device node or nodes that match the S/N we already have from the scanner

-#   and attempt to mount each one

-#       1.  get list of disk devices from sysctl

-#       2.  compare that list with the one from camcontrol

-#       3.  and see if it has a matching s/n

-#       6.  find any partitions/slices associated with each node

-#       7.  attempt to mount, using calibre-mount-helper, each one

-#       8.  when finished, we have a list of mount points and associated device nodes

+#      find the device node or nodes that match the S/N we already have from the scanner

+#      and attempt to mount each one

+#              1.  get list of da devices in /dev

+#              2.  find the ones with matching s/n

+#              3.  attempt to mount each one using calibre-mount-helper

+#              4.  when finished, we have a list of mount points and associated device nodes

 #

     def open_freebsd(self):

@@ -721,81 +719,67 @@

         devs={}

         di=0

-        ndevs=4     # number of possible devices per reader (main, carda, cardb, launcher)

+        # delay for user to set device if necessary

+        time.sleep(5)

+

+        # get list of disk devices and

+        # see if we can get a S/N from the actual device node

+        #dsks=['/dev/da1', '/dev/da3s1']

+        dsks=glob.glob('/dev/da*')

+        dsks.sort()

+        for ndvc in dsks:

+            dvc = ndvc.replace('/dev/', '')

+            print "FBSD:       Checking ", dvc

+            #sn="08004610011F550C"

+            try:

+                sn=subprocess.Popen("/sbin/camcontrol inquiry "+dvc+" -S", shell=True, stdout=subprocess.PIPE).communicate()[0]

+            except:

+                print "FBSD:   inquiry failed:"

+            sn=sn[0:-1]             # drop the trailing newline

+            print "FBSD:       S/N = ", sn

+            if sn and d.match_serial(sn):

+                # we have a matching s/n, record this device node

+                print "FBSD:   match found: ", dvc

+                devs[di]=dvc

+                di += 1

-        #get list of disk devices

-        p=subprocess.Popen(["sysctl", "kern.disks"], stdout=subprocess.PIPE)

-        kdsks=subprocess.Popen(["sed", "s/kern.disks: //"], stdin=p.stdout, stdout=subprocess.PIPE).communicate()[0]

-        p.stdout.close()

-        #print kdsks

-        for dvc in kdsks.split():

-            # for each one that's also in the list of cam devices ...

-            p=subprocess.Popen(["camcontrol", "devlist"], stdout=subprocess.PIPE)

-            devmatch=subprocess.Popen(["grep", dvc], stdin=p.stdout, stdout=subprocess.PIPE).communicate()[0]

-            p.stdout.close()

-            if devmatch:

-                #print "Checking ", devmatch

-                # ... see if we can get a S/N from the actual device node

-                sn=subprocess.Popen(["camcontrol", "inquiry", dvc, "-S"], stdout=subprocess.PIPE).communicate()[0]

-                sn=sn[0:-1]             # drop the trailing newline

-                #print "S/N = ", sn

-                if sn and d.match_serial(sn):

-                    # we have a matching s/n, record this device node

-                    #print "match found: ", dvc

-                    devs[di]=dvc

-                    di += 1

-

-        # sort the list of devices

-        for i in range(1,ndevs+1):

-            for j in reversed(range(1,i)):

-                if devs[j-1] > devs[j]:

-                    x=devs[j-1]

-                    devs[j-1]=devs[j]

-                    devs[j]=x

-        #print devs

+        print "FBSD:   ", devs

         # now we need to see if any of these have slices/partitions

         mtd=0

-        label="READER"      # could use something more unique, like S/N or productID...

+        label="READER"          # could use something more unique, like S/N or productID...

         cmd = '/usr/local/bin/calibre-mount-helper'

-        cmd = [cmd, 'mount']

-        for i in range(0,ndevs):

-            cmd2="ls /dev/"+devs[i]+"*"

-            p=subprocess.Popen(cmd2, shell=True, stdout=subprocess.PIPE)

-            devs[i]=subprocess.Popen(["cut", "-d", "/", "-f" "3"], stdin=p.stdout, stdout=subprocess.PIPE).communicate()[0]

-            p.stdout.close()

-

+        for i in range(0,di):

             # try all the nodes to see what we can mount

             for dev in devs[i].split():

-                mp='/media/'+label+'-'+dev

-                mmp = mp

-                if mmp.endswith('/'):

-                    mmp = mmp[:-1]

+                mp='/mnt/'+label+'-'+dev

+                print "FBSD:   trying ", dev, "on", mp

+                #if mp is not None and mp.endswith('/'):

+                #    mp = mp[:-1]

                 #print "trying ", dev, "on", mp

                 try:

-                    p = subprocess.Popen(cmd + ["/dev/"+dev, mmp])

-                except OSError:

-                    raise DeviceError(_('Could not find mount helper: %s.')%cmd[0])

+                    p = subprocess.Popen([cmd, "mount", "/dev/"+dev, mp])

+                except:

+                    print "FBSD:       mount failed:"

                 while p.poll() is None:

                     time.sleep(0.1)

                 if p.returncode == 0:

-                    #print "  mounted", dev

-                    if i == 0:

+                    print "FBSD:         mounted", dev, "on", mp

+                    if mtd == 0:

                         self._main_prefix = mp

                         self._main_dev = "/dev/"+dev

-                        #print "main = ", self._main_dev, self._main_prefix

-                    if i == 1:

+                        print "FBSD:   main = ", self._main_dev, self._main_prefix

+                    if mtd == 1:

                         self._card_a_prefix = mp

                         self._card_a_dev = "/dev/"+dev

-                        #print "card a = ", self._card_a_dev, self._card_a_prefix

-                    if i == 2:

+                        print "FBSD:   card a = ", self._card_a_dev, self._card_a_prefix

+                    if mtd == 2:

                         self._card_b_prefix = mp

                         self._card_b_dev = "/dev/"+dev

-                        #print "card b = ", self._card_b_dev, self._card_b_prefix

-

+                        print "FBSD:   card b = ", self._card_b_dev, self._card_b_prefix

+                        break

                     mtd += 1

-                    break

         if mtd > 0:

             return True

@@ -813,7 +797,7 @@

         cmd = [cmd, 'eject']

         if self._main_prefix:

-            #print "umount main:", cmd, self._main_dev, self._main_prefix

+            print "FBSD:       umount main:", cmd, self._main_dev, self._main_prefix

             try:

                 p = subprocess.Popen(cmd + [self._main_dev, self._main_prefix])

             except OSError:

@@ -823,7 +807,7 @@

                 time.sleep(0.1)

         if self._card_a_prefix:

-            #print "umount card a:", cmd, self._card_a_dev, self._card_a_prefix

+            print "FBSD:       umount card a:", cmd, self._card_a_dev, self._card_a_prefix

             try:

                 p = subprocess.Popen(cmd + [self._card_a_dev,  self._card_a_prefix])

             except OSError:

@@ -833,7 +817,7 @@

                 time.sleep(0.1)

         if self._card_b_prefix:

-            #print "umount card b:", cmd, self._card_b_dev, self._card_b_prefix

+            print "FBSD:       umount card b:", cmd, self._card_b_dev, self._card_b_prefix

             try:

                 p = subprocess.Popen(cmd + [self._card_b_dev, self._card_b_prefix])

             except OSError:

--- src/calibre/devices/usbms/driver.py.orig	2011-11-11 23:22:34.000000000 -0500

+++ src/calibre/devices/usbms/driver.py	2011-11-16 17:46:30.000000000 -0500

@@ -150,6 +150,11 @@

                                      self._card_b_prefix if oncard == 'cardb' \

                                                          else self._main_prefix

+	# force type of prefix to str, else

+	# normalize_path() in posixpath.py later on fails

+	if prefix is None:

+	    prefix = ''

+

         ebook_dirs = self.get_carda_ebook_dir() if oncard == 'carda' else \

             self.EBOOK_DIR_CARD_B if oncard == 'cardb' else \

             self.get_main_ebook_dir()

@@ -371,7 +376,7 @@

         debug_print('USBMS: starting sync_booklists')

         json_codec = JsonCodec()

-        if not os.path.exists(self.normalize_path(self._main_prefix)):

+	if self._main_prefix is not None and not os.path.exists(self.normalize_path(self._main_prefix)):

             os.makedirs(self.normalize_path(self._main_prefix))

         def write_prefix(prefix, listid):

--------------------------------------------------------------------

Please note that if connecting Calibre to an android device, then

you must use either the WordPlayer or Aldiko ebook reading apps from

the Android Marketplace.  See the following URL for more information

http://manual.calibre-ebook.com/faq.html#how-do-i-use-app-with-my-android-phone-tablet

--------------------------------------------------------------------

lib/calibre/calibre/devices/kobo/bookmark.py

lib/calibre/calibre/devices/prst1/__init__.py

lib/calibre/calibre/devices/prst1/driver.py

lib/calibre/calibre/ebooks/djvu/__init__.py

lib/calibre/calibre/ebooks/djvu/djvubzzdec.py

lib/calibre/calibre/ebooks/djvu/djvu.py

lib/calibre/calibre/ebooks/djvu/input.py

lib/calibre/calibre/gui2/convert/djvu_input_ui.py

lib/calibre/calibre/gui2/convert/djvu_input.py

lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py

lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py

share/calibre/images/devices/boox.jpg

@dirrm lib/calibre/calibre/ebooks/djvu

@dirrm lib/calibre/calibre/devices/prst1