JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rewrite the code a bit to avoid GCC -Wstrict-overflow triggering in one case…

Browse Source 
most of it is utterly useless though as the line indicated is usually the
closing curly brace of a function, often not even the reported one…
This commit is contained in:
tg 2015-02-06 09:33:41 +00:00
parent 934929c2ee
commit 6f3d362785
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
eval.c
View File

@ -2,7 +2,7 @@
/*- /*-
* Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, * Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
* 2011, 2012, 2013, 2014 * 2011, 2012, 2013, 2014, 2015
* Thorsten Glaser <tg@mirbsd.org> * Thorsten Glaser <tg@mirbsd.org>
* *
* Provided that these terms and disclaimer and all copyright notices * Provided that these terms and disclaimer and all copyright notices
@ -23,7 +23,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.161 2014/12/05 15:14:23 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.162 2015/02/06 09:33:41 tg Exp $");
/* /*
* string expansion * string expansion
@ -1749,28 +1749,30 @@ homedir(char *name)
static void static void
alt_expand(XPtrV *wp, char *start, char *exp_start, char *end, int fdo) alt_expand(XPtrV *wp, char *start, char *exp_start, char *end, int fdo)
{ {
int count = 0; unsigned int count = 0;
char *brace_start, *brace_end, *comma = NULL; char *brace_start, *brace_end, *comma = NULL;
char *field_start; char *field_start;
char *p; char *p = exp_start;
/* search for open brace */ /* search for open brace */
for (p = exp_start; (p = strchr(p, MAGIC)) && p[1] != '{' /*}*/; p += 2) while ((p = strchr(p, MAGIC)) && p[1] != '{' /*}*/)
; p += 2;
brace_start = p; brace_start = p;
/* find matching close brace, if any */ /* find matching close brace, if any */
if (p) { if (p) {
comma = NULL; comma = NULL;
count = 1; count = 1;
for (p += 2; *p && count; p++) { p += 2;
if (ISMAGIC(*p)) { while (*p && count) {
if (*++p == '{' /*}*/) if (ISMAGIC(*p++)) {
count++; if (*p == '{' /*}*/)
++count;
else if (*p == /*{*/ '}') else if (*p == /*{*/ '}')
--count; --count;
else if (*p == ',' && count == 1) else if (*p == ',' && count == 1)
comma = p; comma = p;
++p;
} }
} }
} }
@ -1799,7 +1801,7 @@ alt_expand(XPtrV *wp, char *start, char *exp_start, char *end, int fdo)
for (p = brace_start + 2; p != brace_end; p++) { for (p = brace_start + 2; p != brace_end; p++) {
if (ISMAGIC(*p)) { if (ISMAGIC(*p)) {
if (*++p == '{' /*}*/) if (*++p == '{' /*}*/)
count++; ++count;
else if ((*p == /*{*/ '}' && --count == 0) || else if ((*p == /*{*/ '}' && --count == 0) ||
(*p == ',' && count == 1)) { (*p == ',' && count == 1)) {
char *news; char *news;