diff options
| author | Peter Jones <pjones@redhat.com> | 2006-05-05 21:57:38 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2006-05-05 21:57:38 +0000 |
| commit | d7a509a9df118972bac03248c4e87f6398133b28 (patch) | |
| tree | 6f0f1f978cc2f233c72663ce5a38b4f2a8c34125 | |
| parent | 9c8fdb98cc0cfedfcb0a2d784788b5f74606713d (diff) | |
| download | anaconda-d7a509a9df118972bac03248c4e87f6398133b28.tar.gz anaconda-d7a509a9df118972bac03248c4e87f6398133b28.tar.xz anaconda-d7a509a9df118972bac03248c4e87f6398133b28.zip | |
- loader2/Makefile: Put -Os back in, as the image is too large to build
CDs without it (#190835).
- loader2/ftp.c (httpGetFileDesc): use alloca for headers instead of a static
buffer (#188089).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | loader2/Makefile | 2 | ||||
| -rw-r--r-- | loader2/ftp.c | 5 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2006-05-05 Peter Jones <pjones@redhat.com> + + * loader2/Makefile: Put -Os back in, as the image is too large + to build CDs without it (#190835). + * loader2/ftp.c (httpGetFileDesc): use alloca for headers instead + of a static buffer (#188089). + 2006-05-01 Peter Jones <pjones@redhat.com> * loader2/method.c: allow vfat driver disks (#186400, patch from diff --git a/loader2/Makefile b/loader2/Makefile index 1d8bd56a1..c4b1473f6 100644 --- a/loader2/Makefile +++ b/loader2/Makefile @@ -31,7 +31,7 @@ SOURCES = $(subst .o,.c,$(OBJS)) loader.c HWLIBS = -lkudzu_loader -lpci DEBUG = -ggdb -COPTS = $(DEBUG) -Wall -DUSE_LOGDEV -DVERSION='"$(VERSION)"' -Werror +COPTS = $(DEBUG) -Os -Wall -DUSE_LOGDEV -DVERSION='"$(VERSION)"' -Werror CFLAGS = $(COPTS) -ffunction-sections -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DHAVE_LIBIO_H STATIC = -static REALCC=gcc diff --git a/loader2/ftp.c b/loader2/ftp.c index 0f0fa6d51..35f2312f7 100644 --- a/loader2/ftp.c +++ b/loader2/ftp.c @@ -425,8 +425,8 @@ const char *ftpStrerror(int errorNumber) { int httpGetFileDesc(char * hostname, int port, char * remotename, char *extraHeaders) { char * buf; struct timeval timeout; - char headers[4096]; - char * nextChar = headers; + char *headers; + char *nextChar; char *hstr; int checkedCode; struct in_addr serverAddress; @@ -467,6 +467,7 @@ int httpGetFileDesc(char * hostname, int port, char * remotename, char *extraHea 1) Get our first \r\n; which lets us check the return code 2) Get a \r\n\r\n, which means we're done */ + nextChar = headers = alloca(4096); *nextChar = '\0'; checkedCode = 0; while (!strstr(headers, "\r\n\r\n")) { |