diff options
| author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-01-19 21:33:19 +0000 |
|---|---|---|
| committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-01-19 21:33:19 +0000 |
| commit | c89a142e47f056a0f5dfc73bbbec3252ccbeefb0 (patch) | |
| tree | 8abee9b7a3ed71e5e224096246b9c43fee3b3e44 | |
| parent | f772075e79d2493702a212124b8701cf265e067d (diff) | |
| download | busybox-w32-c89a142e47f056a0f5dfc73bbbec3252ccbeefb0.tar.gz busybox-w32-c89a142e47f056a0f5dfc73bbbec3252ccbeefb0.tar.bz2 busybox-w32-c89a142e47f056a0f5dfc73bbbec3252ccbeefb0.zip | |
strdup -> xstrdup
sed: de-obfuscate piece of code
git-svn-id: svn://busybox.net/trunk/busybox@17392 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rw-r--r-- | editors/sed.c | 7 | ||||
| -rw-r--r-- | libbb/loop.c | 2 | ||||
| -rw-r--r-- | 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) | |||
| 175 | while (i < len) { | 175 | while (i < len) { |
| 176 | if (string[i] == '\\') { | 176 | if (string[i] == '\\') { |
| 177 | if (!to || string[i+1] == from) { | 177 | if (!to || string[i+1] == from) { |
| 178 | *(dest++) = to ? to : string[i+1]; | 178 | *dest++ = to ? to : string[i+1]; |
| 179 | i += 2; | 179 | i += 2; |
| 180 | continue; | 180 | continue; |
| 181 | } else *(dest++) = string[i++]; | 181 | } |
| 182 | *dest++ = string[i++]; | ||
| 182 | } | 183 | } |
| 183 | *(dest++) = string[i++]; | 184 | *dest++ = string[i++]; |
| 184 | } | 185 | } |
| 185 | *dest = 0; | 186 | *dest = 0; |
| 186 | } | 187 | } |
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: | |||
| 142 | } | 142 | } |
| 143 | close(ffd); | 143 | close(ffd); |
| 144 | if (!rc) { | 144 | if (!rc) { |
| 145 | if (!*device) *device = strdup(dev); | 145 | if (!*device) *device = xstrdup(dev); |
| 146 | return mode==O_RDONLY ? 1 : 0; | 146 | return mode==O_RDONLY ? 1 : 0; |
| 147 | } | 147 | } |
| 148 | return rc; | 148 | 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) | |||
| 56 | char **dest = arg; | 56 | char **dest = arg; |
| 57 | 57 | ||
| 58 | free(*dest); | 58 | free(*dest); |
| 59 | *dest = strdup(line); | 59 | *dest = xstrdup(line); |
| 60 | 60 | ||
| 61 | return 1; | 61 | return 1; |
| 62 | } | 62 | } |
