diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-11 10:18:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-11 10:18:08 (GMT) |
| commit | 38b82010631e8ebde6b520bf6d5cd1c8265de2e0 (patch) | |
| tree | df51f468ddbcf96fddcb360128744946c1a034f2 /generic | |
| parent | 1b16ec8bb53f4d1aa60ce4ba141e52c331de9427 (diff) | |
| parent | 6d173aa6be98d083b288206ad2c036bc37799c89 (diff) | |
| download | tk-38b82010631e8ebde6b520bf6d5cd1c8265de2e0.zip tk-38b82010631e8ebde6b520bf6d5cd1c8265de2e0.tar.gz tk-38b82010631e8ebde6b520bf6d5cd1c8265de2e0.tar.bz2 | |
Fix [0aa5e852dc]: Accept newline characters as value in Tk option files
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkOption.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/generic/tkOption.c b/generic/tkOption.c index 2a8d501..75dc3b9 100644 --- a/generic/tkOption.c +++ b/generic/tkOption.c @@ -1016,14 +1016,25 @@ AddFromString( Tcl_SetErrorCode(interp, "TK", "OPTIONDB", "NEWLINE", NULL); return TCL_ERROR; } - if ((src[0] == '\\') && (src[1] == '\n')) { - src += 2; - lineNum++; - } else { - *dst = *src; - dst++; - src++; + if (*src == '\\'){ + if (src[1] == '\n') { + src += 2; + lineNum++; + continue; + } else if (src[1] == 'n') { + src += 2; + *dst++ = '\n'; + continue; + } else if (src[1] == '\t' || src[1] == ' ' || src[1] == '\\') { + ++src; + } else if (src[1] >= '0' && src[1] <= '3' && src[2] >= '0' && + src[2] <= '9' && src[3] >= '0' && src[3] <= '9') { + *dst++ = ((src[1]&7)<<6) | ((src[2]&7)<<3) | (src[3]&7); + src += 4; + continue; + } } + *dst++ = *src++; } *dst = 0; |