--- src/usr.bin/basename/basename.c 2005/09/23 07:09:03 1.9 +++ src/usr.bin/basename/basename.c 2005/09/27 22:35:51 1.10 @@ -93,12 +93,16 @@ main(int argc, char **argv) void stripsuffix(char *p, const char *suffix, size_t suffixlen) { - char *q, *r; + char *q; +#ifndef NO_WCHAR + char *r; mbstate_t mbs; size_t n; +#endif if (suffixlen && (q = strchr(p, '\0') - suffixlen) > p && strcmp(suffix, q) == 0) { +#ifndef NO_WCHAR /* Ensure that the match occurred on a character boundary. */ memset(&mbs, 0, sizeof(mbs)); for (r = p; r < q; r += n) { @@ -110,6 +114,7 @@ stripsuffix(char *p, const char *suffix, } /* Chop off the suffix. */ if (q == r) +#endif *q = '\0'; } }