Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Unit tests and bug fixes for removable drive finders.

Browse Source
This commit is contained in:
akwizgran
2011-10-04 22:36:00 +01:00
parent 18723a56ae
commit d49ab73d81
5 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/net/sf/briar/plugins/file/LinuxRemovableDriveFinder.java
View File

@@ -10,8 +10,9 @@ class LinuxRemovableDriveFinder extends UnixRemovableDriveFinder {
@Override
protected String parseMountPoint(String line) {
// The format is "/dev/foo on /bar/baz type bam (opt1,opt2)"
line = line.replaceFirst("^/dev/[^ ]+ on ", "");
return line.replaceFirst(" type [^ ]+ \\([^)]+\\)$", "");
String pattern = "^/dev/[^ ]+ on (.*) type [^ ]+ \\([^)]+\\)$";
String path = line.replaceFirst(pattern, "$1");
return path.equals(line) ? null : path;
}
@Override

5
components/net/sf/briar/plugins/file/MacRemovableDriveFinder.java
View File

@@ -10,8 +10,9 @@ class MacRemovableDriveFinder extends UnixRemovableDriveFinder {
@Override
protected String parseMountPoint(String line) {
// The format is "/dev/foo on /bar/baz (opt1, opt2)"
line = line.replaceFirst("^/dev/[^ ]+ on ", "");
return line.replaceFirst(" \\([^)]+\\)$", "");
String pattern = "^/dev/[^ ]+ on (.*) \\([^)]+\\)$";
String path = line.replaceFirst(pattern, "$1");
return path.equals(line) ? null : path;
}
@Override