libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enhanced -find testing by operators -not, -or, -and, (, ), -if, -else, -endif

Browse Source
This commit is contained in:
Thomas Schmitt 2009-04-21 17:36:05 +00:00
parent 239ee6e91e
commit 254d2f8413
5 changed files with 1746 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
libisoburn/trunk/xorriso/xorriso.1
View File

@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" other parameters are allowed: see man(7), man(1)
.TH XORRISO 1 "Apr 18, 2009" .TH XORRISO 1 "Apr 21, 2009"
.\" Please adjust this date whenever revising the manpage. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -1162,7 +1162,7 @@ The reserved filter name "--remove-all-filters" revokes filtering. This will
revoke eventual suffix renamings as well. Use "--remove-all-filters+" to revoke eventual suffix renamings as well. Use "--remove-all-filters+" to
prevent any suffix renaming. prevent any suffix renaming.
.br .br
Builtin filters are "--zisofs" and "--zisofs-decode". The former is to be Built-in filters are "--zisofs" and "--zisofs-decode". The former is to be
applied via -set_filter, the latter is automatically applied if zisofs applied via -set_filter, the latter is automatically applied if zisofs
compressed content is detected with a file when loading the ISO image. compressed content is detected with a file when loading the ISO image.
.br .br
@ -1207,185 +1207,168 @@ where "A0" is year 2000, "B0" is 2010, etc.
\fB\-alter_date_r\fR type timestring iso_rr_path [***] \fB\-alter_date_r\fR type timestring iso_rr_path [***]
Like -alter_date but affecting all files below eventual directories. Like -alter_date but affecting all files below eventual directories.
.TP .TP
\fB\-find\fR iso_rr_path [test [test ...]] [-exec action [params]] -- \fB\-find\fR iso_rr_path [test [op] [test ...]] [-exec action [params]] --
A very restricted substitute for shell command find in the ISO image. A restricted substitute for shell command find in the ISO image.
It performs an action on matching file objects at or below iso_rr_path. It performs an action on matching file objects at or below iso_rr_path.
.br .br
If not used as last command in the line then the argument list
needs to get terminated by "--".
.br
Tests are optional. If they are omitted then action is applied to all file Tests are optional. If they are omitted then action is applied to all file
objects. If tests are given then action is applied only if all of them objects. If tests are given then they form together an expression.
match the file object. Available tests are: The action is applied only if the expression matches the file object. Default
expression operator between tests is -and, i.e. the expression matches only
if all its tests match.
.br .br
-name pattern Available tests are:
.br .br
\fB\-name\fR pattern :
Pattern is not expanded but used for comparison with Pattern is not expanded but used for comparison with
the particular file names of the eventual directory tree underneath the particular file names of the eventual directory tree underneath
iso_rr_path. iso_rr_path.
.br .br
-type type_letter \fB\-type\fR type_letter :
.br Matches files files of the given type:
matches only files files of the given type:
"block", "char", "dir", "pipe", "file", "link", "socket", "eltorito", "block", "char", "dir", "pipe", "file", "link", "socket", "eltorito",
"Xotic" which eventually matches what is not matched by the other types. "Xotic" which eventually matches what is not matched by the other types.
.br .br
Only the first letter is interpreted. E.g.: -find / -type d Only the first letter is interpreted. E.g.: -find / -type d
.br .br
-damaged \fB\-damaged\fR :
.br Matches files which use data blocks marked as damaged by a previous
matches only files which use data blocks marked as damaged by a previous
run of -check_media. The damage info vanishes when a new ISO image gets run of -check_media. The damage info vanishes when a new ISO image gets
loaded. loaded.
.br .br
-undamaged \fB\-pending_data\fR :
Matches files which get their content from outside the loaded ISO image.
.br .br
matches only files which use data blocks outside the areas marked as damaged. \fB\-lba_range\fR start_lba block_count :
Matches files which use data blocks within the range of start_lba
and start_lba+block_count-1.
.br .br
-lba_range start_lba block_count \fB\-has_acl\fR :
Matches files which have a non-trivial ACL.
.br .br
matches only files which use data blocks within the range of start_lba \fB\-has_xattr\fR :
and start_lba+block_count-1. A negative start_lba matches those files which Matches files which have xattr name-value pairs from user namespace.
would not match the range given by its positive counter part.
.br .br
-has_acl , -has_no_acl \fB\-has_aaip\fR :
Matches files which have ACL or any xattr.
.br .br
match files which have resp. have not a non-trivial ACL. \fB\-has_filter\fR :
Matches files which are filtered by -set_filter.
.br .br
-has_xattr , -has_no_xattr \fB\-decision\fR "yes"|"no" :
If this test is reached then the evaluation ends immediatly and action
is performed if the decision is not "no", "0", or "false". See operator -if.
.br .br
match files which have resp. have not xattr name-value pairs Available operators are:
from user namespace.
.br .br
-has_aaip , -has_no_aaip \fB\-not\fR :
Matches if the next test or sub expression does not match.
Several tests do this specifically:
.br .br
match files which have ACL or any xattr resp. have neither of them. -undamaged, -lba_range with negative start_lba, -has_no_acl, -has_no_xattr,
-has_no_aaip, -has_no_filter
.br .br
-has_filter , -has_no_filter \fB\-and\fR :
Matches if both neighboring tests or expressions match.
.br .br
match files which are filtered by -set_filter resp. are not. \fB\-or\fR :
Matches if at least one of both neighboring tests or expressions matches.
.br .br
\fB\-sub\fR ... \fB\-subend\fR :
Enclose a sub expression which gets evaluated first before it
is processed by neighboring operators. The same meaning have "(" and ")".
.br
Normal precedence is: -not, -or , -and.
.br
\fB\-if\fR ... \fB\-then\fR\ ... \fB\-elseif\fR ... \fB\-then\fR ...
\fB\-else\fR ... \fB\-endif\fR :
Enclose one or more sub expressions. If the -if expression matches, then
the -then expression is evaluated as the result of the whole expression
up to -endif. Else the next -elseif expression is evaluated and eventually
its -then expression. Finally in case of no match, the -else expression
is evaluated.
There may be more than one -elseif. Neither -else nor -elseif are mandatory.
If -else is missing and would be hit, then the result is a non-match.
.br
-if expressions are the main use case for the test -decision.
Default action is "echo", Default action is \fBecho\fR,
i.e. to print the address of the found file. Other actions are certain i.e. to print the address of the found file. Other actions are certain
xorriso commands which get performed on the found files. These commands xorriso commands which get performed on the found files. These commands
may have specific parameters. See also their particular descriptions. may have specific parameters. See also their particular descriptions.
.br .br
"chown" and "chown_r" change the ownership and get the user id as param. E.g.: \fBchown\fR and \fBchown_r\fR change the ownership and get the user id
as parameter. E.g.: -exec chown thomas --
.br .br
-find / -exec chown thomas -- \fBchgrp\fR and \fBchgrp_r\fR change the group attribute and get the group id
as paramieter. E.g.: -exec chgrp_r staff --
.br .br
"chgrp" and "chgrp_r" change the group attribute and get the group id as param. \fBchmod\fR and \fBchmod_r\fR change access permissions and get a mode string
E.g.: as parameter. E.g.: -exec chmod a-w,a+r --
.br .br
-find / name 'news*' -type d -exec chgrp_r staff -- \fBalter_date\fR and \fBalter_date_r\fR change the timestamps. They get a type
character and a timestring as parameters.
.br .br
"chmod" and "chmod_r" change access permissions and get a mode string as param. E.g.: -exec alter_date "m" "Dec 30 19:34:12 2007" --
E.g.:
.br .br
-find / -exec chmod a-w,a+r -- \fBlsdl\fR prints file information like shell command ls -dl.
.br .br
"alter_date" and "alter_date_r" change the timestamps. \fBcompare\fR performs command -compare with the found file address as
They get a type character and a timestring as params. iso_rr_path and the corresponding file address below its argument
E.g.: disk_path_start. For this the iso_rr_path of the -find command gets
replaced by the disk_path_start.
.br .br
-find / -exec alter_date "m" "Dec 30 19:34:12 2007" -- E.g.: -find /thomas -exec compare /home/thomas --
.br .br
"lsdl" prints file information like shell command ls -dl. \fBupdate\fR performs command -update with the found file address as
E.g.: iso_rr_path. The corresponding file address is determined like with above
action "compare".
.br .br
-find / -exec lsdl -- \fBrm\fR removes the found iso_rr_path from the image if it is not a directory
with files in it. I.e. this "rm" includes "rmdir".
.br .br
"compare" performs command -compare with the found file address as iso_rr_path \fBrm_r\fR removes the found iso_rr_path from the image, including whole
and the corresponding file address below its argument disk_path_start. For this directory trees.
the iso_rr_path of the -find command gets replaced by the disk_path_start.
E.g.:
.br .br
-find / -exec compare /home/thomas -- \fBreport_damage\fR classifies files whether they hit a data block that is
.br
"update" performs command -update with the found file address as iso_rr_path.
The corresponding file address is determined like with above "compare".
.br
E.g.:
.br
-find / -exec update /home/thomas --
.br
"rm" removes the found iso_rr_path from the image if it is not a directory with
files in it. I.e. this "rm" includes "rmdir".
.br
E.g.:
.br
-find / -name *.doc -exec rm --
.br
"rm_r" removes the found iso_rr_path from the image, including whole directory
trees.
.br
E.g.:
.br
-find /uh/oh -name *private* -exec rm_r --
.br
"report_damage" classifies files whether they hit a data block that is
marked as damaged. The result is printed together with the eventual address marked as damaged. The result is printed together with the eventual address
of the first damaged byte, the maximum span of damages, file size, and the of the first damaged byte, the maximum span of damages, file size, and the
path of the file. path of the file.
.br .br
E.g.: \fBreport_lba\fR prints files which are associated to image data blocks.
.br
-find / -damaged -exec report_damage --
.br
"report_lba" prints files which are associated to image data blocks.
It tells the logical block address, the block number, the byte size, It tells the logical block address, the block number, the byte size,
and the path of each file. There may be reported more than one and the path of each file. There may be reported more than one
line per file if the file is very large. In this case each line has a line per file if the file is very large. In this case each line has a
different extent number in column "xt". different extent number in column "xt".
.br .br
E.g.: \fBgetfacl\fR prints access permissions in ACL text form to the result channel.
.br .br
-find / -lba_range 302000 50000 -exec report_lba -- \fBsetfacl\fR attaches ACLs after removing eventually exiting ones. The new
.br
"getfacl" prints access permissions in ACL text form to the result channel.
.br
E.g.:
.br
-find / -has_acl -exec getfacl
.br
"setfacl" attaches ACLs after removing eventually exiting ones. The new
ACL is given in text form as defined with option -setfacl. ACL is given in text form as defined with option -setfacl.
.br .br
E.g.: E.g.: -exec setfacl u:lisa:rw,u::rw,g::r,o::-,m::rw --
.br .br
-find /work -exec setfacl u:lisa:rw,u::rw,g::r,o::-,m::rw -- \fBgetfattr\fR prints eventual xattr name-value pairs to the result channel.
.br .br
"getfattr" prints eventual xattr name-value pairs to the result channel. \fBsetfattr\fR sets or deletes xattr name value pairs.
.br .br
E.g.: E.g.: -find / -has_xattr -exec setfattr --remove-all '' --
.br .br
-find / -has_xattr -exec getfattr -- \fBset_filter\fR applies or removes filters.
.br .br
"setfattr" sets or deletes xattr name value pairs. E.g.: -exec set_filter --zisofs --
.br .br
E.g.: \fBshow_stream\fR shows the content stream chain of a data file.
.br .br
-find / -has_xattr -exec setfattr --remove-all '' -- \fBfind\fR performs another run of -find on the matching file address.
.br It accepts the same params as -find, except iso_rr_path.
"set_filter" applies or removes filters (see -external_filter).
.br
E.g.:
.br
-find / -type f -exec set_filter gzip --
.br
"show_stream" shows the content stream chain of a data file.
.br
E.g.:
.br
-find / -type f -exec show_stream --
.br
"find" performs another run of -find on the matching file address. It accepts
the same params as -find, except iso_rr_path.
.br .br
E.g.: E.g.:
.br .br
-find / -name '???' -type d -exec find -name '[abc]*' -exec chmod a-w,a+r -- -find / -name '???' -type d -exec find -name '[abc]*' -exec chmod a-w,a+r --
.br
If not used as last command in the line then the argument list
needs to get terminated by "--".
.TP .TP
\fB\-mkdir\fR iso_rr_path [...] \fB\-mkdir\fR iso_rr_path [...]
Create empty directories if they do not exist yet. Create empty directories if they do not exist yet.
@ -2373,37 +2356,33 @@ Similar to shell command du -sk.
Like -find but operating on local filesystem and not on the ISO image. Like -find but operating on local filesystem and not on the ISO image.
This is subject to the settings of -follow. This is subject to the settings of -follow.
.br .br
Find accepts the same -type arguments as -find. Additionally it recognizes -findx accepts the same -type arguments as -find. Additionally it recognizes
type "mountpoint" (or "m"). It matches subdirectories which reside on a type "mountpoint" (or "m") which matches subdirectories which reside on a
different device than their parent. It never matches the disk_path different device than their parent. It never matches the disk_path
given as start address for -findx. given as start address for -findx.
.br .br
-findx accepts the -exec actions as does -find. But except the following few -findx accepts the -exec actions as does -find. But except the following few
actions it will allways perform action "echo". actions it will allways perform action "echo".
.br .br
"in_iso" iso_rr_path_start reports the path if its counterpart exist in \fBin_iso\fR reports the path if its counterpart exist in the ISO image.
the ISO image. For this the disk_path of the -find command gets replaced For this the disk_path of the -findx command gets replaced
by iso_rr_path_start. E.g.: by the iso_rr_path given as parameter.
.br .br
-findx /home -exec in_iso / E.g.: -findx /home/thomas -exec in_iso /thomas_on_cd --
.br .br
"not_in_iso" iso_rr_path_start reports the path if its counterpart does \fBnot_in_iso\fR reports the path if its counterpart does
not exist in the ISO image. The report format is the same as with command not exist in the ISO image. The report format is the same as with command
-compare. -compare.
E.g.
.br .br
-findx /home/thomas -exec not_in_iso /thomas_on_cd \fBadd_missing\fR iso_rr_path_start adds the counterpart if it does not yet
.br
"add_missing" iso_rr_path_start adds the counterpart if it does not yet
exist in the ISO image. exist in the ISO image.
E.g.
.br .br
-findx /home/thomas -exec add_missing /thomas_on_cd E.g.: -findx /home/thomas -exec add_missing /thomas_on_cd --
.br .br
"is_full_in_iso" iso_rr_path_start reports if the counterpart in the ISO image \fBis_full_in_iso\fR reports if the counterpart in the ISO image
contains files. To be used with -type "m" to report mount points. contains files. To be used with -type "m" to report mount points.
.br .br
"empty_iso_dir" iso_rr_path_start deletes all files from the counterpart \fBempty_iso_dir\fR deletes all files from the counterpart
in the ISO image. To be used with -type "m" to truncate mount points. in the ISO image. To be used with -type "m" to truncate mount points.
.TP .TP
\fB\-compare\fR disk_path iso_rr_path \fB\-compare\fR disk_path iso_rr_path

