umount: umount -a shouldn't stop on first failure

[oweals/busybox.git] / util-linux / hexdump.c

diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index e038005f5e779795c6c3690315420e76cb404afa..5cb245feb1c4ba6c194ddd69282df96535281f89 100644 (file)
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -21,7 +21,7 @@ static void bb_dump_addfile(char *name)
 
        fp = xfopen(name, "r");
 
-       while ((buf = bb_get_chomped_line_from_file(fp)) != NULL) {
+       while ((buf = xmalloc_getline(fp)) != NULL) {
                p = skip_whitespace(buf);
 
                if (*p && (*p != '#')) {
@@ -79,10 +79,10 @@ int hexdump_main(int argc, char **argv)
                                bb_dump_addfile(optarg);
                        } /* else */
                        if (ch == 'n') {
-                               bb_dump_length = bb_xgetularg10_bnd(optarg, 0, INT_MAX);
+                               bb_dump_length = xatoi_u(optarg);
                        } /* else */
                        if (ch == 's') {
-                               bb_dump_skip = bb_xgetularg_bnd_sfx(optarg, 10, 0, LONG_MAX, suffixes);
+                               bb_dump_skip = xatoul_range_sfx(optarg, 0, LONG_MAX, suffixes);
                        } /* else */
                        if (ch == 'v') {
                                bb_dump_vflag = ALL;