| Revision | 3f95324bd0fbc12e988a319c93d0fb113440bbc8 (tree) |
|---|---|
| Time | 2022-10-23 02:29:18 |
| Author | SHIRAKATA Kentaro <argrath@ub32...> |
| Commiter | SHIRAKATA Kentaro |
flatten str2ic
japanese/jlib.c (diff)| @@ -201,8 +201,15 @@ str2ic(s) | ||
| 201 | 201 | src_len = strlen(s); |
| 202 | 202 | dst_len = sizeof(buf); |
| 203 | 203 | if (iconv(input_dsc, (char**)&up, &src_len, |
| 204 | - (char**)&p, &dst_len) == (size_t)-1) | |
| 205 | - goto noconvert; | |
| 204 | + (char**)&p, &dst_len) == (size_t)-1){ | |
| 205 | + strcpy((char *)buf, s); | |
| 206 | + return (char *)buf; | |
| 207 | + } | |
| 208 | + *(p++) = '\0'; | |
| 209 | + return (char *)buf; | |
| 210 | + } else { | |
| 211 | + strcpy((char *)buf, s); | |
| 212 | + return (char *)buf; | |
| 206 | 213 | } |
| 207 | 214 | #else |
| 208 | 215 | if( IC==EUC && input_kcode == SJIS ){ |
| @@ -217,18 +224,14 @@ str2ic(s) | ||
| 217 | 224 | else |
| 218 | 225 | *(p++) = (unsigned char)*(s++); |
| 219 | 226 | } |
| 220 | - } | |
| 221 | -#endif | |
| 222 | - else{ | |
| 223 | -#ifdef POSIX_ICONV | |
| 224 | -noconvert: | |
| 225 | -#endif | |
| 227 | + *(p++) = '\0'; | |
| 228 | + return (char *)buf; | |
| 229 | + } else { | |
| 226 | 230 | strcpy((char *)buf, s); |
| 227 | 231 | return (char *)buf; |
| 228 | 232 | } |
| 233 | +#endif | |
| 229 | 234 | |
| 230 | - *(p++) = '\0'; | |
| 231 | - return (char *)buf; | |
| 232 | 235 | } |
| 233 | 236 | |
| 234 | 237 | /* |
Fork