diff options
| -rw-r--r-- | src/common/unionfs.c | 4 | ||||
| -rw-r--r-- | src/set.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/common/unionfs.c b/src/common/unionfs.c index 151c6ce..2f7cd70 100644 --- a/src/common/unionfs.c +++ b/src/common/unionfs.c @@ -227,10 +227,10 @@ retrieve_data(char* rel_data_path, GNode *node, char* root, NODE_OPERATION op) //either multi or tag--shouldn't have made a difference, but arkady was confused. vn->_config._multi = (def.tag | def.multi); - if (def.def_tag > 0) { + if (def.def_tag != 0) { vn->_config._limit = def.def_tag; } - else if (def.def_multi > 0) { + else if (def.def_multi != 0) { vn->_config._limit = def.def_multi; } else { @@ -93,7 +93,10 @@ boolean set_validate(vtw_def *defp, char *valp, boolean empty_val) } //apply limit count here, needs to be defined as a tag,multi and have a value set - if ((defp->tag || defp->multi) && (defp->def_tag > 0 || defp->def_multi > 0)) { + + //NOTE: changed behavior for def_tag==1. Needs signed 32 support in parser where -1 + //represents embedded tag node... TODO + if ((defp->tag || defp->multi) && (defp->def_tag != 0 || defp->def_multi != 0)) { //get count of siblings char path[2048]; @@ -124,7 +127,7 @@ boolean set_validate(vtw_def *defp, char *valp, boolean empty_val) } closedir(dirp); - if (defp->tag && file_count == 1 && defp->def_tag == 1) { + if (defp->tag && file_count == 1 && defp->def_tag < 0) { //this is the special case, where the previous value should be deleted here... char command[8192]; //let unionfs handle the diff @@ -133,7 +136,7 @@ boolean set_validate(vtw_def *defp, char *valp, boolean empty_val) } if (defp->tag) { - if (defp->def_tag > 1 && file_count >= defp->def_tag) { + if (defp->def_tag > 0 && file_count >= defp->def_tag) { fprintf(out_stream,"Number of values exceeded for %s, allowed: %d, actual: %d\n",val,defp->def_tag,file_count); return FALSE; } |