From 4ebaf1074218d4e1c2907114bc53080c5abbd57d Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Fri, 19 Jan 2007 21:33:19 +0000 Subject: [PATCH] strdup -> xstrdup sed: de-obfuscate piece of code --- editors/sed.c | 7 ++++--- libbb/loop.c | 2 +- networking/udhcp/files.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/editors/sed.c b/editors/sed.c index 674381b56..720d29aed 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -175,12 +175,13 @@ static void parse_escapes(char *dest, char *string, int len, char from, char to) while (i < len) { if (string[i] == '\\') { if (!to || string[i+1] == from) { - *(dest++) = to ? to : string[i+1]; + *dest++ = to ? to : string[i+1]; i += 2; continue; - } else *(dest++) = string[i++]; + } + *dest++ = string[i++]; } - *(dest++) = string[i++]; + *dest++ = string[i++]; } *dest = 0; } diff --git a/libbb/loop.c b/libbb/loop.c index 14835ec24..9818a30cb 100644 --- a/libbb/loop.c +++ b/libbb/loop.c @@ -142,7 +142,7 @@ try_again: } close(ffd); if (!rc) { - if (!*device) *device = strdup(dev); + if (!*device) *device = xstrdup(dev); return mode==O_RDONLY ? 1 : 0; } return rc; diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c index 5e399e1f8..9ade4ae6d 100644 --- a/networking/udhcp/files.c +++ b/networking/udhcp/files.c @@ -56,7 +56,7 @@ static int read_str(const char *line, void *arg) char **dest = arg; free(*dest); - *dest = strdup(line); + *dest = xstrdup(line); return 1; } -- 2.25.1