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 C833D1381F3 for ; Wed, 11 Sep 2013 20:16:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D387CE0B13; Wed, 11 Sep 2013 20:16:28 +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 53324E0B13 for ; Wed, 11 Sep 2013 20:16:28 +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 F16A033E974 for ; Wed, 11 Sep 2013 20:16:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 678C2E468F for ; Wed, 11 Sep 2013 20:16:24 +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: <1378930570.93b282b1f72581ee0bba1653a2132f50c5446076.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: 93b282b1f72581ee0bba1653a2132f50c5446076 X-VCS-Branch: master Date: Wed, 11 Sep 2013 20:16:24 +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: 7288afdb-c557-4684-ba40-15d367d3701b X-Archives-Hash: b534d458ada02810afe82917368db0a8 commit: 93b282b1f72581ee0bba1653a2132f50c5446076 Author: Nicolas Bock gmail com> AuthorDate: Wed Sep 11 20:16:10 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Wed Sep 11 20:16:10 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=93b282b1 sys-cluster/charm-6.5.1-r1: Backported patch just added to correct upstream version. Package-Manager: portage-2.2.2 --- sys-cluster/charm/ChangeLog | 5 ++ .../files/charm-6.5.1-fix-string-parsing.patch | 54 ++++------------------ 2 files changed, 15 insertions(+), 44 deletions(-) diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index de06577..c57b85a 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -3,6 +3,11 @@ # $Header: $ 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. + + 11 Sep 2013; Nicolas Bock +files/charm-6.5.1-fix-string-parsing.patch, charm-6.5.1-r1.ebuild: sys-cluster/charm-6.5.1-r1: Added patch from ticket 294. 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 420b2fe..9655343 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,55 +1,21 @@ -From b74a077290b82b7a22010d78502a9e60e9e44c1f Mon Sep 17 00:00:00 2001 +From db515b327e423d0ca39a56df15c5e3225154daeb Mon Sep 17 00:00:00 2001 From: Nicolas Bock -Date: Wed, 11 Sep 2013 13:50:05 -0600 -Subject: [PATCH 2/2] charmrun.C: parsing of strings now parses "\n" into '\n'. +Date: Wed, 11 Sep 2013 14:13:30 -0600 +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 ++++++++++++++++++++-- - src/arch/netlrts/charmrun/charmrun.C | 22 ++++++++++++++++++++-- - 2 files changed, 40 insertions(+), 4 deletions(-) + src/arch/net/charmrun/charmrun.c | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) -diff --git a/src/arch/net/charmrun/charmrun.C b/src/arch/net/charmrun/charmrun.C -index a23baa2..2830b8f 100644 ---- a/src/arch/net/charmrun/charmrun.C -+++ b/src/arch/net/charmrun/charmrun.C -@@ -451,8 +451,26 @@ static int pparam_setdef(ppdef def, char *value) - if (*p) return -1; - return 0; - case 's' : -- *def->where.s = strdup(value); -- return 0; -+ { -+ /* 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++) -+ { -+ fprintf(stderr, "i = %d, j = %d, value[i] = \n", i, j); -+ if(i+1 < strlen(value)) -+ { -+ if(value[i] == '\\' && value[i+1] == 'n') -+ { -+ parsed_value[j++] = '\n'; -+ i++; -+ continue; -+ } -+ } -+ parsed_value[j++] = value[i]; -+ } -+ return 0; -+ } - case 'f' : - *def->where.f = strtol(value, &p, 10); - if (*p) return -1; -diff --git a/src/arch/netlrts/charmrun/charmrun.C b/src/arch/netlrts/charmrun/charmrun.C -index 232bf5c..77a7950 100644 ---- a/src/arch/netlrts/charmrun/charmrun.C -+++ b/src/arch/netlrts/charmrun/charmrun.C -@@ -451,8 +451,26 @@ static int pparam_setdef(ppdef def, char *value) +diff --git a/src/arch/net/charmrun/charmrun.c b/src/arch/net/charmrun/charmrun.c +index 6837712..54fc8bc 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) if (*p) return -1; return 0; case 's' :