| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192 |
- diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc/types.h eglibc-2.11.1/libc/sunrpc/rpc/types.h
- --- eglibc-2.11.1.orig/libc/sunrpc/rpc/types.h 2010-02-24 08:09:59.000000000 +0100
- +++ eglibc-2.11.1/libc/sunrpc/rpc/types.h 2010-03-22 18:30:14.944408497 +0100
- @@ -68,6 +68,7 @@
- #include <sys/types.h>
- #endif
-
- +#if !defined(_CROSS_RPCGEN_)
- #ifndef __u_char_defined
- typedef __u_char u_char;
- typedef __u_short u_short;
- @@ -83,6 +84,7 @@
- typedef __caddr_t caddr_t;
- # define __daddr_t_defined
- #endif
- +#endif
-
- #include <sys/time.h>
- #include <sys/param.h>
- diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_clntout.c eglibc-2.11.1/libc/sunrpc/rpc_clntout.c
- --- eglibc-2.11.1.orig/libc/sunrpc/rpc_clntout.c 2010-02-24 08:10:01.000000000 +0100
- +++ eglibc-2.11.1/libc/sunrpc/rpc_clntout.c 2010-03-22 18:30:38.973160151 +0100
- @@ -31,7 +31,7 @@
- */
- #include <stdio.h>
- #include <string.h>
- -#include <rpc/types.h>
- +#include "rpc/types.h"
- #include "rpc_parse.h"
- #include "rpc_util.h"
- #include "proto.h"
- diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_scan.c eglibc-2.11.1/libc/sunrpc/rpc_scan.c
- --- eglibc-2.11.1.orig/libc/sunrpc/rpc_scan.c 2010-02-24 08:10:00.000000000 +0100
- +++ eglibc-2.11.1/libc/sunrpc/rpc_scan.c 2010-03-22 18:31:16.146907097 +0100
- @@ -36,7 +36,11 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <string.h>
- +#ifdef _CROSS_RPCGEN_
- +#define gettext(X) (X)
- +#else
- #include <libintl.h>
- +#endif
- #include "rpc_scan.h"
- #include "rpc_parse.h"
- #include "rpc_util.h"
- diff -Nur eglibc-2.11.1.orig/libc/timezone/Makefile eglibc-2.11.1/libc/timezone/Makefile
- --- eglibc-2.11.1.orig/libc/timezone/Makefile 2010-02-24 08:09:02.000000000 +0100
- +++ eglibc-2.11.1/libc/timezone/Makefile 2010-03-22 18:50:04.134408513 +0100
- @@ -181,8 +182,9 @@
- $(objpfx)zic: $(addprefix $(objpfx), $(zic-objs))
-
- $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c
- - gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \
- - -DCROSS_ZIC $(compile-mkdep-flags)
- + gcc $< -c $(OUTPUT_OPTION) \
- + $(filter-out -DHAVE_GETTEXT,$(CFLAGS-$*.c)) \
- + $(CPPFLAGS-$*) -DCROSS_ZIC $(compile-mkdep-flags)
-
- $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs))
- gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@
- diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c eglibc-2.11.1/libc/sunrpc/rpc_main.c
- --- eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c 2010-02-24 08:10:00.000000000 +0100
- +++ eglibc-2.11.1/libc/sunrpc/rpc_main.c 2010-06-20 13:32:42.000000000 +0200
- @@ -37,7 +37,11 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
- +#ifdef _CROSS_RPCGEN_
- +#define gettext(X) (X)
- +#else
- #include <libintl.h>
- +#endif
- #include <ctype.h>
- #include <sys/types.h>
- #include <sys/param.h>
- @@ -996,10 +1000,12 @@
- abort ();
- temp = rindex (cmd->infile, '.');
- cp = stpcpy (mkfilename, "Makefile.");
- - if (temp != NULL)
- - *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0';
- - else
- + if (temp != NULL) {
- + strncpy (cp, cmd->infile, temp - cmd->infile);
- + cp[temp - cmd->infile - 1] = '\0';
- + } else {
- stpcpy (cp, cmd->infile);
- + }
-
- }
- else
|
