From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20207 invoked by alias); 27 Jul 2006 21:25:49 -0000 Received: (qmail 20179 invoked by uid 22791); 27 Jul 2006 21:25:48 -0000 X-Spam-Check-By: sourceware.org Received: from nevyn.them.org (HELO nevyn.them.org) (66.93.172.17) by sourceware.org (qpsmtpd/0.31.1) with ESMTP; Thu, 27 Jul 2006 21:25:44 +0000 Received: from drow by nevyn.them.org with local (Exim 4.54) id 1G6DMR-0007Mg-62; Thu, 27 Jul 2006 17:25:39 -0400 Date: Thu, 27 Jul 2006 21:25:00 -0000 From: Daniel Jacobowitz To: Mark Kettenis Cc: vladimir@codesourcery.com, gdb-patches@sources.redhat.com Subject: Re: [PATCH] zero-terminate result of target_read_alloc Message-ID: <20060727212539.GA28145@nevyn.them.org> Mail-Followup-To: Mark Kettenis , vladimir@codesourcery.com, gdb-patches@sources.redhat.com References: <200607181356.16071.vladimir@codesourcery.com> <24758.192.87.1.22.1153221922.squirrel@webmail.xs4all.nl> <20060724040937.GA24339@nevyn.them.org> <200607242138.k6OLcP7h023940@elgar.sibelius.xs4all.nl> <20060724220043.GB18918@nevyn.them.org> <200607262151.k6QLpOLX018719@elgar.sibelius.xs4all.nl> <20060726222546.GA29930@nevyn.them.org> <200607262234.k6QMY6v8028563@elgar.sibelius.xs4all.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200607262234.k6QMY6v8028563@elgar.sibelius.xs4all.nl> User-Agent: Mutt/1.5.11+cvs20060403 X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2006-07/txt/msg00404.txt.bz2 On Thu, Jul 27, 2006 at 12:34:06AM +0200, Mark Kettenis wrote: > Sure Checked in as so. -- Daniel Jacobowitz CodeSourcery 2006-07-27 Daniel Jacobowitz * target.h (target_read_stralloc): New prototype. * target.c (target_read_alloc_1): Renamed from target_read_alloc. Take new PADDING argument. (target_read_alloc): Use it. (target_read_stralloc): New function. Index: target.c =================================================================== RCS file: /cvs/src/src/gdb/target.c,v retrieving revision 1.121 diff -u -p -r1.121 target.c --- target.c 18 Jul 2006 12:44:48 -0000 1.121 +++ target.c 27 Jul 2006 21:23:13 -0000 @@ -1406,22 +1406,15 @@ target_write (struct target_ops *ops, return len; } -/* Wrapper to perform a full read of unknown size. OBJECT/ANNEX will - be read using OPS. The return value will be -1 if the transfer - fails or is not supported; 0 if the object is empty; or the length - of the object otherwise. If a positive value is returned, a - sufficiently large buffer will be allocated using xmalloc and - returned in *BUF_P containing the contents of the object. - - This method should be used for objects sufficiently small to store - in a single xmalloc'd buffer, when no fixed bound on the object's - size is known in advance. Don't try to read TARGET_OBJECT_MEMORY - through this function. */ - -LONGEST -target_read_alloc (struct target_ops *ops, - enum target_object object, - const char *annex, gdb_byte **buf_p) +/* Read OBJECT/ANNEX using OPS. Store the result in *BUF_P and return + the size of the transferred data. PADDING additional bytes are + available in *BUF_P. This is a helper function for + target_read_alloc; see the declaration of that function for more + information. */ + +static LONGEST +target_read_alloc_1 (struct target_ops *ops, enum target_object object, + const char *annex, gdb_byte **buf_p, int padding) { size_t buf_alloc, buf_pos; gdb_byte *buf; @@ -1442,7 +1435,7 @@ target_read_alloc (struct target_ops *op while (1) { n = target_read_partial (ops, object, annex, &buf[buf_pos], - buf_pos, buf_alloc - buf_pos); + buf_pos, buf_alloc - buf_pos - padding); if (n < 0) { /* An error occurred. */ @@ -1472,6 +1465,47 @@ target_read_alloc (struct target_ops *op } } +/* Read OBJECT/ANNEX using OPS. Store the result in *BUF_P and return + the size of the transferred data. See the declaration in "target.h" + function for more information about the return value. */ + +LONGEST +target_read_alloc (struct target_ops *ops, enum target_object object, + const char *annex, gdb_byte **buf_p) +{ + return target_read_alloc_1 (ops, object, annex, buf_p, 0); +} + +/* Read OBJECT/ANNEX using OPS. The result is NUL-terminated and + returned as a string, allocated using xmalloc. If an error occurs + or the transfer is unsupported, NULL is returned. Empty objects + are returned as allocated but empty strings. A warning is issued + if the result contains any embedded NUL bytes. */ + +char * +target_read_stralloc (struct target_ops *ops, enum target_object object, + const char *annex) +{ + gdb_byte *buffer; + LONGEST transferred; + + transferred = target_read_alloc_1 (ops, object, annex, &buffer, 1); + + if (transferred < 0) + return NULL; + + if (transferred == 0) + return xstrdup (""); + + buffer[transferred] = 0; + if (strlen (buffer) < transferred) + warning (_("target object %d, annex %s, " + "contained unexpected null characters"), + (int) object, annex ? annex : "(none)"); + + return (char *) buffer; +} + /* Memory transfer methods. */ void Index: target.h =================================================================== RCS file: /cvs/src/src/gdb/target.h,v retrieving revision 1.85 diff -u -p -r1.85 target.h --- target.h 12 Jul 2006 18:13:45 -0000 1.85 +++ target.h 27 Jul 2006 21:23:13 -0000 @@ -236,6 +236,16 @@ extern LONGEST target_read_alloc (struct enum target_object object, const char *annex, gdb_byte **buf_p); +/* Read OBJECT/ANNEX using OPS. The result is NUL-terminated and + returned as a string, allocated using xmalloc. If an error occurs + or the transfer is unsupported, NULL is returned. Empty objects + are returned as allocated but empty strings. A warning is issued + if the result contains any embedded NUL bytes. */ + +extern char *target_read_stralloc (struct target_ops *ops, + enum target_object object, + const char *annex); + /* Wrappers to target read/write that perform memory transfers. They throw an error if the memory transfer fails.