1 <!DOCTYPE HTML PUBLIC
"-//W3C//DTD HTML 3.2//EN">
4 <TITLE> [IRCServices]
5.1 InspIRCd protocol
6 <LINK REL=
"Index" HREF=
"index.html" >
7 <LINK REL=
"made" HREF=
"mailto:ircservices%40ircservices.za.net?Subject=%5BIRCServices%5D%205.1%20InspIRCd%20protocol&In-Reply-To=46e5e9ee.55553%40msgid.achurch.org">
8 <META NAME=
"robots" CONTENT=
"index,nofollow">
9 <META http-equiv=
"Content-Type" content=
"text/html; charset=us-ascii">
10 <LINK REL=
"Previous" HREF=
"005393.html">
11 <LINK REL=
"Next" HREF=
"005395.html">
13 <BODY BGCOLOR=
"#ffffff">
14 <H1>[IRCServices]
5.1 InspIRCd protocol
</H1>
16 <A HREF=
"mailto:ircservices%40ircservices.za.net?Subject=%5BIRCServices%5D%205.1%20InspIRCd%20protocol&In-Reply-To=46e5e9ee.55553%40msgid.achurch.org"
17 TITLE=
"[IRCServices] 5.1 InspIRCd protocol">caseyclaydon at fastmail.com.au
19 <I>Mon Sep
10 18:
28:
36 PDT
2007</I>
21 <LI>Previous message:
<A HREF=
"005393.html">[IRCServices]
5.1 InspIRCd protocol
23 <LI>Next message:
<A HREF=
"005395.html">[IRCServices]
5.1 InspIRCd protocol
25 <LI> <B>Messages sorted by:
</B>
26 <a href=
"date.html#5394">[ date ]
</a>
27 <a href=
"thread.html#5394">[ thread ]
</a>
28 <a href=
"subject.html#5394">[ subject ]
</a>
29 <a href=
"author.html#5394">[ author ]
</a>
34 <PRE>getting patch unexpectedly ends in middle of line
37 [
<A HREF=
"http://lists.ircservices.za.net/mailman/listinfo/ircservices">root at Vigor10
</A> ircservices-
5.1pre6]# patch -p0
<inspircd-patch.txt
38 patching file modules/protocol/inspircd.c
39 patch unexpectedly ends in middle of line
40 Hunk #
2 succeeded at
1038 with fuzz
1.
41 [
<A HREF=
"http://lists.ircservices.za.net/mailman/listinfo/ircservices">root at Vigor10
</A> ircservices-
5.1pre6]# patch -p0
<messages-patch.txt
42 patching file messages.c
43 patch unexpectedly ends in middle of line
44 Hunk #
1 succeeded at
75 with fuzz
1.
45 [
<A HREF=
"http://lists.ircservices.za.net/mailman/listinfo/ircservices">root at Vigor10
</A> ircservices-
5.1pre6]#
50 ><i> Sorry--that should have been
"patch -p0
", not
"patch -p
".
52 </I>><i> --Andrew Church
53 </I>><i> <A HREF=
"http://lists.ircservices.za.net/mailman/listinfo/ircservices">achurch at achurch.org
</A>
54 </I>><i> <A HREF=
"http://achurch.org/">http://achurch.org/
</A>
57 </I>>><i> the patch command is not working for me
59 </I>>><i> I made a text file and called it inspircd-patch.txt and
60 </I>>><i> messages-patch.txt, and copied the patch txt files to the
61 </I>>><i> ircservices-
5.1pre6 directory
63 </I>>><i> I did patch -p
<inspircd/messages-patch.txt
65 </I>>><i> [
<A HREF=
"http://lists.ircservices.za.net/mailman/listinfo/ircservices">casey at Vigor10
</A> ircservices-
5.1pre6]$ patch -p
<inspircd-patch.txt
66 </I>>><i> patch: option requires an argument -- p
67 </I>>><i> patch: Try `patch --help' for more information.
68 </I>>><i> [
<A HREF=
"http://lists.ircservices.za.net/mailman/listinfo/ircservices">casey at Vigor10
</A> ircservices-
5.1pre6]$
72 </I>>><i> I have this in the patch txt files
76 </I>>><i> Index: modules/protocol/inspircd.c
77 </I>>><i> ===================================================================
78 </I>>><i> RCS file: /var/local/cvsroot/ircservices/modules/protocol/inspircd.c,v
79 </I>>><i> retrieving revision
2.9
80 </I>>><i> diff -u -r2.9 inspircd.c
81 </I>>><i> --- modules/protocol/inspircd.c
3 Sep
2007 11:
26:
34 -
0000 2.9
82 </I>>><i> +++ modules/protocol/inspircd.c
10 Sep
2007 12:
48:
07 -
0000
83 </I>>><i> @@ -
332,
8 +
332,
16 @@
84 </I>>><i> User *u = get_user(av[
2]);
85 </I>>><i> if (c
&& u)
86 </I>>><i> clear_channel(c, CLEAR_BANS, u);
87 </I>>><i> - } else {
88 </I>>><i> - do_cmode(source, ac, av);
89 </I>>><i> + } else if (ac
>=
3) {
90 </I>>><i> + char modestr[BUFSIZE];
91 </I>>><i> + av[
1] = av[
0]; /* Remove the timestamp parameter */
92 </I>>><i> + if (av[
2][
0] != '+'
&& av[
2][
0] != '-') {
93 </I>>><i> + /* InspIRCd seems to omit the leading '+' when sending
94 </I>>><i> + * initial modes for the channel */
95 </I>>><i> + snprintf(modestr, sizeof(modestr),
"+%s
", av[
2]);
96 </I>>><i> + av[
2] = modestr;
98 </I>>><i> + do_cmode(source, ac-
1, av+
1);
100 </I>>><i> } else {
101 </I>>><i> if (ac
< 2)
102 </I>>><i> @@ -
1030,
7 +
1038,
7 @@
104 </I>>><i> protocol_name =
"InspIRCd
";
105 </I>>><i> protocol_version =
"1.1+
";
106 </I>>><i> - protocol_features = PF_SZLINE | PF_SVSJOIN | PF_MODETS_FIRST;
107 </I>>><i> + protocol_features = PF_SZLINE | PF_SVSJOIN;
108 </I>>><i> protocol_nickmax =
30;
110 </I>>><i> if (!register_messages(inspircd_messages)) {
118 </I>>><i> Index: messages.c
119 </I>>><i> ===================================================================
120 </I>>><i> RCS file: /var/local/cvsroot/ircservices/messages.c,v
121 </I>>><i> retrieving revision
2.46
122 </I>>><i> diff -u -r2.46 messages.c
123 </I>>><i> --- messages.c
23 Aug
2007 04:
45:
42 -
0000 2.46
124 </I>>><i> +++ messages.c
10 Sep
2007 14:
09:
47 -
0000
125 </I>>><i> @@ -
75,
7 +
75,
7 @@
126 </I>>><i> if (!*source) {
127 </I>>><i> log(
"Source missing from JOIN message
");
128 </I>>><i> return;
129 </I>>><i> - } else if (ac !=
1) {
130 </I>>><i> + } else if (ac
< 1) {
131 </I>>><i> return;
133 </I>>><i> do_join(source, ac, av);
141 </I>>><i> Andrew Church wrote:
143 </I>>>>><i> where in inspircd.c do I put in the patch
144 </I>>>>><i>
145 </I>>>>><i>
146 </I>>>><i> Use the
"patch
" command to apply it. Save the message to a file (for
147 </I>>>><i> example
"file.txt
"), then go to the top Services source directory and
148 </I>>>><i> enter the command
"patch -p
<file.txt
" (make sure you give the proper
149 </I>>>><i> path to the file).
151 </I>>>><i> --Andrew Church
152 </I>>>><i> <A HREF=
"http://lists.ircservices.za.net/mailman/listinfo/ircservices">achurch at achurch.org
</A>
153 </I>>>><i> <A HREF=
"http://achurch.org/">http://achurch.org/
</A>
154 </I>>>><i> ------------------------------------------------------------------
155 </I>>>><i> To unsubscribe or change your subscription options, visit:
156 </I>>>><i> <A HREF=
"http://lists.ircservices.za.net/mailman/listinfo/ircservices">http://lists.ircservices.za.net/mailman/listinfo/ircservices
</A>
159 </I>>><i> ------------------------------------------------------------------
160 </I>>><i> To unsubscribe or change your subscription options, visit:
161 </I>>><i> <A HREF=
"http://lists.ircservices.za.net/mailman/listinfo/ircservices">http://lists.ircservices.za.net/mailman/listinfo/ircservices
</A>
163 </I>><i> ------------------------------------------------------------------
164 </I>><i> To unsubscribe or change your subscription options, visit:
165 </I>><i> <A HREF=
"http://lists.ircservices.za.net/mailman/listinfo/ircservices">http://lists.ircservices.za.net/mailman/listinfo/ircservices
</A>
174 <LI>Previous message:
<A HREF=
"005393.html">[IRCServices]
5.1 InspIRCd protocol
176 <LI>Next message:
<A HREF=
"005395.html">[IRCServices]
5.1 InspIRCd protocol
178 <LI> <B>Messages sorted by:
</B>
179 <a href=
"date.html#5394">[ date ]
</a>
180 <a href=
"thread.html#5394">[ thread ]
</a>
181 <a href=
"subject.html#5394">[ subject ]
</a>
182 <a href=
"author.html#5394">[ author ]
</a>
projects / irc.git / blob