Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-client/nail/files: nail-12.4-debian.patch
Date: Tue, 02 Feb 2010 18:14:24
Message-Id: E1NcNGW-0007o9-VM@stork.gentoo.org
1 jer 10/02/02 18:14:20
2
3 Added: nail-12.4-debian.patch
4 Log:
5 Apply Debian patches. Declare _GNU_SOURCE.
6 (Portage version: 2.2_rc62/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 mail-client/nail/files/nail-12.4-debian.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/nail/files/nail-12.4-debian.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/nail/files/nail-12.4-debian.patch?rev=1.1&content-type=text/plain
13
14 Index: nail-12.4-debian.patch
15 ===================================================================
16 --- heirloom-mailx-12.4.orig/getopt.c
17 +++ heirloom-mailx-12.4/getopt.c
18 @@ -43,7 +43,7 @@
19 char *optarg;
20 int optind = 1;
21 int opterr = 1;
22 -int optopt;
23 +int optoptc;
24
25 static void
26 error(const char *s, int c)
27 @@ -69,7 +69,7 @@
28 *bp++ = *s++;
29 while (*msg)
30 *bp++ = *msg++;
31 - *bp++ = optopt;
32 + *bp++ = optoptc;
33 *bp++ = '\n';
34 write(2, buf, bp - buf);
35 ac_free(buf);
36 @@ -101,13 +101,13 @@
37 }
38 curp = &argv[optind][1];
39 }
40 - optopt = curp[0] & 0377;
41 + optoptc = curp[0] & 0377;
42 while (optstring[0]) {
43 if (optstring[0] == ':') {
44 optstring++;
45 continue;
46 }
47 - if ((optstring[0] & 0377) == optopt) {
48 + if ((optstring[0] & 0377) == optoptc) {
49 if (optstring[1] == ':') {
50 if (curp[1] != '\0') {
51 optarg = (char *)&curp[1];
52 @@ -127,7 +127,7 @@
53 optind++;
54 optarg = 0;
55 }
56 - return optopt;
57 + return optoptc;
58 }
59 optstring++;
60 }
61 --- heirloom-mailx-12.4.orig/mailx.1
62 +++ heirloom-mailx-12.4/mailx.1
63 @@ -3766,7 +3766,7 @@
64 .sp
65 .fi
66 which might cause
67 -.N mailx
68 +.B mailx
69 to respond with, for example:
70 .nf
71 .sp