[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[debian-users:16694] Bug#JP/958: marked as done (patch for xmulti to work on potato)
Shuichi OONO <jr5pdx@debian.or.jp>さんの Fri, 16 Jul 1999 00:02:27 +0900付けの
message-id <199907151504.AAA02765@xxxxxxxxxxxxxxxxxx>
subject (no subject)
のメッセージにより以下のバグ報告は「処理済」とされました。
もし、間違ったバグ報告を「処理済」にしてしまった場合は
必要に応じてバグ報告を再発行し、そして/または、ただちに問題を修正してください。
(注: これは Debian JP Bug Tracking System が発行している
自動応答メッセージで、debian-users メイリングリストにも送られています。
あなたがシステム管理者で、このメッセージが何について書かれている
かよくわからないのでしたら、どこかに深刻なメールシステムの誤設定がある
ことを示しています。すぐに私まで連絡をいただけないでしょうか)
(NB: If you are a system administrator and have no idea what I'm
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
--
Debian JP Bug Tracking System / owner@bugs.debian.or.jp
Received: from mail.netwave.or.jp (mail.netwave.or.jp [202.214.48.114])
by lists.debian.or.jp (8.9.2+3.1W/3.6W-Debian-JP-980308) with ESMTP id AAA28252;
Fri, 16 Jul 1999 00:03:28 +0900 (JST)
Date: Fri, 16 Jul 1999 00:02:27 +0900
From: Shuichi OONO <jr5pdx@debian.or.jp>
To: 865-done@bugs.debian.or.jp, 891-done@bugs.debian.or.jp,
958-done@bugs.debian.or.jp
User-Agent: Wanderlust/1.0.3 (Notorious) SEMI/1.13.5 (=?ISO-8859-4?Q?Meih?=
=?ISO-8859-4?Q?=F2?=) FLIM/1.12.7 (=?ISO-8859-4?Q?Y=FEzaki?=)
Emacs/20.3
(i386-debian-linux-gnu) MULE/4.0 (HANANOEN)
Organization: Debian JP Project
MIME-Version: 1.0 (generated by SEMI 1.13.5 -
=?ISO-8859-4?Q?=22Meih=F2=22?=)
X-PGP-Sig: 2.6.3ia From,Organization
iQCVAwUBN434DVw2EvJRszHJAQGmlwP9Gy6ECQL7yvvOQgkmUSxKN1POtB2tMYcc
V7d8lwBkr9KSvCs0bBgMdhGKH3aRCXe4SVQpHij9h6zZngDFVc8wM2v7DZv15cN6
QeOF4W/i7uN2ZvGaiPsFDuEP0hOMT8UgKP8oeuaT8cSnBxRqv5tn9694IM0fv/VI
Z/HE0k1E+PU=
=ewc6
Content-Type: text/plain; charset=ISO-2022-JP
X-Dispatcher: imput version 980905(IM100)
Lines: 4
gotom さんのパッチを適用して xmulti_2.00b4-6 で修正しました。
--
大野 修一
Return-Path: <gotom@xxxxxxxxxxxxxxxxxxx>
To: submit@bugs.debian.or.jp
Cc: gotom@debian.or.jp
Subject: patch for xmulti to work on potato
From: GOTO Masanori <gotom@debian.or.jp>
X-Mailer: Mew version 1.93b38 on XEmacs 21.1 (20 Minutes to Nikko)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <19990713214744Q.gotom@xxxxxxxxxxxxxxxxxxx>
Date: Tue, 13 Jul 1999 21:47:44 +0900
Sender: GOTO Masanori <gotom@xxxxxxxxxxxxxxxxxxx>
X-Dispatcher: imput version 980905(IM100)
Lines: 651
Package: xmulti
Version: 2.00b4-4
xmulti-2.00b4-4 を potato で起動しようとすると、
セグメントエラーが発生して起動しません。
環境は以下の通りです:
ii libc6 2.1.1-12 GNU C Library: Shared libraries and timezone
ii libc6-dev 2.1.1-12 GNU C Library: Development libraries and hea
ii xlib6g 3.3.3.1-10 shared libraries required by X clients
ii gcc 2.91.66-2 The GNU (EGCS) C compiler.
この問題に対処するパッチを作成したので、
以下に添付します:
---------------------------------------------------- ここから
diff -Naur xmulti-2.00b4.org/html/frame.c xmulti-2.00b4/html/frame.c
--- xmulti-2.00b4.org/html/frame.c Sat Apr 4 23:58:33 1998
+++ xmulti-2.00b4/html/frame.c Mon Jul 12 19:16:08 1999
@@ -513,7 +513,7 @@
perror("tagwork_open");
exit(1);
}
- strncpy(f->path, name, len);
+ strncpy1(f->path, name, len);
f->path[len] = '\0';
} else {
f->path = NULL;
diff -Naur xmulti-2.00b4.org/html/miniframe.c xmulti-2.00b4/html/miniframe.c
--- xmulti-2.00b4.org/html/miniframe.c Sat Dec 27 19:21:38 1997
+++ xmulti-2.00b4/html/miniframe.c Tue Jul 13 20:34:53 1999
@@ -215,8 +215,8 @@
if ((mf->wstr = malloc((sizeof(*mf->wstr) * len + 1)))) {
mbstate_t state;
- mbrtowc(NULL, NULL, 0, &state);
- len = mbsrtowcs(mf->wstr, str, len, &state);
+ mbrtowc1(NULL, NULL, 0, &state);
+ len = mbsrtowcs1(mf->wstr, str, len, &state);
mf->wstr[len] = '\0';
miniframe_parse_string(mf, mf->wstr);
diff -Naur xmulti-2.00b4.org/html/parse_block.c xmulti-2.00b4/html/parse_block.c
--- xmulti-2.00b4.org/html/parse_block.c Fri Dec 26 05:03:12 1997
+++ xmulti-2.00b4/html/parse_block.c Tue Jul 13 20:37:11 1999
@@ -214,10 +214,10 @@
default:
sprintf(buf, "%d. ", pbfi->li_cnt);
}
- mbrtowc(NULL,NULL,0,&s);
- n = mbsrtowcs(wbuf, buf, sizeof(buf), &s);
+ mbrtowc1(NULL,NULL,0,&s);
+ n = mbsrtowcs1(wbuf, buf, sizeof(buf), &s);
if ((wbuf2 = malloc(n * sizeof(wbuf2))) != NULL) {
- wcscpy(wbuf2,wbuf);
+ wcscpy1(wbuf2,wbuf);
/* frame_add_string(f, wbuf2, n, 1);*/
/* bfi->obj->prev->type = HTMLOBJ_TEXT_MEM;*/
}
diff -Naur xmulti-2.00b4.org/html/tag.c xmulti-2.00b4/html/tag.c
--- xmulti-2.00b4.org/html/tag.c Sat Apr 4 23:58:33 1998
+++ xmulti-2.00b4/html/tag.c Tue Jul 13 20:36:35 1999
@@ -178,7 +178,7 @@
}
}
- len = mbrtowc(&ret, w->p, _mb_cur_max_, &w->state);
+ len = mbrtowc1(&ret, w->p, _mb_cur_max_, &w->state);
if (ret) {
if (len < 0)
w->p += 1;
@@ -486,7 +486,7 @@
p->eof = 0;
p->p = p->p2 = p->data;
- mbrtowc(NULL,NULL,0,&p->state); /* init state */
+ mbrtowc1(NULL,NULL,0,&p->state); /* init state */
p->tags = p->cur = tag_new(TAG_none);
p->main = tagwork_parse;
diff -Naur xmulti-2.00b4.org/locale/Clocale.c xmulti-2.00b4/locale/Clocale.c
--- xmulti-2.00b4.org/locale/Clocale.c Mon Dec 22 13:20:03 1997
+++ xmulti-2.00b4/locale/Clocale.c Tue Jul 13 20:26:20 1999
@@ -13,10 +13,10 @@
_LocaleInfo *loc;
{
loc->mbcurmax = 1;
- loc->stateinit = _C_stateinit;
- loc->mbsinit = _C_mbsinit;
- loc->mbrtowc = _C_mbrtowc;
- loc->wcrtomb = _C_wcrtomb;
+ loc->stateinit1 = _C_stateinit;
+ loc->mbsinit1 = _C_mbsinit;
+ loc->mbrtowc1 = _C_mbrtowc;
+ loc->wcrtomb1 = _C_wcrtomb;
return 0;
}
@@ -62,11 +62,11 @@
}
u_char _mb_cur_max_ = 1;
-int (*_mbsinit_) __P((const mbstate_t *))
+int (*_mbsinit1_) __P((const mbstate_t *))
= _C_mbsinit;
-size_t (*_mbrtowc_) __P((wchar_t *, const char *, size_t, mbstate_t *))
+size_t (*_mbrtowc1_) __P((wchar_t *, const char *, size_t, mbstate_t *))
= _C_mbrtowc;
-size_t (*_wcrtomb_) __P((char *, wchar_t, mbstate_t *))
+size_t (*_wcrtomb1_) __P((char *, wchar_t, mbstate_t *))
= _C_wcrtomb;;
_LocaleInfo _default_locinfo = {
diff -Naur xmulti-2.00b4.org/locale/iso2022.c xmulti-2.00b4/locale/iso2022.c
--- xmulti-2.00b4.org/locale/iso2022.c Mon Dec 22 13:20:03 1997
+++ xmulti-2.00b4/locale/iso2022.c Tue Jul 13 20:24:27 1999
@@ -60,10 +60,10 @@
int i;
loc->mbcurmax = 6;
- loc->stateinit = _ISO2022_stateinit;
- loc->mbsinit = _ISO2022_mbsinit;
- loc->mbrtowc = _ISO2022_mbrtowc;
- loc->wcrtomb = _ISO2022_wcrtomb;
+ loc->stateinit1 = _ISO2022_stateinit;
+ loc->mbsinit1 = _ISO2022_mbsinit;
+ loc->mbrtowc1 = _ISO2022_mbrtowc;
+ loc->wcrtomb1 = _ISO2022_wcrtomb;
if (!loc->info) {
if ((info = malloc(sizeof(*info))) == NULL)
diff -Naur xmulti-2.00b4.org/locale/mb_ansi.c xmulti-2.00b4/locale/mb_ansi.c
--- xmulti-2.00b4.org/locale/mb_ansi.c Mon Dec 22 13:20:03 1997
+++ xmulti-2.00b4/locale/mb_ansi.c Tue Jul 13 19:55:50 1999
@@ -6,7 +6,7 @@
mbstate_t _wctomb_state;
int
-mblen(s,n)
+mblen1(s,n)
const char *s;
size_t n;
{
@@ -14,7 +14,7 @@
}
int
-mbtowc(pwc, s, n)
+mbtowc1(pwc, s, n)
wchar_t *pwc;
const char *s;
size_t n;
@@ -23,7 +23,7 @@
}
int
-wctomb(s, wchar)
+wctomb1(s, wchar)
char *s;
wchar_t wchar;
{
@@ -31,24 +31,24 @@
}
size_t
-mbstowcs(pwcs, s, n)
+mbstowcs1(pwcs, s, n)
wchar_t *pwcs;
const char *s;
size_t n;
{
mbstate_t state;
_mbrtowc_(NULL,NULL,0,&state);
- return mbsrtowcs(pwcs, s, n, &state);
+ return mbsrtowcs1(pwcs, s, n, &state);
}
size_t
-wcstombs(s, pwcs, n)
+wcstombs1(s, pwcs, n)
char *s;
const wchar_t *pwcs;
size_t n;
{
mbstate_t state;
_wcrtomb_(NULL,NULL,&state);
- return wcsrtombs(s, pwcs, n, &state);
+ return wcsrtombs1(s, pwcs, n, &state);
}
diff -Naur xmulti-2.00b4.org/locale/mb_iso.c xmulti-2.00b4/locale/mb_iso.c
--- xmulti-2.00b4.org/locale/mb_iso.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/mb_iso.c Tue Jul 13 20:30:31 1999
@@ -1,47 +1,47 @@
#include <mywchar.h>
#include <limits.h>
-#undef mbsinit
+#undef mbsinit1
int
-mbsinit(ps)
+mbsinit1(ps)
const mbstate_t *ps;
{
- return _mbsinit_(ps);
+ return _mbsinit1_(ps);
}
-#undef mbrlen
+#undef mbrlen1
size_t
-mbrlen(s, n, ps)
+mbrlen1(s, n, ps)
const char *s;
size_t n;
mbstate_t *ps;
{
- return _mbrtowc_(NULL, s, n, ps);
+ return _mbrtowc1_(NULL, s, n, ps);
}
-#undef mbrtowc
+#undef mbrtowc1
size_t
-mbrtowc(pwc, s, n, ps)
+mbrtowc1(pwc, s, n, ps)
wchar_t *pwc;
const char *s;
size_t n;
mbstate_t *ps;
{
- return _mbrtowc_(pwc, s, n, ps);
+ return _mbrtowc1_(pwc, s, n, ps);
}
-#undef wcrtomb
+#undef wcrtomb1
size_t
-wcrtomb(s, wc, ps)
+wcrtomb1(s, wc, ps)
char *s;
const wchar_t wc;
mbstate_t *ps;
{
- return _wcrtomb_(s, wc, ps);
+ return _wcrtomb1_(s, wc, ps);
}
size_t
-mbsrtowcs(pwcs, s, n, ps)
+mbsrtowcs1(pwcs, s, n, ps)
wchar_t *pwcs;
const char *s;
size_t n;
@@ -51,7 +51,7 @@
size_t i;
for (pwc = pwcs; 0 < n; ++pwc, --n) {
- i = _mbrtowc_(pwc, s, _mb_cur_max_, ps);
+ i = _mbrtowc1_(pwc, s, _mb_cur_max_, ps);
if (i < 0)
return -1;
else if (i == 0 || *pwc == 0)
@@ -62,7 +62,7 @@
}
size_t
-wcsrtombs(s, pwcs, n, ps)
+wcsrtombs1(s, pwcs, n, ps)
char *s;
const wchar_t *pwcs;
size_t n;
@@ -73,13 +73,13 @@
for (sc = s; 0 < n; n-=i, ++pwcs) {
if (_mb_cur_max_ <= n) {
- if ((i = _wcrtomb_(sc, *pwcs, ps)) <= 0)
+ if ((i = _wcrtomb1_(sc, *pwcs, ps)) <= 0)
return -1;
} else {
char buf[10];
- if ((i = _wcrtomb_(buf, *pwcs, ps)) <= 0)
+ if ((i = _wcrtomb1_(buf, *pwcs, ps)) <= 0)
return -1;
else if (i <= n)
memcpy(sc,buf,i);
diff -Naur xmulti-2.00b4.org/locale/mywchar.h xmulti-2.00b4/locale/mywchar.h
--- xmulti-2.00b4.org/locale/mywchar.h Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/mywchar.h Tue Jul 13 20:20:03 1999
@@ -53,42 +53,42 @@
* Functions defined in ISO C standard. (ISO/IEC 9899 AMENDMENT-1)
*/
__BEGIN_DECLS
-extern int mbsinit __P((const mbstate_t *));
-extern size_t mbrlen __P((const char *, size_t, mbstate_t *));
-extern size_t mbrtowc __P((wchar_t *, const char *, size_t, mbstate_t *));
-extern size_t wcrtomb __P((char *, const wchar_t, mbstate_t *));
+extern int mbsinit1 __P((const mbstate_t *));
+extern size_t mbrlen1 __P((const char *, size_t, mbstate_t *));
+extern size_t mbrtowc1 __P((wchar_t *, const char *, size_t, mbstate_t *));
+extern size_t wcrtomb1 __P((char *, const wchar_t, mbstate_t *));
-extern int (*_mbsinit_) __P((const mbstate_t *));
-extern size_t (*_mbrtowc_) __P((wchar_t *, const char *, size_t, mbstate_t *));
-extern size_t (*_wcrtomb_) __P((char *, wchar_t, mbstate_t *));
+extern int (*_mbsinit1_) __P((const mbstate_t *));
+extern size_t (*_mbrtowc1_) __P((wchar_t *, const char *, size_t, mbstate_t *));
+extern size_t (*_wcrtomb1_) __P((char *, wchar_t, mbstate_t *));
-extern size_t mbsrtowcs __P((wchar_t *, const char *, size_t, mbstate_t *));
-extern size_t wcsrtombs __P((char *, const wchar_t *, size_t, mbstate_t *));
+extern size_t mbsrtowcs1 __P((wchar_t *, const char *, size_t, mbstate_t *));
+extern size_t wcsrtombs1 __P((char *, const wchar_t *, size_t, mbstate_t *));
__END_DECLS
extern unsigned char _mb_cur_max_;
-#define mbsinit(ps) _mbsinit_(ps)
-#define mbrlen(s,n,ps) _mbrtowc_(NULL,s,n,ps)
-#define mbrtowc(pwc,s,n,ps) _mbrtowc_(pwc,s,n,ps)
-#define wcrtomb(s,wc,ps) _wcrtomb_(s,wc,ps)
+#define mbsinit1(ps) _mbsinit1_(ps)
+#define mbrlen1(s,n,ps) _mbrtowc1_(NULL,s,n,ps)
+#define mbrtowc1(pwc,s,n,ps) _mbrtowc1_(pwc,s,n,ps)
+#define wcrtomb1(s,wc,ps) _wcrtomb1_(s,wc,ps)
__BEGIN_DECLS
-wchar_t *wcscat __P((wchar_t *, const wchar_t *));
-wchar_t *wcschr __P((const wchar_t *, const wchar_t));
-int wcscmp __P((const wchar_t *, const wchar_t *));
-/*int wcscoll __P((const wchar_t *, const wchar_t *));*/
-wchar_t *wcscpy __P((wchar_t *, const wchar_t *));
-size_t wcscspn __P((const wchar_t *, const wchar_t *));
-size_t wcslen __P((const wchar_t *));
-wchar_t *wcsncat __P((wchar_t *, const wchar_t *, size_t));
-int wcsncmp __P((const wchar_t *, const wchar_t *, size_t));
-wchar_t *wcsncpy __P((wchar_t *, const wchar_t *, size_t));
-wchar_t *wcspbrk __P((const wchar_t *, const wchar_t *));
-wchar_t *wcsrchr __P((const wchar_t *, const wchar_t));
-size_t wcsspn __P((const wchar_t *, const wchar_t *));
-wchar_t *wcsstr __P((const wchar_t *, const wchar_t *));
-wchar_t *wcstok __P((wchar_t *, const wchar_t *));
+wchar_t *wcscat1 __P((wchar_t *, const wchar_t *));
+wchar_t *wcschr1 __P((const wchar_t *, const wchar_t));
+int wcscmp1 __P((const wchar_t *, const wchar_t *));
+/*int wcscoll1 __P((const wchar_t *, const wchar_t *));*/
+wchar_t *wcscpy1 __P((wchar_t *, const wchar_t *));
+size_t wcscspn1 __P((const wchar_t *, const wchar_t *));
+size_t wcslen1 __P((const wchar_t *));
+wchar_t *wcsncat1 __P((wchar_t *, const wchar_t *, size_t));
+int wcsncmp1 __P((const wchar_t *, const wchar_t *, size_t));
+wchar_t *wcsncpy1 __P((wchar_t *, const wchar_t *, size_t));
+wchar_t *wcspbrk1 __P((const wchar_t *, const wchar_t *));
+wchar_t *wcsrchr1 __P((const wchar_t *, const wchar_t));
+size_t wcsspn1 __P((const wchar_t *, const wchar_t *));
+wchar_t *wcsstr1 __P((const wchar_t *, const wchar_t *));
+wchar_t *wcstok1 __P((wchar_t *, const wchar_t *));
/*size_t wcsxfrm __P((wchar_t *, const wchar_t *, size_t));*/
__END_DECLS
diff -Naur xmulti-2.00b4.org/locale/setlocinfo.c xmulti-2.00b4/locale/setlocinfo.c
--- xmulti-2.00b4.org/locale/setlocinfo.c Mon Dec 22 13:20:03 1997
+++ xmulti-2.00b4/locale/setlocinfo.c Tue Jul 13 20:24:42 1999
@@ -18,9 +18,9 @@
void _SetLocaleInfo(_LocaleInfo *loc)
{
_mb_cur_max_ = loc->mbcurmax;
- _mbrtowc_ = loc->mbrtowc;
- _wcrtomb_ = loc->wcrtomb;
- _mbsinit_ = loc->mbsinit;
+ _mbrtowc1_ = loc->mbrtowc1;
+ _wcrtomb1_ = loc->wcrtomb1;
+ _mbsinit1_ = loc->mbsinit1;
#if 0
loc->stateinit(&_mblen_state);
loc->stateinit(&_mbtowc_state);
diff -Naur xmulti-2.00b4.org/locale/sjis.c xmulti-2.00b4/locale/sjis.c
--- xmulti-2.00b4.org/locale/sjis.c Mon Dec 22 13:20:03 1997
+++ xmulti-2.00b4/locale/sjis.c Tue Jul 13 20:24:59 1999
@@ -31,10 +31,10 @@
if (!strcasecmp(encoding, "Shift_JIS") ||
!strcasecmp(encoding, "MS_Kanji")) {
loc->mbcurmax = 2;
- loc->stateinit = _SJIS_stateinit;
- loc->mbsinit = _SJIS_mbsinit;
- loc->mbrtowc = _SJIS_mbrtowc;
- loc->wcrtomb = _SJIS_wcrtomb;
+ loc->stateinit1 = _SJIS_stateinit;
+ loc->mbsinit1 = _SJIS_mbsinit;
+ loc->mbrtowc1 = _SJIS_mbrtowc;
+ loc->wcrtomb1 = _SJIS_wcrtomb;
return 0;
} else
return -1;
diff -Naur xmulti-2.00b4.org/locale/text.c xmulti-2.00b4/locale/text.c
--- xmulti-2.00b4.org/locale/text.c Mon Dec 22 13:20:03 1997
+++ xmulti-2.00b4/locale/text.c Tue Jul 13 19:57:02 1999
@@ -14,8 +14,8 @@
mbstate_t state;
wchar_t *p = buf2;
- mbsrtowcs(NULL,NULL,0,&state);
- mbsrtowcs(buf2, buf, 1001, &state);
+ mbsrtowcs1(NULL,NULL,0,&state);
+ mbsrtowcs1(buf2, buf, 1001, &state);
while (*p != 0) {
fprintf(stderr,"[%08x]",*p);
diff -Naur xmulti-2.00b4.org/locale/utf7.c xmulti-2.00b4/locale/utf7.c
--- xmulti-2.00b4.org/locale/utf7.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/utf7.c Tue Jul 13 20:25:18 1999
@@ -27,10 +27,10 @@
{
if (!strcasecmp(encoding, "UNICODE-1-1-UTF-7")) {
loc->mbcurmax = ;
- loc->stateinit = _UTF7_stateinit;
- loc->mbsinit = _UTF7_mbsinit;
- loc->mbrtowc = _UTF7_mbrtowc;
- loc->wcrtomb = _UTF7_wcrtomb;
+ loc->stateinit1 = _UTF7_stateinit;
+ loc->mbsinit1 = _UTF7_mbsinit;
+ loc->mbrtowc1 = _UTF7_mbrtowc;
+ loc->wcrtomb1 = _UTF7_wcrtomb;
return 0;
} else
return -1;
diff -Naur xmulti-2.00b4.org/locale/utf8.c xmulti-2.00b4/locale/utf8.c
--- xmulti-2.00b4.org/locale/utf8.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/utf8.c Tue Jul 13 20:25:25 1999
@@ -27,10 +27,10 @@
{
if (!strcasecmp(encoding, "UTF-8")) {
loc->mbcurmax = 6;
- loc->stateinit = _UTF8_stateinit;
- loc->mbsinit = _UTF8_mbsinit;
- loc->mbrtowc = _UTF8_mbrtowc;
- loc->wcrtomb = _UTF8_wcrtomb;
+ loc->stateinit1 = _UTF8_stateinit;
+ loc->mbsinit1 = _UTF8_mbsinit;
+ loc->mbrtowc1 = _UTF8_mbrtowc;
+ loc->wcrtomb1 = _UTF8_wcrtomb;
return 0;
} else
return -1;
diff -Naur xmulti-2.00b4.org/locale/wcscat.c xmulti-2.00b4/locale/wcscat.c
--- xmulti-2.00b4.org/locale/wcscat.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcscat.c Tue Jul 13 19:57:37 1999
@@ -38,7 +38,7 @@
#include <mywchar.h>
wchar_t *
-wcscat(s, append)
+wcscat1(s, append)
register wchar_t *s;
register const wchar_t *append;
{
diff -Naur xmulti-2.00b4.org/locale/wcschr.c xmulti-2.00b4/locale/wcschr.c
--- xmulti-2.00b4.org/locale/wcschr.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcschr.c Tue Jul 13 19:57:44 1999
@@ -38,7 +38,7 @@
#include <mywchar.h>
wchar_t *
-wcschr(p, ch)
+wcschr1(p, ch)
register const wchar_t *p, ch;
{
for (;; ++p) {
diff -Naur xmulti-2.00b4.org/locale/wcscmp.c xmulti-2.00b4/locale/wcscmp.c
--- xmulti-2.00b4.org/locale/wcscmp.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcscmp.c Tue Jul 13 19:57:50 1999
@@ -44,7 +44,7 @@
* Compare strings.
*/
int
-wcscmp(s1, s2)
+wcscmp1(s1, s2)
register const wchar_t *s1, *s2;
{
while (*s1 == *s2++)
diff -Naur xmulti-2.00b4.org/locale/wcscpy.c xmulti-2.00b4/locale/wcscpy.c
--- xmulti-2.00b4.org/locale/wcscpy.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcscpy.c Tue Jul 13 19:57:55 1999
@@ -38,7 +38,7 @@
#include <mywchar.h>
wchar_t *
-wcscpy(to, from)
+wcscpy1(to, from)
register wchar_t *to;
register const wchar_t *from;
{
diff -Naur xmulti-2.00b4.org/locale/wcscspn.c xmulti-2.00b4/locale/wcscspn.c
--- xmulti-2.00b4.org/locale/wcscspn.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcscspn.c Tue Jul 13 19:58:03 1999
@@ -44,7 +44,7 @@
* Span the complement of string s2.
*/
size_t
-wstrcspn(s1, s2)
+wstrcspn1(s1, s2)
const wchar_t *s1;
register const wchar_t *s2;
{
diff -Naur xmulti-2.00b4.org/locale/wcslen.c xmulti-2.00b4/locale/wcslen.c
--- xmulti-2.00b4.org/locale/wcslen.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcslen.c Tue Jul 13 19:58:07 1999
@@ -38,7 +38,7 @@
#include <mywchar.h>
size_t
-wcslen(str)
+wcslen1(str)
const wchar_t *str;
{
register const wchar_t *s;
diff -Naur xmulti-2.00b4.org/locale/wcsncat.c xmulti-2.00b4/locale/wcsncat.c
--- xmulti-2.00b4.org/locale/wcsncat.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcsncat.c Tue Jul 13 19:58:15 1999
@@ -45,7 +45,7 @@
* are written at dst (at most n+1 bytes being appended). Return dst.
*/
wchar_t *
-wcsncat(dst, src, n)
+wcsncat1(dst, src, n)
wchar_t *dst;
const wchar_t *src;
register size_t n;
diff -Naur xmulti-2.00b4.org/locale/wcsncmp.c xmulti-2.00b4/locale/wcsncmp.c
--- xmulti-2.00b4.org/locale/wcsncmp.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcsncmp.c Tue Jul 13 19:50:43 1999
@@ -38,7 +38,7 @@
#include <mywchar.h>
int
-wcsncmp(s1, s2, n)
+wcsncmp1(s1, s2, n)
register const wchar_t *s1, *s2;
register size_t n;
{
diff -Naur xmulti-2.00b4.org/locale/wcsncpy.c xmulti-2.00b4/locale/wcsncpy.c
--- xmulti-2.00b4.org/locale/wcsncpy.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcsncpy.c Tue Jul 13 21:48:25 1999
@@ -45,7 +45,7 @@
* Return dst.
*/
char *
-strncpy(dst, src, n)
+strncpy1(dst, src, n)
char *dst;
const char *src;
register size_t n;
diff -Naur xmulti-2.00b4.org/locale/wcspbrk.c xmulti-2.00b4/locale/wcspbrk.c
--- xmulti-2.00b4.org/locale/wcspbrk.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcspbrk.c Mon Jul 12 19:17:16 1999
@@ -41,7 +41,7 @@
* Find the first occurrence in s1 of a character in s2 (excluding NUL).
*/
char *
-strpbrk(s1, s2)
+strpbrk1(s1, s2)
register const char *s1, *s2;
{
register const char *scanp;
diff -Naur xmulti-2.00b4.org/locale/wcsrchr.c xmulti-2.00b4/locale/wcsrchr.c
--- xmulti-2.00b4.org/locale/wcsrchr.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcsrchr.c Tue Jul 13 19:50:09 1999
@@ -38,7 +38,7 @@
#include <mywchar.h>
wchar_t *
-wcsrchr(p, ch)
+wcsrchr1(p, ch)
register const wchar_t *p, ch;
{
register wchar_t *save;
diff -Naur xmulti-2.00b4.org/locale/wcsspn.c xmulti-2.00b4/locale/wcsspn.c
--- xmulti-2.00b4.org/locale/wcsspn.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcsspn.c Tue Jul 13 19:49:58 1999
@@ -41,7 +41,7 @@
* Span the string s2 (skip characters that are in s2).
*/
size_t
-wcsspn(s1, s2)
+wcsspn1(s1, s2)
const wchar_t *s1;
register const wchar_t *s2;
{
diff -Naur xmulti-2.00b4.org/locale/wcsstr.c xmulti-2.00b4/locale/wcsstr.c
--- xmulti-2.00b4.org/locale/wcsstr.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcsstr.c Tue Jul 13 19:49:42 1999
@@ -44,20 +44,20 @@
* Find the first occurrence of find in s.
*/
wchar_t *
-wcsstr(s, find)
+wcsstr1(s, find)
register const wchar_t *s, *find;
{
register wchar_t c, sc;
register size_t len;
if ((c = *find++) != 0) {
- len = wcslen(find);
+ len = wcslen1(find);
do {
do {
if ((sc = *s++) == 0)
return (NULL);
} while (sc != c);
- } while (wcsncmp(s, find, len) != 0);
+ } while (wcsncmp1(s, find, len) != 0);
s--;
}
return ((wchar_t *)s);
diff -Naur xmulti-2.00b4.org/locale/wcstok.c xmulti-2.00b4/locale/wcstok.c
--- xmulti-2.00b4.org/locale/wcstok.c Mon Dec 22 13:20:04 1997
+++ xmulti-2.00b4/locale/wcstok.c Tue Jul 13 19:48:03 1999
@@ -38,7 +38,7 @@
#include <mywchar.h>
wchar_t *
-wcstok(s, delim)
+wcstok1(s, delim)
register wchar_t *s;
register const wchar_t *delim;
{
diff -Naur xmulti-2.00b4.org/locale/xlocale.h xmulti-2.00b4/locale/xlocale.h
--- xmulti-2.00b4.org/locale/xlocale.h Mon Dec 22 13:20:03 1997
+++ xmulti-2.00b4/locale/xlocale.h Tue Jul 13 20:23:43 1999
@@ -15,10 +15,10 @@
typedef struct _LocaleInfo {
u_char mbcurmax;
- void (*stateinit) __P((mbstate_t *));
- int (*mbsinit) __P((const mbstate_t *));
- size_t (*mbrtowc) __P((wchar_t *, const char *, size_t, mbstate_t *));
- size_t (*wcrtomb) __P((char *, wchar_t, mbstate_t *));
+ void (*stateinit1) __P((mbstate_t *));
+ int (*mbsinit1) __P((const mbstate_t *));
+ size_t (*mbrtowc1) __P((wchar_t *, const char *, size_t, mbstate_t *));
+ size_t (*wcrtomb1) __P((char *, wchar_t, mbstate_t *));
void *info;
} _LocaleInfo;
---------------------------------------------------- ここまで
--
後藤 正徳