This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.14-273-gf3cdd46


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  f3cdd4674892740f766ea0b5ab5e734e4a028cb0 (commit)
       via  633e9e0fc2aef7d6882b1e699174120117bd66ea (commit)
      from  74718d13e4638ccc5922c2197b9088ff5fc00251 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f3cdd4674892740f766ea0b5ab5e734e4a028cb0

commit f3cdd4674892740f766ea0b5ab5e734e4a028cb0
Author: Denis Zaitceff <zaitceff@gmail.com>
Date:   Fri Sep 9 12:45:03 2011 -0400

    string/strncat.c: fix compilation for some architectures

diff --git a/ChangeLog b/ChangeLog
index a41461d..007b61c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-29  Denis Zaitceff  <zaitceff@gmail.com>
+
+	* string/strncat.c (strncat): Undef the symbol in case it has been
+	defined in bits/string.h.
+
 2011-09-09  Ulrich Drepper  <drepper@gmail.com>
 
 	* elf/sotruss.ksh: Clean up, fix, and complete help messages.
diff --git a/string/strncat.c b/string/strncat.c
index 0a3d4af..bf6f99b 100644
--- a/string/strncat.c
+++ b/string/strncat.c
@@ -25,6 +25,7 @@ typedef char reg_char;
 #endif
 
 #ifndef STRNCAT
+# undef strncat
 # define STRNCAT  strncat
 #endif
 

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=633e9e0fc2aef7d6882b1e699174120117bd66ea

commit 633e9e0fc2aef7d6882b1e699174120117bd66ea
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Fri Sep 9 12:31:43 2011 -0400

    Fix sotruss help messages

diff --git a/ChangeLog b/ChangeLog
index 0dcadb4..a41461d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-09-09  Ulrich Drepper  <drepper@gmail.com>
 
+	* elf/sotruss.ksh: Clean up, fix, and complete help messages.
+
 	* elf/dl-iteratephdr.c (hidden_proto): Fill in data from the real
 	link map.
 
diff --git a/elf/sotruss.ksh b/elf/sotruss.ksh
index 6bbdc89..e738115 100755
--- a/elf/sotruss.ksh
+++ b/elf/sotruss.ksh
@@ -31,22 +31,23 @@ lib='@PREFIX@/$LIB/audit/sotruss-lib.so'
 
 function do_help {
   echo $"Usage: sotruss [OPTION...] [--] EXECUTABLE [EXECUTABLE-OPTION...]
-  -F, --from FROMLIST     trace calls from objects on FORMLIST
-  -T, --to TOLIST         trace calls to objects on TOLIST
+  -F, --from FROMLIST     Trace calls from objects on FROMLIST
+  -T, --to TOLIST         Trace calls to objects on TOLIST
 
-  -e, --exit              also show exits from the function calls
-  -f, --follow            trace child processes
-  -o, --output FILENAME   write output to FILENAME (or FILENAME.$PID in case
+  -e, --exit              Also show exits from the function calls
+  -f, --follow            Trace child processes
+  -o, --output FILENAME   Write output to FILENAME (or FILENAME.$PID in case
 			  -f is also used) instead of standard error
 
-      --help              print this help and exit
-      --version           print version information and exit"
+  -?, --help              Give this help list
+      --usage             Give a short usage message
+      --version           Print program version"
 
   echo
   printf $"Mandatory arguments to long options are also mandatory for any corresponding\nshort options.\n"
   echo
 
-  echo $"For bug reporting instructions, please see:
+  printf $"For bug reporting instructions, please see:
 <http://www.gnu.org/software/libc/bugs.html>.
 "
   exit 0
@@ -80,12 +81,14 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     printf $"Written by %s.\n" "Ulrich Drepper"
     exit 0
     ;;
-  --h | --he | --hel | --help)
+  -\? | --h | --he | --hel | --help)
     do_help
     ;;
   --u | --us | --usa | --usag | --usage)
     printf $"Usage: %s [-ef] [-F FROMLIST] [-o FILENAME] [-T TOLIST] [--exit]
-	    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\n" sotruss
+	    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]
+	    [--help] [--usage] [--version] [--]
+	    EXECUTABLE [EXECUTABLE-OPTION...]\n" sotruss
     exit 0
     ;;
   -F | --fr | --fro | --from)

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

Summary of changes:
 ChangeLog        |    7 +++++++
 elf/sotruss.ksh  |   23 +++++++++++++----------
 string/strncat.c |    1 +
 3 files changed, 21 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]