Bugzilla Bug 93703

While updating..

[ebuild     U ] net-misc/wget-1.9.1-r5 [1.9.1-r3] -build -debug -ipv6 -nls -socks5 +ssl -static

i686-pc-linux-gnu-gcc -I. -I.    -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wget/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -march=i686 -O2 -pipe -I/usr/include/openssl -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DLFS -c ftp-ls.c
ftp.c: In function `getftp':
ftp.c:923: parse error before `int'
ftp.c:925: `flush_res' undeclared (first use in this function)
ftp.c:925: (Each undeclared identifier is reported only once
ftp.c:925: for each function it appears in.)
make[1]: *** [ftp.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make[1]: Leaving directory `/var/tmp/portage/wget-1.9.1-r5/work/wget-1.9.1/src'
make: *** [src] Error 2

!!! ERROR: net-misc/wget-1.9.1-r5 failed.

----------------------------------------------------

The offendeding code comes from
mandrake/009_all_wget-large-file-support.patch and it's pretty clear why this is wrong.

+  if (*len > 2147483647 && (*len - restval) <= 0 )
+     {
+       logputs (LOG_VERBOSE, _("File has already been downloaded. Nothing to do.\n"));
+       /* Close data connection socket.  */
+       closeport (dtsock);
+      /* Close the local file.  */
+       int flush_res;
+       if (con->cmd & DO_LIST)
+           flush_res = fclose (fp);
+        else
+         flush_res = fflush (fp);
+       return RETRFINISHED;
+     }


Suggestion is to move the int flush_res right below the
+  if (*len > 2147483647 && (*len - restval) <= 0 ) 
+ {

----------------------------------------------------
Portage 2.0.51.19 (default-linux/x86/gcc2, gcc-2.95.3, glibc-2.2.5-r2,glibc-2.2.5-r9, 2.4.28-grsec-2.1.0 i686)
=================================================================
System uname: 2.4.28-grsec-2.1.0 i686 Pentium III (Coppermine)
Gentoo Base System version 1.4.16
Python:              dev-lang/python-2.3.4-r1 [2.3.4 (#1, Mar  7 2005, 13:37:45)]
distcc 2.16 i686-pc-linux-gnu (protocols 1 and 2) (default port 3632) [disabled]
dev-lang/python:     2.3.4-r1
sys-apps/sandbox:    [Not Present]
sys-devel/autoconf:  2.13, 2.59-r6
sys-devel/automake:  1.5, 1.8.5-r3, 1.7.9-r1, 1.6.3, 1.4_p6, 1.9.4
sys-devel/binutils:  2.15.92.0.2-r7
sys-devel/libtool:   1.5.2-r7, 1.4.3-r4
virtual/os-headers:  2.4.18, 2.4.22-r1, 2.4.19-r1
ACCEPT_KEYWORDS="x86"
AUTOCLEAN="yes"
CFLAGS="-march=i686 -O2 -pipe"
CHOST="i686-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3/share/config /usr/share/config /var/bind /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-march=i686 -O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs autoconfig buildpkg ccache distlocks fixpackages sandbox sfperms strict"
GENTOO_MIRRORS="http://mirror.datapipe.net/gentoo ftp://ftp.gtlib.cc.gatech.edu/pub/gentoo ftp://ftp.ussg.iu.edu/pub/linux/gentoo http://open-systems.ufl.edu/mirrors/gentoo http://mirror.tucdemonic.org/gentoo/ http://gentoo.osuosl.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
MAKEOPTS="-j3"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
SYNC="rsync://rsync.namerica.gentoo.org/gentoo-portage"
USE="x86 alsa apache2 apm asterisk berkdb bitmap-fonts crypt curl emboss encode extensions font-server foomaticdb fortran gd gdbm gif imagemagick imlib jpeg justify libg++ libwww mikmod mmx motif mp3 mpeg mysql nagios-dns nagios-ntp nagios-ping nagios-ssh ncurses nopri nozaptel offensive ogg oggvorbis pam pcap pdflib perl pic png prelude python readline slang snmp spell sse ssl tcpd tiff truetype truetype-fonts type1-fonts vorbis xml2 xv zlib userland_GNU kernel_linux elibc_glibc"
Unset:  ASFLAGS, CBUILD, CTARGET, LANG, LC_ALL, LDFLAGS, LINGUAS, PORTDIR_OVERLAY

The same thing happens later on in src/log.c

escnonprint_internal (const char *str, char escape, int base)
{
  static int ringpos;                   /* current ring position */

  assert (base == 8 || base == 16);

  int nprcnt = count_nonprint (str);

-----
Solution is the same. 

escnonprint_internal (const char *str, char escape, int base)
{
  static int ringpos;                   /* current ring position */
  int nprcnt;
  assert (base == 8 || base == 16);

  nprcnt = count_nonprint (str);

new patchset uploaded with these fixes in. sorry about the delay.