if (rmf(folder) == OK) {
char *cfolder = context_find(curfolder);
- if (cfolder && strcmp(cfolder, newfolder)) {
+ if (cfolder && strcmp(cfolder, newfolder)!=0) {
printf("[+%s now current]\n", newfolder);
/* update current folder */
context_replace(curfolder, newfolder);
break; /* fall otherwise */
case NOTOK:
- snprintf(cur, sizeof(cur), "atr-%s-%s",
- current, toabsdir(folder));
+ snprintf(cur, sizeof(cur), "atr-%s-%s", seq_cur,
+ toabsdir(folder));
if (!context_del(cur)) {
printf("[+%s de-referenced]\n", folder);
return OK;
#ifdef MHE
case '+':
#endif /* MHE */
-#ifdef UCI
- case '_':
- case '#':
-#endif /* UCI */
break;
default:
** "atr-something-folderpath", and remove them.
*/
for (np = m_defs, pp = NULL; np; np = np->n_next) {
- if (isprefix("atr-", np->n_name) &&
+ if (strncmp(np->n_name, "atr-", alen)==0 &&
(j = strlen(np->n_name) - plen) > alen &&
*(np->n_name + j) == '-' &&
strcmp(cp, np->n_name + j + 1) == 0) {