Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

calibre_mount_helper now works on NetBSD as well for mounting of reader devices

Browse Source
This commit is contained in:
Kovid Goyal 2009-10-12 00:12:27 -06:00
parent a8bf1d329e
commit b20f8ea54c
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/devices/linux_mount_helper.c
View File

@ -35,6 +35,9 @@ void ensure_root() {
int do_mount(const char *dev, const char *mp) { int do_mount(const char *dev, const char *mp) {
char options[1000], marker[2000]; char options[1000], marker[2000];
#ifdef __NetBSD__
char uids[100], gids[100];
#endif
int errsv; int errsv;
if (!exists(dev)) { if (!exists(dev)) {
@ -57,9 +60,19 @@ int do_mount(const char *dev, const char *mp) {
} }
close(fd); close(fd);
} }
#ifdef __NetBSD__
snprintf(options, 1000, "rw,noexec,nosuid,sync,nodev");
snprintf(uids, 100, "%d", getuid());
snprintf(gids, 100, "%d", 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()); 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
ensure_root(); ensure_root();
#ifdef __NetBSD__
execlp("mount_msdos", "mount_msdos", "-u", uids, "-g", gids, "-o", options, dev, mp, NULL);
#else
execlp("mount", "mount", "-t", "vfat", "-o", options, dev, mp, NULL); execlp("mount", "mount", "-t", "vfat", "-o", options, dev, mp, NULL);
#endif
errsv = errno; errsv = errno;
fprintf(stderr, "Failed to mount with error: %s\n", strerror(errsv)); fprintf(stderr, "Failed to mount with error: %s\n", strerror(errsv));
return EXIT_FAILURE; return EXIT_FAILURE;
@ -76,7 +89,11 @@ int call_eject(const char *dev, const char *mp) {
if (pid == 0) { /* Child process */ if (pid == 0) { /* Child process */
ensure_root(); ensure_root();
#ifdef __NetBSD__
execlp("eject", "eject", dev, NULL);
#else
execlp("eject", "eject", "-s", dev, NULL); execlp("eject", "eject", "-s", dev, NULL);
#endif
/* execlp failed */ /* execlp failed */
errsv = errno; errsv = errno;
fprintf(stderr, "Failed to eject with error: %s\n", strerror(errsv)); fprintf(stderr, "Failed to eject with error: %s\n", strerror(errsv));