New -find test -disk_path

This commit is contained in:
2012-06-21 20:34:40 +00:00
parent 9520fd1c77
commit abb6a2704f
9 changed files with 179 additions and 59 deletions

View File

@ -382,6 +382,7 @@ int Findjob_new(struct FindjoB **o, char *start_path, int flag)
m->subjob= NULL;
m->errmsg[0]= 0;
m->errn= 0;
m->match_count= 0;
ret= Exprnode_new(&(m->test_tree), m, NULL, "-find", (m->use_shortcuts)<<1);
if(ret<=0)
@ -758,7 +759,7 @@ improper_range:;
}
/* @param flag bit0-1= 0= -name , 1= -wholename , 2= -disk_name
/* @param flag bit0-1: 0= -name , 1= -wholename , 2= -disk_name , 3= -disk_path
*/
int Findjob_set_name_expr(struct FindjoB *o, char *name_expr, int flag)
{
@ -782,14 +783,18 @@ int Findjob_set_name_expr(struct FindjoB *o, char *name_expr, int flag)
t->test_type= 13;
else if((flag & 3) == 2)
t->test_type= 16;
else if((flag & 3) == 3)
t->test_type= 20;
t->arg1= strdup(name_expr);
if(t->arg1 == NULL)
{ret= -1; goto ex;};
if((flag & 3) == 3)
{ret= 1; goto ex;}
name_re= (regex_t *) calloc(1, sizeof(regex_t));
if(name_re == NULL)
{ret= -1; goto ex;};
t->arg1= strdup(name_expr);
if(t->arg1 == NULL) {
free((char *) name_re);
{ret= -1; goto ex;};
}
Xorriso__bourne_to_reg(name_expr, regexpr, 0);
if(regcomp(name_re, regexpr, 0) != 0) {
free((char *) name_re);