Unified · Split
| @@ -1010,7 +1010,7 @@ parsename(char *name, Elemlist *e) · 1009 unmodified lines | |||
| 1010 | } | 1010 | } |
| 1011 | 1011 | ||
| 1012 | void* | 1012 | void* |
| 1013 | memrchr(void *va, int c, long n) | 1013 | mymemrchr(void *va, int c, long n) |
| 1014 | { | 1014 | { |
| 1015 | uchar *a, *e; | 1015 | uchar *a, *e; |
| 1016 | 1016 | ||
| @@ -1150,7 +1150,7 @@ namec(char *aname, int amode, int omode, ulong perm) · 133 unmodified lines | |||
| 1150 | strcpy(tmperrbuf, up->errstr); | 1150 | strcpy(tmperrbuf, up->errstr); |
| 1151 | NameError: | 1151 | NameError: |
| 1152 | len = prefix+e.off[npath]; | 1152 | len = prefix+e.off[npath]; |
| 1153 | if(len < ERRMAX/3 || (name=memrchr(aname, '/', len))==nil || name==aname) | 1153 | if(len < ERRMAX/3 || (name=mymemrchr(aname, '/', len))==nil || name==aname) |
| 1154 | snprint(up->genbuf, sizeof up->genbuf, "%.*s", len, aname); | 1154 | snprint(up->genbuf, sizeof up->genbuf, "%.*s", len, aname); |
| 1155 | else | 1155 | else |
| 1156 | snprint(up->genbuf, sizeof up->genbuf, "...%.*s", (int)(len-(name-aname)), name); | 1156 | snprint(up->genbuf, sizeof up->genbuf, "...%.*s", (int)(len-(name-aname)), name); |