diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 14:30:35 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 14:30:35 +0200 |
| commit | edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 (patch) | |
| tree | f375d28043dd4457428a841167dc93d760ba9a46 /usr/gen_init_cpio.c | |
| parent | Move jffs2_fs_i.h and jffs2_fs_sb.h from include/linux/ to fs/jffs2/ (diff) | |
| parent | [NETFILTER] SCTP conntrack: fix infinite loop (diff) | |
| download | linux-edc4ff7c08e9885c40e60c4fb39fa42cc91a0602.tar.xz linux-edc4ff7c08e9885c40e60c4fb39fa42cc91a0602.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'usr/gen_init_cpio.c')
| -rw-r--r-- | usr/gen_init_cpio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c index 33dbcbf77c5b..83acd6cc0b3c 100644 --- a/usr/gen_init_cpio.c +++ b/usr/gen_init_cpio.c @@ -471,6 +471,7 @@ int main (int argc, char *argv[]) "ERROR: incorrect format, could not locate file type line %d: '%s'\n", line_nr, line); ec = -1; + break; } if ('\n' == *type) { @@ -506,7 +507,8 @@ int main (int argc, char *argv[]) line_nr, line); } } - cpio_trailer(); + if (ec == 0) + cpio_trailer(); exit(ec); } |