Skip to content

Add support for /dev/fd/%u mountpoints #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nigeltao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for /dev/fd/%u mountpoints #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions archivemount.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,21 @@ usage(const char *progname)
"\n",progname);
}

// fuse_mnt_parse_fuse_fd was copied from libfuse's lib/mount_util.c.
static int //
fuse_mnt_parse_fuse_fd(const char *mountpoint)
{
int fd = -1;
int len = 0;

if (sscanf(mountpoint, "/dev/fd/%u%n", &fd, &len) == 1 &&
len == strlen(mountpoint)) {
return fd;
}

return -1;
}

static struct fuse_operations ar_oper;

static int
Expand Down Expand Up @@ -406,7 +421,7 @@ insert_by_path(NODE *root, NODE *node)
}

static int
build_tree(const char *mtpt)
build_tree(mode_t mtpt_mode)
{
struct archive *archive;
struct stat st;
Expand Down Expand Up @@ -501,11 +516,9 @@ build_tree(const char *mtpt)
}
archive_entry_set_gid(root->entry, getgid());
archive_entry_set_uid(root->entry, getuid());
archive_entry_set_mode(root->entry, st.st_mtime);
archive_entry_set_pathname(root->entry, "/");
archive_entry_set_size(root->entry, st.st_size);
stat(mtpt, &st);
archive_entry_set_mode(root->entry, st.st_mode);
archive_entry_set_mode(root->entry, mtpt_mode);

if ((cur = init_node()) == NULL) {
return -ENOMEM;
Expand Down Expand Up @@ -2833,6 +2846,7 @@ int
main(int argc, char **argv)
{
struct stat st;
mode_t mtpt_mode;
int oldpwd;
struct fuse_args args = FUSE_ARGS_INIT(argc, argv);

Expand All @@ -2856,7 +2870,14 @@ main(int argc, char **argv)
perror("Error stat'ing mountpoint");
exit(EXIT_FAILURE);
}
if (! S_ISDIR(st.st_mode)) {
/* Check that the mountpoint is either a /dev/fd/%u pre-mounted file
* descriptor or a directory on the file system. For a file descriptor,
* the build_tree function still expects mode bits whose file type
* satisfies S_ISDIR. */
mtpt_mode = st.st_mode;
if (fuse_mnt_parse_fuse_fd(mtpt) >= 0) {
mtpt_mode = (mtpt_mode & ~S_IFMT) | S_IFDIR;
} else if (! S_ISDIR(st.st_mode)) {
fprintf(stderr, "Problem with mountpoint: %s\n",
strerror(ENOTDIR));
exit(EXIT_FAILURE);
Expand Down Expand Up @@ -2888,7 +2909,7 @@ main(int argc, char **argv)
perror("opening archive failed");
return EXIT_FAILURE;
}
if (build_tree(mtpt) != 0) {
if (build_tree(mtpt_mode) != 0) {
exit(EXIT_FAILURE);
}

Expand Down