|
From: | Franz Trierweiler |
Subject: | [Ltib] mux_server.c / mux_server-1.0-fs-decl.patch / reject file |
Date: | Sun, 18 Oct 2009 06:03:17 +0200 |
User-agent: | Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.4pre) Gecko/20091014 Fedora/3.0-2.8.b4.fc11 Thunderbird/3.0b4 |
Good morning, I resend since this message does not seem to have been properly displayed in the latest LTIB digest. LTIB patches mux_server.c with mux_server-1.0-fs-decl.patch. On my machine, patch command creates a rej file: *************** *** 648,659 **** struct sockaddr_in sockaddr; struct iochan *c; int num_bind_retries = 0; int rc; if (verbose) printf("tcp_listen_channel %d %d\n",port,stream_id); - int fd = socket(PF_INET, SOCK_STREAM, 0); if (fd < 0) { fatal("socket() failed for stream %d", stream_id); } --- 648,660 ---- struct sockaddr_in sockaddr; struct iochan *c; int num_bind_retries = 0; + int fd; int rc; if (verbose) printf("tcp_listen_channel %d %d\n",port,stream_id); + fd = socket(PF_INET, SOCK_STREAM, 0); if (fd < 0) { fatal("socket() failed for stream %d", stream_id); } I read man pages on "diff" and "patch" so that I can understand now the underlying concepts of patch mechanisms. I understand what this patch file wants to modifiy but I do not understand what the rej file means. Where is the error? For safety, I browsed http://www.zee2.com/gpp/ in order to make sure there is not another release. Indeed, I do work with the same patch version as the one on http://www.zee2.com/gpp/. Thanks for your help. Franz |
[Prev in Thread] | Current Thread | [Next in Thread] |