rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removes the -H option.

Browse source
This commit is contained in:
Andrea Mazzoleni 2012-10-14 10:08:39 +02:00
parent 4ed9e0803f
commit 3d30a87952
7 changed files with 28 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

19
HISTORY
View file

@ -1,19 +1,19 @@
SnapRAID HISTORY
================
1.13 2012/?
===========
1.13 2012/11
============
* Added a new -a option to make the 'check' command to only check file hashes
without checking the parity data.
* Added a new -d option to filter by disk name.
* The file modification time is now saved using nanosecond precision.
This allows to restore the exact modification time in 'fix'.
The new 'content' files written with this version are not backward compatible,
but it's still possible to read the old 'content' format.
The new 'content' files written with this version are not backward
compatible, but it's still possible to read the old 'content' format.
* Fixed hard-links automatic exclusion. All the hardlinks after the first one
are now correctly ignored.
* If it isn't possible to grow a parity file, prints the list of files outside
the maximum size allocated.
* If it isn't possible to grow a parity file, prints the list of files
outside the maximum size allocated.
* Autosave isn't triggered if we are near the end of the 'sync' process.
* Before starting a 'sync', we wait for two seconds, to workaround the FAT
limitation of having two seconds modification time precision.
@ -23,11 +23,14 @@ SnapRAID HISTORY
* Fixed compilation in Solaris for lacking both futimes() and futimens().
* Now 'sync' ensures that the parity file are not too small to contain the
just loaded data.
* Removed the '-H,--filter-nohidden' option. It doesn't make sense to
have it as command line option.
You must use the 'nohidden' option in the configuration file.
1.12 2012/9
=============
===========
* Fixed file renaming in Windows during a 'fix' command.
This is only a Windows issue, no reason to upgrade for other platforms.
This is only a Windows only issue, no reason to upgrade for other platforms.
1.11 2012/7
===========

12
snapraid.1
View file

