eddy/eddys_snippets
1
0
Fork 0
mirror of https://github.com/eddyem/eddys_snippets.git synced 2026-02-01 04:45:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix bug with arguments sorting in parseargs.c

Browse Source
This commit is contained in:
eddyem 2017-01-30 14:53:43 +03:00
parent 70bbe7ddf2
commit bd94cc6e8b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
getopt/cmdlnopts/parseargs.c
View File

@ -340,12 +340,12 @@ static int argsort(const void *a1, const void *a2){
int s1 = o1->val, s2 = o2->val; int s1 = o1->val, s2 = o2->val;
int *f1 = o1->flag, *f2 = o2->flag; int *f1 = o1->flag, *f2 = o2->flag;
// check if both options has short arg // check if both options has short arg
if(f1 == NULL && f2 == NULL){ // both have short arg if(f1 == NULL && f2 == NULL && s1 && s2){ // both have short arg
return (s1 - s2); return (s1 - s2);
}else if(f1 != NULL && f2 != NULL){ // both don't have short arg - sort by long }else if((f1 != NULL || !s1) && (f2 != NULL || !s2)){ // both don't have short arg - sort by long
return strcmp(l1, l2); return strcmp(l1, l2);
}else{ // only one have short arg -- return it }else{ // only one have short arg -- return it
if(f2) return -1; // a1 have short - it is 'lesser' if(f2 || !s2) return -1; // a1 have short - it is 'lesser'
else return 1; else return 1;
} }
} }