Skip to content
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

Correctly detect attr binary during tests #330

Closed
wants to merge 2 commits into from
Closed

Correctly detect attr binary during tests #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d24b790
Correctly detect attr binary during tests
Jun 13, 2017
c9b8c38
Typo
Jun 13, 2017
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
12 changes: 8 additions & 4 deletions encfs/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ static bool processArgs(int argc, char *argv[],
// 'o' : arguments meant for fuse
// 't' : syslog tag
int res =
getopt_long(argc, argv, "HsSfvdmi:o:t:", long_options, &option_index);
getopt_long(argc, argv, "HsSfvdmi:o:t:V", long_options, &option_index);

if (res == -1) break;

Expand Down Expand Up @@ -362,6 +362,9 @@ static bool processArgs(int argc, char *argv[],
case 'V':
// xgroup(usage)
cerr << autosprintf(_("encfs version %s"), VERSION) << endl;
#if defined(HAVE_XATTR)
cerr << "Compiled with : HAVE_XATTR" << endl;
#endif
exit(EXIT_SUCCESS);
break;
case 'H':
Expand Down Expand Up @@ -391,7 +394,7 @@ static bool processArgs(int argc, char *argv[],
out->opts->mountPoint = slashTerminate(argv[optind++]);
} else {
// no mount point specified
cerr << _("Missing one or more arguments, aborting.");
cerr << _("Missing one or more arguments, aborting.") << endl;
return false;
}

Expand Down Expand Up @@ -474,13 +477,13 @@ static bool processArgs(int argc, char *argv[],
if (!isDirectory(out->opts->rootDir.c_str()) &&
!userAllowMkdir(out->opts->annotate ? 1 : 0, out->opts->rootDir.c_str(),
0700)) {
cerr << _("Unable to locate root directory, aborting.");
cerr << _("Unable to locate root directory, aborting.") << endl;
return false;
}
if (!isDirectory(out->opts->mountPoint.c_str()) &&
!userAllowMkdir(out->opts->annotate ? 2 : 0,
out->opts->mountPoint.c_str(), 0700)) {
cerr << _("Unable to locate mount point, aborting.");
cerr << _("Unable to locate mount point, aborting.") << endl;
return false;
}

Expand Down Expand Up @@ -537,6 +540,7 @@ int main(int argc, char *argv[]) {
encfsArgs->fuseArgv[i] = NULL; // libfuse expects null args..

if (argc == 1 || !processArgs(argc, argv, encfsArgs)) {
cerr << endl;
usage(argv[0]);
return EXIT_FAILURE;
}
Expand Down
19 changes: 18 additions & 1 deletion tests/reverse.t.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,23 @@

my $tempDir = $ENV{'TMPDIR'} || "/tmp";

# Find attr binary
my @binattr = ("attr", "-l");
if(system("which xattr") == 0)
{
@binattr = ("xattr", "-l");
}
if(system("which lsextattr") == 0)
{
@binattr = ("lsextattr", "user");
}
if(system("./build/encfs -V 2>&1 | grep -q HAVE_XATTR") != 0)
{
# Workaround for binaries without xattr support so that tests will not fail
@binattr = ("ls", "-l");
}


# Helper function
# Create a new empty working directory
sub newWorkingDir
Expand Down Expand Up @@ -84,7 +101,7 @@ sub symlink_test
$dec = readlink("$decrypted/symlink");
ok( $dec eq $target, "symlink to '$target'") or
print("# (original) $target' != '$dec' (decrypted)\n");
system("attr", "-l", "$decrypted/symlink");
system(@binattr, "$decrypted/symlink");
my $return_code = $?;
is($return_code, 0, "symlink to '$target' extended attributes can be read (return code was $return_code)");
unlink("$plain/symlink");
Expand Down