Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dialup/gcdial/files: gcdial-0.7b-getline.patch
Date: Sat, 20 Jun 2009 10:15:11
Message-Id: E1MHxbJ-00051X-JM@stork.gentoo.org
1 mrness 09/06/20 10:15:09
2
3 Added: gcdial-0.7b-getline.patch
4 Log:
5 Fix compilation error related to glibc-2.10 (#272268).
6 Add ~amd64 keyword. Migrate to EAPI 2.
7 (Portage version: 2.1.6.13/cvs/Linux x86_64, RepoMan options: --force)
8
9 Revision Changes Path
10 1.1 net-dialup/gcdial/files/gcdial-0.7b-getline.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/gcdial/files/gcdial-0.7b-getline.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/gcdial/files/gcdial-0.7b-getline.patch?rev=1.1&content-type=text/plain
14
15 Index: gcdial-0.7b-getline.patch
16 ===================================================================
17 diff -Nru gcdial-0.7b.orig/src/rcfile.c gcdial-0.7b/src/rcfile.c
18 --- gcdial-0.7b.orig/src/rcfile.c 2000-04-16 12:44:22.000000000 +0200
19 +++ gcdial-0.7b/src/rcfile.c 2009-06-20 11:55:50.000000000 +0200
20 @@ -19,7 +19,7 @@
21
22 static int get_settings(FILE *fp, char **server, char **port, char **username,
23 char **password);
24 -static int getline(FILE *fp, char **argument);
25 +static int my_getline(FILE *fp, char **argument);
26 static int getline_keyword(const char *buf);
27 static int check_rcfile_perms(void);
28
29 @@ -99,7 +99,7 @@
30 int line = 0;
31 int error = 0;
32
33 - if (RC_FATAL==(ret = getline(fp, &arg)))
34 + if (RC_FATAL==(ret = my_getline(fp, &arg)))
35 return -1;
36 while (ret!=RC_EOF) {
37 ++line;
38 @@ -147,7 +147,7 @@
39 break;
40 } /* switch(ret) */
41 } /* arg !NULL */
42 - if (RC_FATAL==(ret = getline(fp, &arg)))
43 + if (RC_FATAL==(ret = my_getline(fp, &arg)))
44 return -1;
45 } /* while(ret!=RC_EOF) */
46 if (error)
47 @@ -155,7 +155,7 @@
48 return 0;
49 }
50
51 -int getline(FILE *fp, char **argument)
52 +int my_getline(FILE *fp, char **argument)
53 {
54 char *buf;
55 int com_len;