Re: [PATCH] OLC 2.0.3 patch error: unexpected end of file

From: Thomas Arp (t_arp@stofanet.dk)
Date: 02/13/03


From: "Vladimir Romanov" <rovlad@IPBI.RU>
>   I've downloaded and installed Cygnus GNU-Win32, CircleMUD 3.1 and
>   Oasis OLC 2.0.3 patch.

More or less the same setup I'm using for developing.

>   After copying patch file, patch.exe and
>   cygwin.dll into circle-3.1 directory (containing
>   bin/cnf/doc/lib/log/src folders) and execing "patch.exe < olc.patch"
>   I get the following error:
>
>   D:\MUD\fr\circle-3.1>patch < olc.patch
>   Hmm...  Looks like a unified diff to me...

Indeed it is (the -Npru means "unified, show function line, recurse
directories and pretend non-existant files are empty"). My version
of patch doesn't have any problems with unified diffs, though.

>   The text leading up to this was:
>   --------------------------
>   |diff -Npru circle-3.1/src/GenOLC.html oasis2.0.3/src/GenOLC.html
>   |--- circle-3.1/src/GenOLC.html 1970-01-01 01:00:00.000000000 +0100
>   |+++ oasis2.0.3/src/GenOLC.html 2003-01-27 21:53:06.000000000 +0100
>   --------------------------
>   (Creating file GenOLC.html...)
>   Patching file GenOLC.html using Plan A...
>   patch: **** unexpected end of file in patch
>

I've been unable to reproduce the error. however, 'man patch' suggests
that you use the -u (or --unified) option, like this:

patch -u <olc.patch

Another, stranger, reason could be windows/linux trouble.
search google for dos2unix .

>   It also manages to create GenOLC.html file with no content (0KB
>   size).

Makes sense - after all, it's complaining about unexpected _end_ of
file.

>   Is there something I'm doing wrong? I'd really appreciate any
>   help, as to handpatching 542KB of Oasis OLC into the code is a bit
>   frustrating.
>
But would prove a good exercise :P  (jk)

Welcor

--
   +---------------------------------------------------------------+
   | FAQ: http://qsilver.queensu.ca/~fletchra/Circle/list-faq.html |
   | Archives: http://post.queensu.ca/listserv/wwwarch/circle.html |
   | Newbie List:  http://groups.yahoo.com/group/circle-newbies/   |
   +---------------------------------------------------------------+



This archive was generated by hypermail 2b30 : 06/26/03 PDT