xreadlink: code shrink

udhcp: add missing tryagain member to client_config

function                                             old     new   delta
xmalloc_readlink_follow                              169     154     -15
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-15)             Total: -15 bytes
This commit is contained in:
Denis Vlasenko
2007-11-08 17:40:23 +00:00
parent 53bd4015aa
commit abbd363261
3 changed files with 20 additions and 19 deletions

View File

@@ -41,14 +41,21 @@ char *xmalloc_readlink(const char *path)
*/
char *xmalloc_readlink_follow(const char *path)
{
char *buf = NULL, *lpc, *linkpath;
char *buf;
char *lpc;
char *linkpath;
int bufsize;
smallint looping = 0;
int looping = MAXSYMLINKS + 1;
buf = strdup(path);
bufsize = strlen(path) + 1;
linkpath = xstrdup(path);
goto jump_in;
while(1) {
while (1) {
if (!--looping) {
free(linkpath);
free(buf);
return NULL;
}
linkpath = xmalloc_readlink(buf);
if (!linkpath) {
if (errno == EINVAL) /* not a symlink */
@@ -56,25 +63,19 @@ char *xmalloc_readlink_follow(const char *path)
free(buf);
return NULL;
}
if (*linkpath == '/') {
free(buf);
buf = linkpath;
bufsize = strlen(linkpath) + 1;
} else {
if (linkpath[0] != '/') {
bufsize += strlen(linkpath);
if (looping++ > MAXSYMLINKS) {
free(linkpath);
free(buf);
return NULL;
}
buf = xrealloc(buf, bufsize);
lpc = bb_get_last_path_component_strip(buf);
strcpy(lpc, linkpath);
free(linkpath);
} else {
free(buf);
jump_in:
buf = linkpath;
bufsize = strlen(buf) + 1;
}
}
}
char *xmalloc_readlink_or_warn(const char *path)