cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: rewrite entcmp to be single pass, less stupid

Browse source 
move to single pass strcmp variant that knows about trailing '/' rule.
This commit is contained in:
Ori Bernstein 2024-07-27 15:36:23 +00:00
parent 605bed312a
commit 439a525113
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
sys/src/cmd/git/util.c
View file

@ -33,16 +33,17 @@ emptydir(void)
cache(e);
return e;
}
int
entcmp(void *pa, void *pb)
{
char abuf[256], bbuf[256], *ae, *be;
Dirent *a, *b;
int r;
Dirent *ae, *be;
char *a, *b;
int ca, cb;
a = pa;
b = pb;
ae = pa;
be = pb;
a = ae->name;
b = be->name;
/*
* If the files have the same name, they're equal.
* Otherwise, If they're trees, they sort as thoug
@ -50,16 +51,25 @@ entcmp(void *pa, void *pb)
*
* Wat.
*/
r = strcmp(a->name, b->name);
if(r == 0 || (a->mode&DMDIR) == 0 && (b->mode&DMDIR) == 0)
return r;
ae = seprint(abuf, abuf + sizeof(abuf) - 1, a->name);
be = seprint(bbuf, bbuf + sizeof(bbuf) - 1, b->name);
if(a->mode & DMDIR)
*ae = '/';
if(b->mode & DMDIR)
*be = '/';
return strcmp(abuf, bbuf);
while(1){
ca = *a++;
cb = *b++;
/*
* because these are dir entries in a tree,
* the only '/' allowable is the virtual '/'
* at the end of the file name.
*/
assert(ca != '/' && cb != '/');
if(ca != cb){
if(ca == 0 && (ae->mode & DMDIR))
ca = '/';
if(cb == 0 && (be->mode & DMDIR))
cb = '/';
return (ca > cb) ? 1 : -1;
}
if(ca == 0)
return 0;
}
}
int