version 1.89, 2013/12/27 20:35:51 |
version 1.90, 2013/12/27 23:41:55 |
Line 855 mlinks_undupe(struct mpage *mpage) |
|
Line 855 mlinks_undupe(struct mpage *mpage) |
|
char *bufp; |
char *bufp; |
|
|
mpage->form = FORM_CAT; |
mpage->form = FORM_CAT; |
for(prev = &mpage->mlinks; *prev; prev = &(*prev)->next) { |
prev = &mpage->mlinks; |
mlink = *prev; |
while (NULL != (mlink = *prev)) { |
if (FORM_CAT != mlink->dform) { |
if (FORM_CAT != mlink->dform) { |
mpage->form = FORM_NONE; |
mpage->form = FORM_NONE; |
continue; |
goto nextlink; |
} |
} |
if (strlcpy(buf, mlink->file, PATH_MAX) >= PATH_MAX) { |
if (strlcpy(buf, mlink->file, PATH_MAX) >= PATH_MAX) { |
if (warnings) |
if (warnings) |
say(mlink->file, "Filename too long"); |
say(mlink->file, "Filename too long"); |
continue; |
goto nextlink; |
} |
} |
bufp = strstr(buf, "cat"); |
bufp = strstr(buf, "cat"); |
assert(NULL != bufp); |
assert(NULL != bufp); |
Line 874 mlinks_undupe(struct mpage *mpage) |
|
Line 874 mlinks_undupe(struct mpage *mpage) |
|
strlcat(buf, mlink->dsec, PATH_MAX); |
strlcat(buf, mlink->dsec, PATH_MAX); |
if (NULL == ohash_find(&mlinks, |
if (NULL == ohash_find(&mlinks, |
ohash_qlookup(&mlinks, buf))) |
ohash_qlookup(&mlinks, buf))) |
continue; |
goto nextlink; |
if (warnings) |
if (warnings) |
say(mlink->file, "Man source exists: %s", buf); |
say(mlink->file, "Man source exists: %s", buf); |
if (use_all) |
if (use_all) |
continue; |
goto nextlink; |
*prev = mlink->next; |
*prev = mlink->next; |
mlink_free(mlink); |
mlink_free(mlink); |
mlink = *prev; |
continue; |
|
nextlink: |
|
prev = &(*prev)->next; |
} |
} |
} |
} |
|
|