From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-84507-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 18325 invoked by alias); 18 Oct 2011 20:51:33 -0000
Received: (qmail 18316 invoked by uid 22791); 18 Oct 2011 20:51:32 -0000
X-SWARE-Spam-Status: No, hits=-6.8 required=5.0	tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS,TW_CP
X-Spam-Check-By: sourceware.org
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 18 Oct 2011 20:51:13 +0000
Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9IKpCwK015043	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)	for <gdb-patches@sourceware.org>; Tue, 18 Oct 2011 16:51:12 -0400
Received: from host1.jankratochvil.net (ovpn-116-16.ams2.redhat.com [10.36.116.16])	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9IKpAvt030710	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)	for <gdb-patches@sourceware.org>; Tue, 18 Oct 2011 16:51:12 -0400
Received: from host1.jankratochvil.net (localhost [127.0.0.1])	by host1.jankratochvil.net (8.14.4/8.14.4) with ESMTP id p9IKp9cP031998;	Tue, 18 Oct 2011 22:51:09 +0200
Received: (from jkratoch@localhost)	by host1.jankratochvil.net (8.14.4/8.14.4/Submit) id p9IKp8XN031993;	Tue, 18 Oct 2011 22:51:08 +0200
Date: Tue, 18 Oct 2011 20:52:00 -0000
From: Jan Kratochvil <jan.kratochvil@redhat.com>
To: gdb-patches@sourceware.org
Cc: Paul Pluzhnikov <ppluzhnikov@google.com>
Subject: [patch 1/3] Code cleanup: strcpy + strlen -> sprintf
Message-ID: <20111018205108.GA31533@host1.jankratochvil.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2011-10/txt/msg00510.txt.bz2

Hi,

I do not understand much the reasons, maybe a fear about violating C sequence
points.  I hope it is not due to incompatible sprintf on MS-Windows CE or some
such gdbserver platform.

I would check it in with the other patches depending on this.


Thanks,
Jan


gdb/gdbserver/
2011-10-18  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* server.c (handle_qxfer_libraries): Replace strcpy and strlen pairs by
	sprintf.

--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -960,18 +960,11 @@ handle_qxfer_libraries (const char *annex,
       struct dll_info *dll = (struct dll_info *) dll_ptr;
       char *name;
 
-      strcpy (p, "  <library name=\"");
-      p = p + strlen (p);
       name = xml_escape_text (dll->name);
-      strcpy (p, name);
+      p += sprintf (p, "  <library name=\"%s\"><segment address=\"0x%lx\"/>"
+		       "</library>\n",
+		    name, (long) dll->base_addr);
       free (name);
-      p = p + strlen (p);
-      strcpy (p, "\"><segment address=\"");
-      p = p + strlen (p);
-      sprintf (p, "0x%lx", (long) dll->base_addr);
-      p = p + strlen (p);
-      strcpy (p, "\"/></library>\n");
-      p = p + strlen (p);
     }
 
   strcpy (p, "</library-list>\n");