cpio: internalize archive_xread_all_eof. add a few paranoia checks

for corrupted cpio files.
modprobe-small: remove stray include
route: small code shrink

function                                             old     new   delta
get_header_cpio                                      958     980     +22
archive_xread_all_eof                                 33       -     -33
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 1/0 up/down: 22/-33)            Total: -11 bytes
This commit is contained in:
Denis Vlasenko
2008-07-12 09:20:44 +00:00
parent 39acf45335
commit a46dd89e94
9 changed files with 45 additions and 64 deletions

View File

@@ -237,7 +237,7 @@ evms_probe_all(blkid_cache cache)
if (!procpt)
return 0;
while (fgets(line, sizeof(line), procpt)) {
if (sscanf (line, " %d %d %d %*s %*s %[^\n ]",
if (sscanf(line, " %d %d %d %*s %*s %[^\n ]",
&ma, &mi, &sz, device) != 4)
continue;