From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Alexey Morozov To: Sisyphus Mailing list Cc: Sergey V Turchin Content-Type: multipart/mixed; boundary="=-c8QQbeyTJdDEpOCcP9jw" X-Mailer: Evolution/1.0.2 Date: 02 Apr 2002 17:50:36 +0700 Message-Id: <1017744636.2265.472.camel@sig.novosoft.ru> Mime-Version: 1.0 Subject: [sisyphus] =?koi8-r?Q?=F2=C1=DA=C2=CF=D2=CB=C9?= =?koi8-r?Q?_=D3?= menu Sender: sisyphus-admin@altlinux.ru Errors-To: sisyphus-admin@altlinux.ru X-BeenThere: sisyphus@altlinux.ru X-Mailman-Version: 2.0 Precedence: bulk Reply-To: sisyphus@altlinux.ru List-Help: List-Post: List-Subscribe: , List-Id: List-Unsubscribe: , List-Archive: Archived-At: List-Archive: --=-c8QQbeyTJdDEpOCcP9jw Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: base64 7tUsINEg1NXUINDPy8/QwczT0SDTIG1lbnUgKNXGLcYtxiwg1M8gzMkg0SDexcfPLdTPIM7FINDP zsnNwcAsINTPIMzJDQrQ0s/Fy9TJ0s/Xwc7JxSDXINDSz8XL1MUgwtnMzyDOycvBy8nNKSwgzsHC 0sXMIM7BINDSyd7JztUgzc/JyCDEwdfF287JyA0K1dbB08/XINMgImljb252IC4uLiBmYWlsZWQu Li4iLiDwwdTeINcgwdTUwd7Nxc7UxS4g88TBxdTT0SDNzsUsIMvUzy3Uzw0KzsXXzsnNwdTFzNjO zyDeydTBzCDEz8vJIM7BIGljb252IMnMySDRIM7FINDPztHMLCDe1M8gyM/UxczJINPLwdrB1Ngg KM7PDQrXIMnUz8fFLCDUzywg3tTPINPLwdrBzMkgLSDX08Ug0sHXzs8gz9vJws/ezs8uIOvByyDP zs8g18/Pwt3FDQrSwcLP1MHMzy3Uzz8pDQoNCg0K --=-c8QQbeyTJdDEpOCcP9jw Content-Disposition: attachment; filename=menu-2.1.5-iconv.patch Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; charset=KOI8-R diff -urN menu-2.1.5.orig/install-menu/install-menu.cc menu-2.1.5/install-m= enu/install-menu.cc --- menu-2.1.5.orig/install-menu/install-menu.cc Tue Apr 2 17:31:16 2002 +++ menu-2.1.5/install-menu/install-menu.cc Tue Apr 2 17:37:44 2002 @@ -810,8 +810,11 @@ size_t destlen =3D sizeof(buf) - 1; char *tmp =3D buf; =20 - if ( iconv(iconvcontext, (char**)&start, &srclen, &tmp, &destlen) < text= .length() ) - cerr << "iconv from " << from << " to " << to << " failed for: " << te= xt << endl; + if ( iconv(iconvcontext, (char**)&start, &srclen, &tmp, &destlen) =3D=3D= (size_t)-1 ) + cerr << "iconv from " << from << " to " << to=20 + << " failed for: " << text + << " (" << strerror(errno) << ')' + << endl; =20 iconv_close(iconvcontext); *tmp=3D'\0'; --=-c8QQbeyTJdDEpOCcP9jw--