at 23.11-beta 73 lines 1.8 kB view raw
1--- comm/comm.c 2+++ comm/comm.c 3@@ -242,7 +242,7 @@ compare(const char *a, const char *b) 4 return(2); 5 } 6 } else { 7- n = strcoll(a, b); 8+ n = strcmp(a, b); 9 return n ? n > 0 ? 2 : 1 : 0; 10 } 11 } 12--- expr/expr.y 13+++ expr/expr.y 14@@ -234,7 +234,7 @@ _rel(int op, register char *r1, register char *r2) 15 if (numeric(r1) && numeric(r2)) 16 i = atoll(r1) - atoll(r2); 17 else 18- i = strcoll(r1, r2); 19+ i = strcmp(r1, r2); 20 switch(op) { 21 case EQ: i = i==0; break; 22 case GT: i = i>0; break; 23--- join/join.c 24+++ join/join.c 25@@ -65,7 +65,7 @@ enum { 26 JF = -1 27 }; 28 #define ppi(f, j) ((j) >= 0 && (j) < ppisize[f] ? ppibuf[f][j] : null) 29-#define comp() strcoll(ppi(F1, j1),ppi(F2, j2)) 30+#define comp() strcmp(ppi(F1, j1),ppi(F2, j2)) 31 32 #define next(wc, s, n) (*(s) & 0200 ? ((n) = mbtowi(&(wc), (s), mb_cur_max), \ 33 (n) = ((n) > 0 ? (n) : (n) < 0 ? (wc=WEOF, 1) : 1)) : \ 34--- ls/ls.c 35+++ ls/ls.c 36@@ -575,13 +575,13 @@ _mergesort(struct file **al) 37 static int 38 namecmp(struct file *f1, struct file *f2) 39 { 40- return strcoll(f1->name, f2->name); 41+ return strcmp(f1->name, f2->name); 42 } 43 44 static int 45 extcmp(struct file *f1, struct file *f2) 46 { 47- return strcoll(extension(f1->name), extension(f2->name)); 48+ return strcmp(extension(f1->name), extension(f2->name)); 49 } 50 51 static int 52--- nawk/run.c 53+++ nawk/run.c 54@@ -608,7 +608,7 @@ Cell *relop(Node **a, int n) 55 j = x->fval - y->fval; 56 i = j<0? -1: (j>0? 1: 0); 57 } else { 58- i = strcoll((char*)getsval(x), (char*)getsval(y)); 59+ i = strcmp((char*)getsval(x), (char*)getsval(y)); 60 } 61 tempfree(x, ""); 62 tempfree(y, ""); 63--- sort/sort.c 64+++ sort/sort.c 65@@ -1148,7 +1148,7 @@ cmpl(const char *pa, const char *pb) 66 67 ecpy(collba, pa, '\n'); 68 ecpy(collbb, pb, '\n'); 69- n = strcoll(collba, collbb); 70+ n = strcmp(collba, collbb); 71 return n ? n > 0 ? -fields[0].rflg : fields[0].rflg : 0; 72 } 73