| [617118d] | 1 | # DIY Linux Patch
|
|---|
| 2 | Date: 2005-03-29
|
|---|
| 3 | Author: Refer Description
|
|---|
| 4 | Origin: Refer Description
|
|---|
| 5 | Maker: Greg Schafer <gschafer@zip.com.au>
|
|---|
| 6 | Upstream Status: ftp changes submitted but not yet applied
|
|---|
| 7 | Description: Fix compilation with GCC4
|
|---|
| 8 |
|
|---|
| 9 | http://savannah.gnu.org/cgi-bin/viewcvs/inetutils/inetutils/libinetutils/ttymsg.c.diff?r1=1.14&r2=1.15&diff_format=u
|
|---|
| 10 | http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=300080
|
|---|
| 11 |
|
|---|
| 12 | diff -Naur inetutils-1.4.2.orig/ftp/cmdtab.c inetutils-1.4.2/ftp/cmdtab.c
|
|---|
| 13 | --- inetutils-1.4.2.orig/ftp/cmdtab.c 2000-07-06 04:21:07.000000000 +0000
|
|---|
| 14 | +++ inetutils-1.4.2/ftp/cmdtab.c 2005-03-29 03:38:37.000000000 +0000
|
|---|
| 15 | @@ -109,7 +109,7 @@
|
|---|
| 16 | char userhelp[] = "send new user information";
|
|---|
| 17 | char verbosehelp[] = "toggle verbose mode";
|
|---|
| 18 |
|
|---|
| 19 | -struct cmd cmdtab[] = {
|
|---|
| 20 | +struct cmd *cmdtab = {
|
|---|
| 21 | { "!", shellhelp, 0, 0, 0, shell },
|
|---|
| 22 | { "$", domachelp, 1, 0, 0, domacro },
|
|---|
| 23 | { "account", accounthelp, 0, 1, 1, account},
|
|---|
| 24 | diff -Naur inetutils-1.4.2.orig/ftp/extern.h inetutils-1.4.2/ftp/extern.h
|
|---|
| 25 | --- inetutils-1.4.2.orig/ftp/extern.h 2000-08-09 05:44:23.000000000 +0000
|
|---|
| 26 | +++ inetutils-1.4.2/ftp/extern.h 2005-03-29 03:38:50.000000000 +0000
|
|---|
| 27 | @@ -137,7 +137,7 @@
|
|---|
| 28 |
|
|---|
| 29 | extern jmp_buf abortprox;
|
|---|
| 30 | extern int abrtflag;
|
|---|
| 31 | -extern struct cmd cmdtab[];
|
|---|
| 32 | +extern struct cmd *cmdtab;
|
|---|
| 33 | extern FILE *cout;
|
|---|
| 34 | extern int data;
|
|---|
| 35 | extern char *home;
|
|---|
| 36 | diff -Naur inetutils-1.4.2.orig/libinetutils/ttymsg.c inetutils-1.4.2/libinetutils/ttymsg.c
|
|---|
| 37 | --- inetutils-1.4.2.orig/libinetutils/ttymsg.c 2001-11-01 15:52:19.000000000 +0000
|
|---|
| 38 | +++ inetutils-1.4.2/libinetutils/ttymsg.c 2005-03-29 03:39:21.000000000 +0000
|
|---|
| 39 | @@ -132,7 +132,7 @@
|
|---|
| 40 | }
|
|---|
| 41 | if (wret)
|
|---|
| 42 | {
|
|---|
| 43 | - (char *)iov->iov_base += wret;
|
|---|
| 44 | + iov->iov_base = (char *)iov->iov_base + wret;
|
|---|
| 45 | iov->iov_len -= wret;
|
|---|
| 46 | }
|
|---|
| 47 | continue;
|
|---|
