From patchwork Mon Sep 19 14:41:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 115359 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 82372B6FA0 for ; Tue, 20 Sep 2011 00:43:40 +1000 (EST) Received: from localhost ([::1]:50438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5f4K-0002Qs-8j for incoming@patchwork.ozlabs.org; Mon, 19 Sep 2011 10:43:36 -0400 Received: from eggs.gnu.org ([140.186.70.92]:32907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5f3r-0001yn-TL for qemu-devel@nongnu.org; Mon, 19 Sep 2011 10:43:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5f3q-0003aW-UY for qemu-devel@nongnu.org; Mon, 19 Sep 2011 10:43:07 -0400 Received: from mout.perfora.net ([74.208.4.194]:50602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5f3q-0003aK-68 for qemu-devel@nongnu.org; Mon, 19 Sep 2011 10:43:06 -0400 Received: from localhost.localdomain (rrcs-97-77-242-174.sw.biz.rr.com [97.77.242.174]) by mrelay.perfora.net (node=mrus3) with ESMTP (Nemesis) id 0MFLUi-1QrNIr290W-00EmC6; Mon, 19 Sep 2011 10:43:02 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 19 Sep 2011 09:41:48 -0500 Message-Id: <1316443309-23843-8-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1316443309-23843-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1316443309-23843-1-git-send-email-mdroth@linux.vnet.ibm.com> X-Provags-ID: V02:K0:gbmwAg69UQugtp/8NHTwMjoEDJ96p0ZxxsT3xoTfqVa JAECGHcUdCsOl0BUGcNNx9AWfeXCzOZjwI8uWIQepVtn28YANi 6cxe8KYrTVS0cGr4kd21kkAFCJPFrpByJBhBwtHpRDl+99Fla4 Nb2egt8FGc9UlZNtdIsJ6yziUvXh3D1Wy/dRHAtQB/CbL5FtDm IfJjAG95zdYiAcRyINRDT0anfSqoLQZ7i36dYv2GeMEUSOgzma pkFwV8EmUP2ypErp4mVGMOh9UD55aEyOOXXbJQoYoh6hE5ShFo kaawOwzuI4zN6Uq1gEwq2zVdeqGCaBTxrI1NpeGC0MQUbLnxL6 bmkXbHrVMxKJ9Kn3ibYzlGdv4BlHpp84bCrVxi2AjSXGKX2YGQ ZhpuPEO9Iz+3tB9iwPRuEk0bwm5PYCmV+Q= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.208.4.194 Cc: aliguori@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [RFC 7/8] cutil: add strocat(), to concat a string to an offset in another X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Michael Roth --- cutils.c | 8 ++++++++ qemu-common.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/cutils.c b/cutils.c index c91f887..0835834 100644 --- a/cutils.c +++ b/cutils.c @@ -84,6 +84,14 @@ int stristart(const char *str, const char *val, const char **ptr) return 1; } +/* concat first 'offset' chars in 'dest' with 'src' */ +char *strocat(char *buf, const char *src, int offset) +{ + memcpy(&buf[offset], src, strlen(src)); + buf[offset+strlen(src)] = '\0'; + return buf; +} + /* XXX: use host strnlen if available ? */ int qemu_strnlen(const char *s, int max_len) { diff --git a/qemu-common.h b/qemu-common.h index 404c421..0a9b919 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -138,6 +138,7 @@ void pstrcpy(char *buf, int buf_size, const char *str); char *pstrcat(char *buf, int buf_size, const char *s); int strstart(const char *str, const char *val, const char **ptr); int stristart(const char *str, const char *val, const char **ptr); +char *strocat(char *dest, const char *src, int offset); int qemu_strnlen(const char *s, int max_len); time_t mktimegm(struct tm *tm); int qemu_fls(int i);