From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 24FFA1381F3 for ; Wed, 11 Sep 2013 20:32:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1D11E0B13; Wed, 11 Sep 2013 20:32:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2EBE6E0B13 for ; Wed, 11 Sep 2013 20:32:20 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E89DA33E974 for ; Wed, 11 Sep 2013 20:32:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 99D13E468F for ; Wed, 11 Sep 2013 20:32:18 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1378931089.1adabc26ce1154bea0cffe6f09597fa8aae6eec6.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/, sys-cluster/charm/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/charm/ChangeLog sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch X-VCS-Directories: sys-cluster/charm/ sys-cluster/charm/files/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: 1adabc26ce1154bea0cffe6f09597fa8aae6eec6 X-VCS-Branch: master Date: Wed, 11 Sep 2013 20:32:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6bad4b50-baae-4b57-b1dd-b6b20d0ac6fa X-Archives-Hash: aab506e83173a6862737a3e4cd887d43 commit: 1adabc26ce1154bea0cffe6f09597fa8aae6eec6 Author: Nicolas Bock gmail com> AuthorDate: Wed Sep 11 20:24:49 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Wed Sep 11 20:24:49 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1adabc26 sys-cluster/charm-6.5.1: Fix patch for the last time. Package-Manager: portage-2.2.2 --- sys-cluster/charm/ChangeLog | 4 ++++ .../charm/files/charm-6.5.1-fix-string-parsing.patch | 16 +++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index c57b85a..3eaa445 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -4,6 +4,10 @@ 11 Sep 2013; Nicolas Bock files/charm-6.5.1-fix-string-parsing.patch: + sys-cluster/charm-6.5.1: Fix patch for the last time. + + 11 Sep 2013; Nicolas Bock + files/charm-6.5.1-fix-string-parsing.patch: sys-cluster/charm-6.5.1-r1: Backported patch just added to correct upstream version. diff --git a/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch b/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch index 9655343..cfb81aa 100644 --- a/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch +++ b/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch @@ -1,21 +1,21 @@ -From db515b327e423d0ca39a56df15c5e3225154daeb Mon Sep 17 00:00:00 2001 +From 7a8bf20508f54a223c13e62c7c485a7de4aaeba0 Mon Sep 17 00:00:00 2001 From: Nicolas Bock Date: Wed, 11 Sep 2013 14:13:30 -0600 -Subject: [PATCH] charmrun.C: parsing of strings now parses "\n" into '\n' +Subject: [PATCH] charmrun.c: parsing of strings now parses "\n" into '\n' Since gdb lacks anything like ';' to separate several commands in one line, the commands need to be separated by a newline character. I have added some parsing logic so that the string "\n" will now be translated into the character '\n'. --- - src/arch/net/charmrun/charmrun.c | 22 ++++++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) + src/arch/net/charmrun/charmrun.c | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/arch/net/charmrun/charmrun.c b/src/arch/net/charmrun/charmrun.c -index 6837712..54fc8bc 100644 +index 6837712..bf370c1 100644 --- a/src/arch/net/charmrun/charmrun.c +++ b/src/arch/net/charmrun/charmrun.c -@@ -454,8 +454,26 @@ static int pparam_setdef(def, value) +@@ -454,8 +454,28 @@ static int pparam_setdef(def, value) if (*p) return -1; return 0; case 's' : @@ -25,7 +25,9 @@ index 6837712..54fc8bc 100644 + /* Parse input string and convert a literal "\n" into '\n'. */ + *def->where.s = (char*) calloc(strlen(value)+1, sizeof(char)); + char* parsed_value = (char*) *def->where.s; -+ for(int i = 0, j = 0; i < strlen(value); i++) ++ int i; ++ int j = 0; ++ for(i = 0; i < strlen(value); i++) + { + fprintf(stderr, "i = %d, j = %d, value[i] = \n", i, j); + if(i+1 < strlen(value))