1211
libisoburn/trunk/xorriso/xorriso.c
View File

File diff suppressed because it is too large Load Diff

225
libisoburn/trunk/xorriso/xorriso_private.h
View File

@ -736,6 +736,229 @@ int Dirseq_next_adr(struct DirseQ *o, char reply[SfileadrL], int flag);
int Linkitem_reset_stack(struct LinkiteM **o, struct LinkiteM *to, int flag); int Linkitem_reset_stack(struct LinkiteM **o, struct LinkiteM *to, int flag);
#define Xorriso_findjob_on_expR yes
#ifdef Xorriso_findjob_on_expR
/*
A single Testnode.
*/
struct ExprtesT {
struct FindjoB *boss;
int invert; /* 0=normal 1=invert result */
/*
0= -false (with invert : -true)
1= -name char *arg1 (regex_t in *arg2)
2= -type char *arg1
3= -damaged
4= -lba_range int *arg1 int *arg2
5= -has_acl
6= -has_xattr
7= -has_aaip
8= -has_filter
9= -wanted_node IsoNode *arg1 (for internal use, arg1 not allocated)
10= -pending_data
11= -decision *arg1 ("y", "1", "n", "0")
*/
int test_type;
void *arg1;
void *arg2;
};
/*
A computational node.
A tree of these nodes forms the expression.
Sequences of AND/OR operations form branches, brackets spawn new branches,
NOT inverts node's test resp. subtree result.
*/
struct ExprnodE {
struct ExprnodE *up;
char origin[8];
/* Operators */
int invert; /* 0=normal 1=invert own result (subtree or test, but not op) */
int assoc; /*
0= left : compute own value, combine with left value,
compute right value, combine with current value
1= right: compute own value, compute right value,
combine own and right, combine with left value
*/
int use_shortcuts; /* 0= evaluate all tests of -and and -or,
1= evaluate only until the combined result is known
*/
struct ExprnodE *left;
int left_op; /* 0=OR , 1=AND */
struct ExprnodE *right;
int right_op; /* see left_op */
/* Brackets : a pointer to the first node in a subchain */
struct ExprnodE *sub;
int is_if_then_else;
struct ExprnodE *true_branch;
struct ExprnodE *false_branch;
/* elementary test : if sub!=NULL , test is ignored */
struct ExprtesT *test;
/* Result */
int own_value;
int composed_value;
};
struct FindjoB {
char *start_path;
struct ExprnodE *test_tree;
struct ExprnodE *cursor;
int invert; /* 0=normal 1=set invert-property for next new test node */
int use_shortcuts;
/* 0= echo
1= rm (also rmdir)
2= rm_r
>>> 3= mv target
4= chown user
5= chgrp group
6= chmod mode_and mode_or
7= alter_date type date
8= lsdl
9= chown_r user
10= chgrp_r group
11= chmod_r mode_and mode_or
12= alter_date_r type date
13= find
14= compare disk_equivalent_of_start_path
15= in_iso iso_rr_equivalent_of_start_path
16= not_in_iso iso_rr_equiv
17= update disk_equiv
18= add_missing iso_rr_equiv
19= empty_iso_dir iso_rr_equiv
20= is_full_in_iso iso_rr_equiv
21= report_damage
22= report_lba
23= internal:memorize path of last matching node in found_path
24= getfacl
25= setfacl access_acl default_acl
26= getfattr
27= setfattr
28= set_filter name
29= show_stream
*/
int action;
/* action specific parameters */
char *target;
char *text_2;
uid_t user;
gid_t group;
mode_t mode_and, mode_or;
int type; /* see Xorriso_set_time flag */
time_t date;
char *found_path;
struct FindjoB *subjob;
/* Errors */
char errmsg[4096];
int errn; /*
>0 = UNIX errno
-1 = close_bracket: no bracket open
-2 = binary operator or closing bracket expected
-3 = unexpected binary operator or closing bracket
-4 = unsupported command
-5 = -then -elseif -else -endif without -if or at wrong place
*/
};
int Exprtest_match(struct XorrisO *xorriso, struct ExprtesT *ftest,
void *node_pt, char *name,
struct stat *boss_stbuf, struct stat *stbuf, int flag);
int Exprnode_destroy(struct ExprnodE **fnode, int flag);
int Exprnode_tree_value(struct XorrisO *xorriso, struct ExprnodE *fnode,
int left_value, void *node, char *name,
struct stat *boss_stbuf, struct stat *stbuf, int flag);
int Findjob_new(struct FindjoB **o, char *start_path, int flag);
int Findjob_destroy(struct FindjoB **o, int flag);
int Findjob_set_start_path(struct FindjoB *o, char *start_path, int flag);
int Findjob_get_start_path(struct FindjoB *o, char **start_path, int flag);
int Findjob_set_commit_filter_2(struct FindjoB *o, int flag);
int Findjob_set_lba_range(struct FindjoB *o, int start_lba, int count,
int flag);
int Findjob_set_wanted_node(struct FindjoB *o, void *wanted_node, int flag);
int Findjob_set_decision(struct FindjoB *o, char *decision, int flag);
int Findjob_open_bracket(struct FindjoB *job, int flag);
int Findjob_close_bracket(struct FindjoB *job, int flag);
int Findjob_not(struct FindjoB *job, int flag);
int Findjob_and(struct FindjoB *job, int flag);
int Findjob_or(struct FindjoB *job, int flag);
int Findjob_if(struct FindjoB *job, int flag);
int Findjob_then(struct FindjoB *job, int flag);
int Findjob_else(struct FindjoB *job, int flag);
int Findjob_elseif(struct FindjoB *job, int flag);
int Findjob_endif(struct FindjoB *job, int flag);
int Findjob_test_2(struct XorrisO *xorriso, struct FindjoB *o,
void *node, char *name,
struct stat *boss_stbuf, struct stat *stbuf, int flag);
int Findjob_set_action_found_path(struct FindjoB *o, int flag);
int Findjob_get_action(struct FindjoB *o, int flag);
int Findjob_get_action_parms(struct FindjoB *o, char **target, char **text_2,
uid_t *user, gid_t *group,
mode_t *mode_and, mode_t *mode_or,
int *type, time_t *date, struct FindjoB **subjob,
int flag);
int Findjob_set_found_path(struct FindjoB *o, char *path, int flag);
int Findjob_get_found_path(struct FindjoB *o, char **path, int flag);
#else /* Xorriso_findjob_on_expR */
struct FindjoB; struct FindjoB;
@ -810,6 +1033,8 @@ int Findjob_set_found_path(struct FindjoB *o, char *path, int flag);
int Findjob_get_found_path(struct FindjoB *o, char **path, int flag); int Findjob_get_found_path(struct FindjoB *o, char **path, int flag);
#endif /* ! Xorriso_findjob_on_expR */
struct SplitparT; struct SplitparT;

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2009.04.18.150555" #define Xorriso_timestamP "2009.04.21.173600"

