diff options
| author | Denis Vlasenko | 2006-10-01 15:55:11 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-10-01 15:55:11 +0000 |
| commit | 97a8dd3857aea9730382e2975a2ee2000fd23ebb (patch) | |
| tree | 608f73898f3ed5f466dff68189625fa9328a15be /archival/rpm2cpio.c | |
| parent | f8aa109a9f7c67b291f240fb3ed91da90f26359b (diff) | |
| download | busybox-97a8dd3857aea9730382e2975a2ee2000fd23ebb.zip busybox-97a8dd3857aea9730382e2975a2ee2000fd23ebb.tar.gz | |
g[un]zip: add support for -v (verbose).
Add CONFIG_DESKTOP, almost all bloat from this change
is hidden under that.
Diffstat (limited to 'archival/rpm2cpio.c')
| -rw-r--r-- | archival/rpm2cpio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c index 3ae8458..c00c6be 100644 --- a/archival/rpm2cpio.c +++ b/archival/rpm2cpio.c @@ -63,7 +63,7 @@ int rpm2cpio_main(int argc, char **argv) xread(rpm_fd, &lead, sizeof(struct rpm_lead)); if (strncmp((char *) &lead.magic, RPM_MAGIC, 4) != 0) { - bb_error_msg_and_die("Invalid RPM magic"); /* Just check the magic, the rest is irrelevant */ + bb_error_msg_and_die("invalid RPM magic"); /* Just check the magic, the rest is irrelevant */ } /* Skip the signature header */ @@ -75,12 +75,12 @@ int rpm2cpio_main(int argc, char **argv) xread(rpm_fd, &magic, 2); if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { - bb_error_msg_and_die("Invalid gzip magic"); + bb_error_msg_and_die("invalid gzip magic"); } check_header_gzip(rpm_fd); - if (inflate_gunzip(rpm_fd, STDOUT_FILENO) != 0) { - bb_error_msg("Error inflating"); + if (inflate_gunzip(rpm_fd, STDOUT_FILENO) < 0) { + bb_error_msg("error inflating"); } close(rpm_fd); |