diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-10-28 23:12:38 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-10-28 23:12:38 +0000 |
| commit | a5acabd9230eb70e802ece13542ec647c52b7ee2 (patch) | |
| tree | 1b9cac80e3edf158c0a820cf027656f4c0f6ca06 /cmd-string.c | |
| parent | e65aa04ad780b76c3356d281677bb7a71c89cda3 (diff) | |
Sync OpenBSD patchset 467:
tabs are better; ok nicm
Diffstat (limited to 'cmd-string.c')
| -rw-r--r-- | cmd-string.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/cmd-string.c b/cmd-string.c index 40d5c285..13fb6c76 100644 --- a/cmd-string.c +++ b/cmd-string.c @@ -1,4 +1,4 @@ -/* $Id: cmd-string.c,v 1.23 2009-08-09 17:48:55 tcunha Exp $ */ +/* $Id: cmd-string.c,v 1.24 2009-10-28 23:12:38 tcunha Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -204,33 +204,33 @@ cmd_string_string(const char *s, size_t *p, char endch, int esc) char *buf, *t; size_t len; - buf = NULL; + buf = NULL; len = 0; - while ((ch = cmd_string_getc(s, p)) != endch) { - switch (ch) { + while ((ch = cmd_string_getc(s, p)) != endch) { + switch (ch) { case EOF: goto error; - case '\\': + case '\\': if (!esc) break; - switch (ch = cmd_string_getc(s, p)) { + switch (ch = cmd_string_getc(s, p)) { case EOF: goto error; case 'e': ch = '\033'; break; - case 'r': - ch = '\r'; - break; - case 'n': - ch = '\n'; - break; - case 't': - ch = '\t'; - break; - } - break; + case 'r': + ch = '\r'; + break; + case 'n': + ch = '\n'; + break; + case 't': + ch = '\t'; + break; + } + break; case '$': if (!esc) break; @@ -241,13 +241,13 @@ cmd_string_string(const char *s, size_t *p, char endch, int esc) len += strlen(t); xfree(t); continue; - } + } if (len >= SIZE_MAX - 2) goto error; buf = xrealloc(buf, 1, len + 1); - buf[len++] = ch; - } + buf[len++] = ch; + } buf = xrealloc(buf, 1, len + 1); buf[len] = '\0'; @@ -272,7 +272,7 @@ cmd_string_variable(const char *s, size_t *p) ((ch) >= 'a' && (ch) <= 'z') || ((ch) >= 'A' && (ch) <= 'Z') || \ ((ch) >= '0' && (ch) <= '9')) - buf = NULL; + buf = NULL; len = 0; fch = EOF; |