324
libisoburn/trunk/xorriso/xorrisoburn.c
View File

@ -63,7 +63,6 @@
#endif /* Xorriso_standalonE */ #endif /* Xorriso_standalonE */
#define Xorriso_with_aaiP yes
/* Some private in advance declarations */ /* Some private in advance declarations */
int Xorriso_pacifier_loop(struct XorrisO *xorriso, struct burn_drive *drive, int Xorriso_pacifier_loop(struct XorrisO *xorriso, struct burn_drive *drive,
@ -121,11 +120,6 @@ int Xorriso_path_from_node(struct XorrisO *xorriso, IsoNode *node, int lba,
isoburn_igopt_rrip_version_1_10 | isoburn_igopt_aaip_susp_1_10 ) isoburn_igopt_rrip_version_1_10 | isoburn_igopt_aaip_susp_1_10 )
/* <<< Whether to allow xattr and ACL with the root node.
(It is supposed to work since libisofs-ng resision 479)
*/
#define Xorriso_root_with_aaiP yes
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
@ -1803,35 +1797,6 @@ int Xorriso_get_volume(struct XorrisO *xorriso, IsoImage **volume,
return(*volume != NULL); return(*volume != NULL);
} }
/*
@param flag bit0= do not issue warning
*/
int Xorriso_aaip_warn_of_root(struct XorrisO *xorriso, IsoNode *node, int flag)
{
#ifndef Xorriso_root_with_aaiP
int ret;
IsoDir *root= NULL;
IsoImage *volume;
ret= Xorriso_get_volume(xorriso, &volume, 0);
if(ret<=0)
return(ret);
root= iso_image_get_root(volume);
if(node == (IsoNode *) root) {
sprintf(xorriso->info_text,
"Cannot attach ACL or xattr to ISO root directory");
if(!(flag & 1))
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
return(0);
}
#endif /* ! Xorriso_root_with_aaiP */
return(1);
}
/* @param flag bit0=do not complain about non existent node */ /* @param flag bit0=do not complain about non existent node */
int Xorriso_node_from_path(struct XorrisO *xorriso, IsoImage *volume, int Xorriso_node_from_path(struct XorrisO *xorriso, IsoImage *volume,
@ -2131,11 +2096,9 @@ int Xorriso_transfer_properties(struct XorrisO *xorriso, struct stat *stbuf,
mode= stbuf->st_mode; mode= stbuf->st_mode;
#ifdef Xorriso_with_aaiP
if((!(flag & 2)) && !(xorriso->do_aaip & 1)) if((!(flag & 2)) && !(xorriso->do_aaip & 1))
/* Will drop ACL. Update mode S_IRWXG by eventual group:: ACL entry */ /* Will drop ACL. Update mode S_IRWXG by eventual group:: ACL entry */
iso_local_get_perms_wo_acl(disk_path, &mode, flag & 32); iso_local_get_perms_wo_acl(disk_path, &mode, flag & 32);
#endif
if((flag&1) && S_ISDIR(mode)) { if((flag&1) && S_ISDIR(mode)) {
if(mode&S_IRUSR) if(mode&S_IRUSR)
@ -2152,8 +2115,6 @@ int Xorriso_transfer_properties(struct XorrisO *xorriso, struct stat *stbuf,
iso_node_set_mtime(node, stbuf->st_mtime); iso_node_set_mtime(node, stbuf->st_mtime);
iso_node_set_ctime(node, stbuf->st_ctime); iso_node_set_ctime(node, stbuf->st_ctime);
#ifdef Xorriso_with_aaiP
if((xorriso->do_aaip & 5) && !(flag & 2)) { if((xorriso->do_aaip & 5) && !(flag & 2)) {
ret= iso_local_get_attrs(disk_path, &num_attrs, &names, &value_lengths, ret= iso_local_get_attrs(disk_path, &num_attrs, &names, &value_lengths,
&values, ((xorriso->do_aaip & 1) && !(flag & 2)) &values, ((xorriso->do_aaip & 1) && !(flag & 2))
@ -2184,17 +2145,11 @@ int Xorriso_transfer_properties(struct XorrisO *xorriso, struct stat *stbuf,
goto ex; goto ex;
} }
#endif /* Xorriso_with_aaiP */
ret= 1; ret= 1;
ex:; ex:;
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
#ifdef Xorriso_with_aaiP
iso_local_get_attrs(disk_path, &num_attrs, &names, &value_lengths, iso_local_get_attrs(disk_path, &num_attrs, &names, &value_lengths,
&values, 1 << 15); /* free memory */ &values, 1 << 15); /* free memory */
#endif /* Xorriso_with_aaiP */
return(ret); return(ret);
} }
@ -3056,8 +3011,6 @@ int Xorriso_restore_properties(struct XorrisO *xorriso, char *disk_path,
mode= iso_node_get_permissions(node); mode= iso_node_get_permissions(node);
#ifdef Xorriso_with_aaiP
if(xorriso->do_aaip & (2 | 8 | 16)) { if(xorriso->do_aaip & (2 | 8 | 16)) {
ret= iso_node_get_attrs(node, &num_attrs, &names, &value_lengths, &values, ret= iso_node_get_attrs(node, &num_attrs, &names, &value_lengths, &values,
(!!(xorriso->do_aaip & 2)) | (!(xorriso->do_aaip & (8 | 16))) << 2); (!!(xorriso->do_aaip & 2)) | (!(xorriso->do_aaip & (8 | 16))) << 2);
@ -3083,8 +3036,6 @@ int Xorriso_restore_properties(struct XorrisO *xorriso, char *disk_path,
if(!(xorriso->do_aaip & 2)) if(!(xorriso->do_aaip & 2))
mode= iso_node_get_perms_wo_acl(node); mode= iso_node_get_perms_wo_acl(node);
#endif /* Xorriso_with_aaiP */
if(is_dir && (flag&2)) { if(is_dir && (flag&2)) {
ret= Xorriso_fake_stbuf(xorriso, "", &stbuf, &node, ret= Xorriso_fake_stbuf(xorriso, "", &stbuf, &node,
1 | ((!!(xorriso->do_aaip & 2)) << 3)); 1 | ((!!(xorriso->do_aaip & 2)) << 3));
@ -5759,18 +5710,10 @@ int Xorriso_ls_filev(struct XorrisO *xorriso, char *wd,
continue; continue;
link_target[0]= 0; link_target[0]= 0;
if((flag&5)==1) { /* -ls_l */ if((flag&5)==1) { /* -ls_l */
#ifdef Xorriso_with_aaiP
iso_node_get_acl_text(node, &a_text, &d_text, 16); iso_node_get_acl_text(node, &a_text, &d_text, 16);
#endif
ret= Xorriso_format_ls_l(xorriso, &stbuf, ret= Xorriso_format_ls_l(xorriso, &stbuf,
1 | ((a_text != NULL || d_text != NULL) << 1)); 1 | ((a_text != NULL || d_text != NULL) << 1));
#ifdef Xorriso_with_aaiP
iso_node_get_acl_text(node, &a_text, &d_text, 1 << 15); iso_node_get_acl_text(node, &a_text, &d_text, 1 << 15);
#endif
if(ret<=0) if(ret<=0)
continue; continue;
if(LIBISO_ISLNK(node)) { if(LIBISO_ISLNK(node)) {
@ -6686,6 +6629,215 @@ int Xorriso_findi_action(struct XorrisO *xorriso, struct FindjoB *job,
} }
#ifdef Xorriso_findjob_on_expR
int Exprtest_match(struct XorrisO *xorriso, struct ExprtesT *ftest,
void *node_pt, char *name,
struct stat *boss_stbuf, struct stat *stbuf, int flag)
/*
return:
<0 = error
0 = does not match
1 = does match
2 = immediate decision : does not match
3 = immediate decision : does match
*/
{
int value=0, ret, start_lba, end_lba;
int lba_count, *file_end_lbas= NULL, *file_start_lbas= NULL, i;
void *arg1, *arg2;
char ft, *decision;
regmatch_t name_match;
off_t damage_start, damage_end, size;
void *xinfo_dummy;
IsoNode *node;
IsoStream *stream;
if(ftest == NULL)
return(1);
node= (IsoNode *) node_pt;
arg1= ftest->arg1;
arg2= ftest->arg2;
if(node == NULL) {
if(ftest->test_type > 2 && ftest->test_type != 4) {
value= 0;
goto ex;
}
}
switch(ftest->test_type) {
case 0: /* -false */
value= 0;
break; case 1: /* -name *arg1 (regex in *arg2) */
ret= regexec(arg2, name, 1, &name_match, 0);
value= !ret;
break; case 2: /* -type *arg1 */
value= 1;
ft= *((char *) arg1);
if(ft!=0) {
if(S_ISBLK(stbuf->st_mode)) {
if(ft!='b')
value= 0;
} else if(S_ISCHR(stbuf->st_mode)) {
if(ft!='c')
value= 0;
} else if(S_ISDIR(stbuf->st_mode)) {
if(ft=='m') {
if(node != NULL)
value= 0;
else if(boss_stbuf==NULL)
value= 0;
else if(boss_stbuf->st_dev == stbuf->st_dev)
value= 0;
} else if(ft!='d')
value= 0;
} else if(S_ISFIFO(stbuf->st_mode)) {
if(ft!='p')
value= 0;
} else if(S_ISREG(stbuf->st_mode)) {
if(ft!='f' && ft!='-')
value= 0;
} else if(((stbuf->st_mode)&S_IFMT)==S_IFLNK) {
if(ft!='l')
value= 0;
} else if(((stbuf->st_mode)&S_IFMT)==S_IFSOCK) {
if(ft!='s')
value= 0;
} else if((flag & 1) && ((stbuf->st_mode) & S_IFMT) == Xorriso_IFBOOT) {
if(ft!='e' || node == NULL)
value= 0;
} else {
if(ft!='X')
value= 0;
}
}
break; case 3: /* -damaged */;
value= Xorriso_file_eval_damage(xorriso, node, &damage_start, &damage_end,
0);
if(value > 0)
value= 1;
break; case 4: /* -lba_range *arg1 *arg2 */
if(node == NULL) {
value= !(start_lba >= 0);
goto ex;
}
value= 1;
start_lba= *((int *) ftest->arg1);
end_lba= *((int *) ftest->arg2);
ret= Xorriso__start_end_lbas(node, &lba_count,
&file_start_lbas, &file_end_lbas, &size, 0);
if(ret <= 0) {
if(ret < 0)
Xorriso_process_msg_queues(xorriso, 0);
if(start_lba >= 0)
value= 0;
} else {
for(i= 0; i < lba_count; i++) {
if(start_lba >= 0) {
if(file_end_lbas[i] < start_lba || file_start_lbas[i] > end_lba)
value= 0;
} else {
if(file_end_lbas[i] >= -start_lba && file_start_lbas[i] <= -end_lba)
value= 0;
}
}
}
break; case 5: /* -has_acl */
ret = Xorriso_getfacl(xorriso, (void *) node, "", NULL, 2);
if(ret <= 0) {
value= -1;
Xorriso_process_msg_queues(xorriso, 0);
goto ex;
}
value= (ret == 1);
break; case 6: /* -has_xattr */
ret = Xorriso_getfattr(xorriso, (void *) node, "", NULL, 64);
if(ret < 0) {
value= -1;
Xorriso_process_msg_queues(xorriso, 0);
goto ex;
}
value= (ret > 0);
break; case 7: /* -has_aaip */
ret= iso_node_get_xinfo(node, aaip_xinfo_func, &xinfo_dummy);
if(ret < 0) {
value= -1;
Xorriso_process_msg_queues(xorriso, 0);
goto ex;
}
value= (ret > 0);
break; case 8: /* -has_filter */
value= 0;
if(LIBISO_ISREG(node)) {
stream= iso_file_get_stream((IsoFile *) node);
if(iso_stream_get_input_stream(stream, 0) != NULL)
value= 1;
}
break; case 9: /* -wanted_node arg1 (for internal use) */
value= (((IsoNode *) arg1) == node);
break; case 10: /* -pending_data */
value= 1;
if(!LIBISO_ISREG(node)) {
value= 0;
} else {
ret= Xorriso__file_start_lba(node, &start_lba, 0);
if(ret > 0 && start_lba >= 0)
value= 0;
}
break; case 11: /* -decision */
value= 3;
decision= (char *) arg1;
if(strcmp(decision, "no") == 0 || strcmp(decision, "false") == 0 ||
strcmp(decision, "0") == 0)
value= 2;
break; default:
/* >>> complain about unknown test type */;
value= -1;
}
ex:;
if(ftest->invert && value<=1 && value>=0)
value= !value;
if(file_start_lbas != NULL)
free((char *) file_start_lbas);
if(file_end_lbas != NULL)
free((char *) file_end_lbas);
return(value);
}
int Xorriso_findi_test(struct XorrisO *xorriso, struct FindjoB *job,
IsoNode *node, char *name,
struct stat *boss_stbuf, struct stat *stbuf,
int depth, int flag)
{
int ret;
ret= Findjob_test_2(xorriso, job, node, name, boss_stbuf, stbuf, 1);
if(ret<=0)
return(ret);
return(1);
}
#else /* Xorriso_findjob_on_expR */
int Xorriso_findi_test(struct XorrisO *xorriso, struct FindjoB *job, int Xorriso_findi_test(struct XorrisO *xorriso, struct FindjoB *job,
IsoNode *node, char *name, IsoNode *node, char *name,
struct stat *boss_stbuf, struct stat *stbuf, struct stat *boss_stbuf, struct stat *stbuf,
@ -6763,13 +6915,9 @@ int Xorriso_findi_test(struct XorrisO *xorriso, struct FindjoB *job,
} }
Findjob_get_aaip_filter(job, &a_filter, 0); Findjob_get_aaip_filter(job, &a_filter, 0);
if(a_filter) { if(a_filter) {
#ifdef Xorriso_with_aaiP
{ void *xinfo_dummy; { void *xinfo_dummy;
ret= iso_node_get_xinfo(node, aaip_xinfo_func, &xinfo_dummy); ret= iso_node_get_xinfo(node, aaip_xinfo_func, &xinfo_dummy);
} }
#else
ret= 0;
#endif
if(ret < 0) { if(ret < 0) {
Xorriso_process_msg_queues(xorriso, 0); Xorriso_process_msg_queues(xorriso, 0);
goto ex; goto ex;
@ -6806,6 +6954,8 @@ ex:;
return(ret); return(ret);
} }
#endif /* ! Xorriso_findjob_on_expR */
/* @param flag bit0= recursion /* @param flag bit0= recursion
bit1= do not count deleted files with rm and rm_r bit1= do not count deleted files with rm and rm_r
@ -9070,14 +9220,8 @@ int Xorriso_getfacl(struct XorrisO *xorriso, void *in_node, char *path,
if(ret<=0) if(ret<=0)
goto ex; goto ex;
} }
#ifdef Xorriso_with_aaiP
ret= iso_node_get_acl_text(node, &text, &d_text, flag & 16); ret= iso_node_get_acl_text(node, &text, &d_text, flag & 16);
d_ret= (d_text != NULL); d_ret= (d_text != NULL);
#else
ret= d_ret= 0;
#endif
if(ret < 0 || d_ret < 0) { if(ret < 0 || d_ret < 0) {
if(path != NULL && path[0] != 0) { if(path != NULL && path[0] != 0) {
strcpy(xorriso->info_text, "Error with obtaining ACL of "); strcpy(xorriso->info_text, "Error with obtaining ACL of ");
@ -9095,13 +9239,8 @@ int Xorriso_getfacl(struct XorrisO *xorriso, void *in_node, char *path,
ret= 1 + (ret == 0); ret= 1 + (ret == 0);
goto ex; goto ex;
} }
#ifdef Xorriso_with_aaiP
strcpy(xorriso->info_text, "No ACL associated with "); strcpy(xorriso->info_text, "No ACL associated with ");
Text_shellsafe(path, xorriso->info_text, 1); Text_shellsafe(path, xorriso->info_text, 1);
#else
strcpy(xorriso->info_text,
"ACL not enabled by Libisofs_with_aaiP/Xorriso_with_aaiP");
#endif
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0);
if(ret == 0) if(ret == 0)
{ret= 2; goto ex;} {ret= 2; goto ex;}
@ -9229,19 +9368,7 @@ int Xorriso_setfacl(struct XorrisO *xorriso, void *in_node, char *path,
if(ret<=0) if(ret<=0)
goto ex; goto ex;
} }
ret= Xorriso_aaip_warn_of_root(xorriso, node, flag & 1);
if (ret < 0)
goto ex;
if (ret == 0)
{ret= 1; goto ex;}
#ifdef Xorriso_with_aaiP
ret= iso_node_set_acl_text(node, access_text, default_text, 0); ret= iso_node_set_acl_text(node, access_text, default_text, 0);
#else
ret= 0;
#endif
if(ret <= 0) { if(ret <= 0) {
if(path != NULL && path[0] != 0) { if(path != NULL && path[0] != 0) {
strcpy(xorriso->info_text, "Error with setting ACL of "); strcpy(xorriso->info_text, "Error with setting ACL of ");
@ -9366,20 +9493,8 @@ int Xorriso_setfattr(struct XorrisO *xorriso, void *in_node, char *path,
if(ret<=0) if(ret<=0)
goto ex; goto ex;
} }
ret= Xorriso_aaip_warn_of_root(xorriso, node, !!(flag & 16));
if (ret < 0)
goto ex;
if (ret == 0)
{ret= 1; goto ex;}
#ifdef Xorriso_with_aaiP
ret= iso_node_set_attrs(node, num_attrs, names, value_lengths, values, ret= iso_node_set_attrs(node, num_attrs, names, value_lengths, values,
flag & (1 | 2 | 4 | 8)); flag & (1 | 2 | 4 | 8));
#else
ret= 0;
#endif
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
if(ret <= 0) { if(ret <= 0) {
Xorriso_report_iso_error(xorriso, "", ret, Xorriso_report_iso_error(xorriso, "", ret,
@ -9419,8 +9534,6 @@ ex:;
int Xorriso_local_getfacl(struct XorrisO *xorriso, char *disk_path, int Xorriso_local_getfacl(struct XorrisO *xorriso, char *disk_path,
char **text, int flag) char **text, int flag)
{ {
#ifdef Xorriso_with_aaiP
int ret, skip= 0, colons= 0, countdown= 0; int ret, skip= 0, colons= 0, countdown= 0;
char *acl= NULL, *cpt, *wpt; char *acl= NULL, *cpt, *wpt;
@ -9471,12 +9584,6 @@ int Xorriso_local_getfacl(struct XorrisO *xorriso, char *disk_path,
*wpt= 0; *wpt= 0;
return(1); return(1);
#else
*text= NULL;
return(0);
#endif /* ! Xorriso_with_aaiP */
} }
@ -9495,7 +9602,6 @@ int Xorriso_get_attrs(struct XorrisO *xorriso, void *in_node, char *path,
IsoNode *node; IsoNode *node;
if(flag & (1 << 15)) { if(flag & (1 << 15)) {
#ifdef Xorriso_with_aaiP
if(flag & 2) { if(flag & 2) {
iso_local_get_attrs(NULL, num_attrs, names, value_lengths, values, iso_local_get_attrs(NULL, num_attrs, names, value_lengths, values,
1 << 15); 1 << 15);
@ -9503,14 +9609,11 @@ int Xorriso_get_attrs(struct XorrisO *xorriso, void *in_node, char *path,
iso_node_get_attrs(NULL, num_attrs, names, value_lengths, values, iso_node_get_attrs(NULL, num_attrs, names, value_lengths, values,
1 << 15); 1 << 15);
} }
#endif /* Xorriso_with_aaiP */
return(1); return(1);
} }
*num_attrs= 0; *num_attrs= 0;
if(flag & 2) { if(flag & 2) {
#ifdef Xorriso_with_aaiP
ret= iso_local_get_attrs(path, num_attrs, names, value_lengths, values, ret= iso_local_get_attrs(path, num_attrs, names, value_lengths, values,
flag & (8 | 32)); flag & (8 | 32));
if(ret < 0) { if(ret < 0) {
@ -9518,9 +9621,6 @@ int Xorriso_get_attrs(struct XorrisO *xorriso, void *in_node, char *path,
Text_shellsafe(path, xorriso->info_text, 1); Text_shellsafe(path, xorriso->info_text, 1);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE", 0);
} }
#endif /* Xorriso_with_aaiP */
;
} else { } else {
node= (IsoNode *) in_node; node= (IsoNode *) in_node;
if(node == NULL) { if(node == NULL) {
@ -9528,7 +9628,6 @@ int Xorriso_get_attrs(struct XorrisO *xorriso, void *in_node, char *path,
if(ret<=0) if(ret<=0)
goto ex; goto ex;
} }
#ifdef Xorriso_with_aaiP
ret= iso_node_get_attrs(node, num_attrs, names, value_lengths, values, ret= iso_node_get_attrs(node, num_attrs, names, value_lengths, values,
0); 0);
if(ret < 0) { if(ret < 0) {
@ -9536,7 +9635,6 @@ int Xorriso_get_attrs(struct XorrisO *xorriso, void *in_node, char *path,
"Error when obtaining xattr of ISO node", 0, "FAILURE", 1); "Error when obtaining xattr of ISO node", 0, "FAILURE", 1);
goto ex; goto ex;
} }
#endif /* Xorriso_with_aaiP */
if(!(flag & 8)) { if(!(flag & 8)) {
/* Filter away any non-userspace xattr */; /* Filter away any non-userspace xattr */;