aboutsummaryrefslogtreecommitdiff
path: root/archival/rpm2cpio.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-01 15:55:11 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-01 15:55:11 +0000
commit97a8dd3857aea9730382e2975a2ee2000fd23ebb (patch)
tree608f73898f3ed5f466dff68189625fa9328a15be /archival/rpm2cpio.c
parentf8aa109a9f7c67b291f240fb3ed91da90f26359b (diff)
downloadbusybox-w32-97a8dd3857aea9730382e2975a2ee2000fd23ebb.tar.gz
busybox-w32-97a8dd3857aea9730382e2975a2ee2000fd23ebb.tar.bz2
busybox-w32-97a8dd3857aea9730382e2975a2ee2000fd23ebb.zip
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.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 3ae8458dd..c00c6be65 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -63,7 +63,7 @@ int rpm2cpio_main(int argc, char **argv)
63 63
64 xread(rpm_fd, &lead, sizeof(struct rpm_lead)); 64 xread(rpm_fd, &lead, sizeof(struct rpm_lead));
65 if (strncmp((char *) &lead.magic, RPM_MAGIC, 4) != 0) { 65 if (strncmp((char *) &lead.magic, RPM_MAGIC, 4) != 0) {
66 bb_error_msg_and_die("Invalid RPM magic"); /* Just check the magic, the rest is irrelevant */ 66 bb_error_msg_and_die("invalid RPM magic"); /* Just check the magic, the rest is irrelevant */
67 } 67 }
68 68
69 /* Skip the signature header */ 69 /* Skip the signature header */
@@ -75,12 +75,12 @@ int rpm2cpio_main(int argc, char **argv)
75 75
76 xread(rpm_fd, &magic, 2); 76 xread(rpm_fd, &magic, 2);
77 if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { 77 if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
78 bb_error_msg_and_die("Invalid gzip magic"); 78 bb_error_msg_and_die("invalid gzip magic");
79 } 79 }
80 80
81 check_header_gzip(rpm_fd); 81 check_header_gzip(rpm_fd);
82 if (inflate_gunzip(rpm_fd, STDOUT_FILENO) != 0) { 82 if (inflate_gunzip(rpm_fd, STDOUT_FILENO) < 0) {
83 bb_error_msg("Error inflating"); 83 bb_error_msg("error inflating");
84 } 84 }
85 85
86 close(rpm_fd); 86 close(rpm_fd);