[Armadeus-commitlog] SF.net SVN: armadeus: [708] trunk/buildroot/toolchain/uClibc/uClibc-0.9. 29-fix_progname.patch

[<jo...@us...>]

Revision: 708
          http://armadeus.svn.sourceforge.net/armadeus/?rev=708&view=rev
Author:   jorasse
Date:     2007-11-24 07:32:03 -0800 (Sat, 24 Nov 2007)

Log Message:
-----------
[uClibc] fixed __progname initialisation issue.

Added Paths:
-----------
    trunk/buildroot/toolchain/uClibc/uClibc-0.9.29-fix_progname.patch

Added: trunk/buildroot/toolchain/uClibc/uClibc-0.9.29-fix_progname.patch
===================================================================
--- trunk/buildroot/toolchain/uClibc/uClibc-0.9.29-fix_progname.patch	                        (rev 0)
+++ trunk/buildroot/toolchain/uClibc/uClibc-0.9.29-fix_progname.patch	2007-11-24 15:32:03 UTC (rev 708)
@@ -0,0 +1,51 @@
+--- uClibc/libc/misc/internals/__uClibc_main.c	2007/06/01 19:17:36	18722
++++ uClibc/libc/misc/internals/__uClibc_main.c	2007/11/24 17:00:59	00000
+@@ -104,14 +104,18 @@
+ # endif
+ #endif
+ 
+-attribute_hidden const char *__uclibc_progname = NULL;
+-#ifdef __UCLIBC_HAS___PROGNAME__
+-strong_alias (__uclibc_progname, __progname)
+-#endif
++attribute_hidden const char *__uclibc_progname = "";
+ #ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
+-attribute_hidden const char *__progname_full = NULL;
+-strong_alias (__uclibc_progname, program_invocation_short_name)
+-strong_alias (__progname_full, program_invocation_name)
++const char *program_invocation_short_name = "";
++const char *program_invocation_name = "";
++#ifdef __UCLIBC_HAS___PROGNAME__
++weak_alias (program_invocation_short_name, __progname)
++weak_alias (program_invocation_name, __progname_full)
++#endif
++#else
++#ifdef __UCLIBC_HAS___PROGNAME__
++weak_alias (__uclibc_progname, __progname)
++#endif
+ #endif
+ 
+ /*
+@@ -337,15 +337,14 @@
+     }
+ #endif
+ 
++    __uclibc_progname = *argv;
+ #ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
+-    __progname_full = *argv;
+-    __progname = strrchr(*argv, '/');
+-    if (__progname != NULL)
+-	++__progname;
++    program_invocation_name = *argv;
++    program_invocation_short_name = strrchr(*argv, '/');
++    if (program_invocation_short_name != NULL)
++	++program_invocation_short_name;
+     else
+-	__progname = __progname_full;
+-#else
+-    __uclibc_progname = *argv;
++	program_invocation_short_name = program_invocation_name;
+ #endif
+ 
+ #ifdef __UCLIBC_CTOR_DTOR__
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.