@ -6,7 +6,7 @@ snapraid [\(hyc, \(hy\(hyconf CONFIG]
.PD 0
.PP
.PD
[\(hyf, \(hy\(hyfilter PATTERN] [\(hyd, \(hy\(hyfilter\(hydisk NAME] [\(hyH, \(hy\(hyfilter\(hynohidden]
[\(hyf, \(hy\(hyfilter PATTERN] [\(hyd, \(hy\(hyfilter\(hydisk NAME]
.PD 0
.PP
.PD
@ -381,11 +381,6 @@ commands.
You must specify a disk name as named in the configuration
file.
.TP
.B \(hyH, \(hy\(hyfilter\(hynohidden
Excludes hidden files and directory.
In Unix hidden files are the ones starting with \(cq.\(cq.
In Windows they are the ones with the hidden attribute.
.TP
.B \(hya, \(hy\(hyaudit\(hyonly
When checking, only verify the hash of the files, without
doing any kind of check on the redundancy data.
@ -497,8 +492,9 @@ keep the NAME fixed.
.PP
You should use one option for each disk of the array.
.SS nohidden
Excludes all the hidden files and directory, like the
\(hy\(hyfilter\(hynohidden option.
Excludes all the hidden files and directory.
In Unix hidden files are the ones starting with \(cq.\(cq.
In Windows they are the ones with the hidden attribute.
.SS exclude/include PATTERN
Defines the file or directory patterns to exclude and include
in the sync process.

10
snapraid.c
View file

@ -80,7 +80,6 @@ struct option long_options[] = {
{ "conf", 1, 0, 'c' },
{ "filter", 1, 0, 'f' },
{ "filter-disk", 1, 0, 'd' },
{ "filter-nohidden", 0, 0, 'H' },
{ "start", 1, 0, 's' },
{ "count", 1, 0, 't' },
{ "force-zero", 0, 0, 'Z' },
@ -102,7 +101,7 @@ struct option long_options[] = {
};
#endif
#define OPTIONS "c:f:d:Hs:t:ZENaTvhVG"
#define OPTIONS "c:f:d:s:t:ZENaTvhVG"
volatile int global_interrupt = 0;
@ -129,7 +128,6 @@ int main(int argc, char* argv[])
int gui;
int force_zero;
int force_empty;
int filter_hidden;
int find_by_name;
int audit_only;
int test_expect_unrecoverable;
@ -155,7 +153,6 @@ int main(int argc, char* argv[])
gui = 0;
force_zero = 0;
force_empty = 0;
filter_hidden = 0;
find_by_name = 0;
audit_only = 0;
test_expect_unrecoverable = 0;
@ -195,9 +192,6 @@ int main(int argc, char* argv[])
}
tommy_list_insert_tail(&filterlist, &filter->node, filter);
} break;
case 'H' :
filter_hidden = 1;
break;
case 's' :
blockstart = strtoul(optarg, &e, 0);
if (!e || *e) {
@ -324,7 +318,7 @@ int main(int argc, char* argv[])
state_init(&state);
state_config(&state, conf, verbose, gui, force_zero, force_empty, filter_hidden, find_by_name, test_expect_unrecoverable, test_expect_recoverable, test_skip_device);
state_config(&state, conf, verbose, gui, force_zero, force_empty, find_by_name, test_expect_unrecoverable, test_expect_recoverable, test_skip_device);
if (operation == OPERATION_DIFF) {
state_read(&state);

12
snapraid.d
View file

@ -3,7 +3,7 @@ Name{number}
Synopsis
:snapraid [-c, --conf CONFIG]
: [-f, --filter PATTERN] [-d, --filter-disk NAME] [-H, --filter-nohidden]
: [-f, --filter PATTERN] [-d, --filter-disk NAME]
: [-a, --audit-only]
: [-N, --find-by-name]
: [-Z, --force-zero] [-E, --force-empty]
@ -255,11 +255,6 @@ Options
You must specify a disk name as named in the configuration
file.
-H, --filter-nohidden
Excludes hidden files and directory.
In Unix hidden files are the ones starting with '.'.
In Windows they are the ones with the hidden attribute.
-a, --audit-only
When checking, only verify the hash of the files, without
doing any kind of check on the redundancy data.
@ -377,8 +372,9 @@ Configuration
You should use one option for each disk of the array.
nohidden
Excludes all the hidden files and directory, like the
--filter-nohidden option.
Excludes all the hidden files and directory.
In Unix hidden files are the ones starting with '.'.
In Windows they are the ones with the hidden attribute.
exclude/include PATTERN
Defines the file or directory patterns to exclude and include

12
snapraid.txt
View file

@ -7,7 +7,7 @@
==========
snapraid [-c, --conf CONFIG]
[-f, --filter PATTERN] [-d, --filter-disk NAME] [-H, --filter-nohidden]
[-f, --filter PATTERN] [-d, --filter-disk NAME]
[-a, --audit-only]
[-N, --find-by-name]
[-Z, --force-zero] [-E, --force-empty]
@ -284,11 +284,6 @@ SnapRAID provides the following options:
You must specify a disk name as named in the configuration
file.
-H, --filter-nohidden
Excludes hidden files and directory.
In Unix hidden files are the ones starting with '.'.
In Windows they are the ones with the hidden attribute.
-a, --audit-only
When checking, only verify the hash of the files, without
doing any kind of check on the redundancy data.
@ -419,8 +414,9 @@ You should use one option for each disk of the array.
7.5 nohidden
------------
Excludes all the hidden files and directory, like the
--filter-nohidden option.
Excludes all the hidden files and directory.
In Unix hidden files are the ones starting with '.'.
In Windows they are the ones with the hidden attribute.
7.6 exclude/include PATTERN
---------------------------

4
state.c
View file

@ -188,7 +188,7 @@ static void state_config_check(struct snapraid_state* state, const char* path, i
}
void state_config(struct snapraid_state* state, const char* path, int verbose, int gui, int force_zero, int force_empty, int filter_hidden, int find_by_name, int expect_unrecoverable, int expect_recoverable, int skip_device)
void state_config(struct snapraid_state* state, const char* path, int verbose, int gui, int force_zero, int force_empty, int find_by_name, int expect_unrecoverable, int expect_recoverable, int skip_device)
{
STREAM* f;
unsigned line;
@ -197,7 +197,7 @@ void state_config(struct snapraid_state* state, const char* path, int verbose, i
state->gui = gui;
state->force_zero = force_zero;
state->force_empty = force_empty;
state->filter_hidden = filter_hidden;
state->filter_hidden = 0;
state->find_by_name = find_by_name;
state->expect_unrecoverable = expect_unrecoverable;
state->expect_recoverable = expect_recoverable;

2
state.h
View file

@ -71,7 +71,7 @@ void state_done(struct snapraid_state* state);
/**
* Reads the configuration file.
*/
void state_config(struct snapraid_state* state, const char* path, int verbose, int gui, int force_zero, int force_empty, int filter_hidden, int find_by_name, int expect_unrecoverable, int expect_recoverable, int skip_device);
void state_config(struct snapraid_state* state, const char* path, int verbose, int gui, int force_zero, int force_empty, int find_by_name, int expect_unrecoverable, int expect_recoverable, int skip_device);
/**
* Reads the state.