X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fflist.c;h=c98a3f0629509b6ec48c61037f486afb02950e5c;hp=847bb3652d20d7dcd3ef9422e8a75af319ed1478;hb=84c6039eb7226c0ba0a8f708205e33d10950d2ae;hpb=3cc8ed080f6e741b8df04a3ebe764c659e75cb38 diff --git a/uip/flist.c b/uip/flist.c index 847bb36..c98a3f0 100644 --- a/uip/flist.c +++ b/uip/flist.c @@ -369,7 +369,7 @@ BuildFolderList(char *dirName, int searchdepth) ** If base directory, don't add it to the ** folder list. We just recurse into it. */ - if (!strcmp(dirName, ".")) { + if (strcmp(dirName, ".")==0) { BuildFolderListRecurse(".", &st, 0); return; } @@ -414,10 +414,11 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth) ** A hack so that we don't see a ** leading "./" in folder names. */ - base = strcmp(dirName, ".") ? dirName : dirName + 1; + base = (strcmp(dirName, ".")==0) ? dirName + 1 : dirName; while (nlinks && (dp = readdir(dir))) { - if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) { + if (strcmp(dp->d_name, ".")==0 || + strcmp(dp->d_name, "..")==0) { nlinks--; continue; } @@ -583,7 +584,7 @@ PrintFolders(void) for (j = 0; j < numsequences; j++) { if (folders[i].nSeq[j] > 0 || showzero) { /* Add `+' to end of name of current folder */ - if (strcmp(curfol, folders[i].name)) + if (strcmp(curfol, folders[i].name)!=0) snprintf(tmpname, sizeof(tmpname), "%s", folders[i].name); else @@ -652,15 +653,15 @@ AssignPriority(char *name) nl = strlen(name); for (i = 0; i < nOrders; ++i) { o = &orders[i]; - if (!strcmp(name, o->name)) + if (strcmp(name, o->name)==0) return o->priority; ol = strlen(o->name); if (nl < ol - 1) continue; if (ol < bestLen) continue; - if (o->name[0] == '*' && !strcmp(o->name + 1, - name + (nl - ol + 1))) { + if (o->name[0] == '*' && + strcmp(o->name + 1, name + (nl - ol + 1))==0) { best = o->priority; bestLen = ol; } else if (o->name[ol - 1] == '*' && @@ -687,7 +688,8 @@ do_readonly_folders(void) atrlen = strlen(atrcur); for (np = m_defs; np; np = np->n_next) - if (isprefix(atrcur, np->n_name) - && !isprefix(nmhdir, np->n_name + atrlen)) + if (strncmp(np->n_name, atrcur, atrlen)==0 + && strncmp(np->n_name+atrlen, nmhdir, strlen(nmhdir))!=0) + /* Why do we exclude absolute path names? --meillo */ BuildFolderList(np->n_name + atrlen, 0); }