From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KthEz-0003II-NI for qemu-devel@nongnu.org; Sat, 25 Oct 2008 07:23:33 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KthEw-0003Hc-W5 for qemu-devel@nongnu.org; Sat, 25 Oct 2008 07:23:32 -0400 Received: from [199.232.76.173] (port=55779 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KthEw-0003HX-L7 for qemu-devel@nongnu.org; Sat, 25 Oct 2008 07:23:30 -0400 Received: from savannah.gnu.org ([199.232.41.3]:41036 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KthEv-0008VS-Pu for qemu-devel@nongnu.org; Sat, 25 Oct 2008 07:23:30 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1KthEt-0006Tw-M8 for qemu-devel@nongnu.org; Sat, 25 Oct 2008 11:23:27 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1KthEt-0006Tr-CT for qemu-devel@nongnu.org; Sat, 25 Oct 2008 11:23:27 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Sat, 25 Oct 2008 11:23:27 +0000 Subject: [Qemu-devel] [5532] Replace uses of strndup (a GNU extension) with Qemu pstrdup Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5532 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5532 Author: blueswir1 Date: 2008-10-25 11:23:27 +0000 (Sat, 25 Oct 2008) Log Message: ----------- Replace uses of strndup (a GNU extension) with Qemu pstrdup Modified Paths: -------------- trunk/cutils.c trunk/hw/bt-hci.c trunk/qemu-common.h Modified: trunk/cutils.c =================================================================== --- trunk/cutils.c 2008-10-25 11:21:28 UTC (rev 5531) +++ trunk/cutils.c 2008-10-25 11:23:27 UTC (rev 5532) @@ -50,6 +50,18 @@ return buf; } +/* strdup with a limit */ +char *pstrdup(const char *str, size_t buf_size) +{ + size_t len; + char *buf; + + len = MIN(buf_size, strlen(str)); + buf = qemu_malloc(len); + pstrcpy(buf, len, str); + return buf; +} + int strstart(const char *str, const char *val, const char **ptr) { const char *p, *q; Modified: trunk/hw/bt-hci.c =================================================================== --- trunk/hw/bt-hci.c 2008-10-25 11:21:28 UTC (rev 5531) +++ trunk/hw/bt-hci.c 2008-10-25 11:23:27 UTC (rev 5532) @@ -1814,7 +1814,7 @@ if (hci->device.lmp_name) free((void *) hci->device.lmp_name); - hci->device.lmp_name = strndup(PARAM(change_local_name, name), + hci->device.lmp_name = pstrdup(PARAM(change_local_name, name), sizeof(PARAM(change_local_name, name))); bt_hci_event_complete_status(hci, HCI_SUCCESS); break; Modified: trunk/qemu-common.h =================================================================== --- trunk/qemu-common.h 2008-10-25 11:21:28 UTC (rev 5531) +++ trunk/qemu-common.h 2008-10-25 11:23:27 UTC (rev 5532) @@ -82,6 +82,7 @@ /* cutils.c */ void pstrcpy(char *buf, int buf_size, const char *str); char *pstrcat(char *buf, int buf_size, const char *s); +char *pstrdup(const char *str, size_t buf_size); int strstart(const char *str, const char *val, const char **ptr); int stristart(const char *str, const char *val, const char **ptr); time_t mktimegm(struct tm *tm);