X-Authentication-Warning: delorie.com: mail set sender to djgpp-workers-bounces using -f Date: Thu, 20 Jan 2005 05:28:54 -0700 From: Brian Inglis Subject: Re: strtok_r() patch In-reply-to: To: djgpp-workers AT delorie DOT com Message-id: Organization: Systematic Software MIME-version: 1.0 X-Mailer: Forte Agent 1.93/32.576 English (American) Content-type: text/plain; charset=us-ascii References: <200501031642 DOT j03GgKJ9026830 AT speedy DOT ludd DOT ltu DOT se> Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by delorie.com id j0KCSvTX002293 Reply-To: djgpp-workers AT delorie DOT com Errors-To: nobody AT delorie DOT com X-Mailing-List: djgpp-workers AT delorie DOT com X-Unsubscribes-To: listserv AT delorie DOT com Precedence: bulk On Thu, 20 Jan 2005 05:13:28 -0700, Brian Inglis wrote: >On Mon, 03 Jan 2005 17:42:20 +0100 (CET), ams AT ludd DOT ltu DOT se wrote: > >>Hello. >> >>Here's my patch that adds strtok_r(). There will be some fuzz if somebody >>tries to apply it as I've had to remove some lines containing other changes. > >It looks like your first patch to strtok.c was applied/committed, >looking as I have edited it below, but the second was not, when I did >an update and make. >As a result, go32-v2 failed to link (calls strtok which now calls >strtok_r). >These two might be better as one atomic patch. > >>Index: djgpp/src/libc/ansi/string/strtok.c >>Index: djgpp/src/libc/posix/string/strtok_r.c Just noticed these are patches against two different files in different directories! Also noticed I don't have a src/libc/posix/string directory (why didn't cvs create this when I updated?) although I do have a src/libc/compat/string directory. And src/libc/makefile.sub lacks "make -C posix/string", which could be another part of the problem. -- Thanks. Take care, Brian Inglis