Skip to content

Honor raw archives' pathname #18

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

Honor raw archives' pathname #18

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
14 changes: 9 additions & 5 deletions archivemount.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ char *user_passphrase = NULL;
size_t user_passphrase_size = 0;
pthread_mutex_t lock; /* global node tree lock */

const char formatraw_default_path[] = "/data";
const char* formatraw_path = formatraw_default_path;

/* Taken from the GNU under the GPL */
char *
strchrnul (const char *s, int c_in)
Expand Down Expand Up @@ -519,6 +522,9 @@ build_tree(const char *mtpt)
if (memcmp(name, "./\0", 3) == 0) {
/* special case: the directory "./" must be skipped! */
continue;
} else if (options.formatraw && (formatraw_path == formatraw_default_path)) {
/* save the first entry's name */
formatraw_path = strdup(name);
}
if (options.subtree_filter) {
regex_error = regexec(&subtree, name, 1, &regmatch, REG_NOTEOL);
Expand Down Expand Up @@ -1130,12 +1136,10 @@ _ar_open_raw(void)
{
// open archive and search first entry

const char path[] = "/data";

int ret = -1;
const char *realpath;
NODE *node;
log("_ar_open_raw called, path: '%s'", path);
log("_ar_open_raw called, path: '%s'", formatraw_path);


if (rawcache->opened!=0) {
Expand All @@ -1147,7 +1151,7 @@ _ar_open_raw(void)

/* find node */

node = get_node_for_path(root, path);
node = get_node_for_path(root, formatraw_path);
if (! node) {
log("get_node_for_path error");
return -ENOENT;
Expand Down Expand Up @@ -2897,7 +2901,7 @@ main(int argc, char **argv)
if ((rawcache=init_rawcache()) == NULL)
return -ENOMEM;
fprintf(stderr,"Calculating uncompressed file size. Please wait.\n");
rawcache->st.st_size=_ar_getsizeraw("/data");
rawcache->st.st_size=_ar_getsizeraw(formatraw_path);
//log("cache st_size = %ld",rawcache->st.st_size);
}

Expand Down