Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 16:31:24 +00:00
Code Issues Projects Releases Wiki Activity

rpm: make rpm -i SRPM.rpm install it to surrent dir; better help text

Browse Source 
function                                             old     new   delta
rpm_main                                            1355    1358      +3
packed_usage                                       26732   26728      -4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 3/-4)               Total: -1 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-05-06 16:56:38 +02:00
parent 27653adc8b
commit 5dfd9c4dbc
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archival/rpm.c
View File

@ -71,7 +71,7 @@ static void *map;
static rpm_index **mytags; static rpm_index **mytags;
static int tagcount; static int tagcount;
static void extract_cpio_gz(int fd); static void extract_cpio(int fd, const char *source_rpm);
static rpm_index **rpm_gettags(int fd, int *num_tags); static rpm_index **rpm_gettags(int fd, int *num_tags);
static int bsearch_rpmtag(const void *key, const void *item); static int bsearch_rpmtag(const void *key, const void *item);
static char *rpm_getstr(int tag, int itemindex); static char *rpm_getstr(int tag, int itemindex);
@ -122,6 +122,8 @@ int rpm_main(int argc, char **argv)
} }
while (*argv) { while (*argv) {
const char *source_rpm;
rpm_fd = xopen(*argv++, O_RDONLY); rpm_fd = xopen(*argv++, O_RDONLY);
mytags = rpm_gettags(rpm_fd, &tagcount); mytags = rpm_gettags(rpm_fd, &tagcount);
if (!mytags) if (!mytags)
@ -130,11 +132,13 @@ int rpm_main(int argc, char **argv)
/* Mimimum is one page */ /* Mimimum is one page */
map = mmap(0, offset > pagesize ? (offset + offset % pagesize) : pagesize, PROT_READ, MAP_PRIVATE, rpm_fd, 0); map = mmap(0, offset > pagesize ? (offset + offset % pagesize) : pagesize, PROT_READ, MAP_PRIVATE, rpm_fd, 0);
source_rpm = rpm_getstr(TAG_SOURCERPM, 0);
if (func & rpm_install) { if (func & rpm_install) {
/* Backup any config files */ /* Backup any config files */
loop_through_files(TAG_BASENAMES, fileaction_dobackup); loop_through_files(TAG_BASENAMES, fileaction_dobackup);
/* Extact the archive */ /* Extact the archive */
extract_cpio_gz(rpm_fd); extract_cpio(rpm_fd, source_rpm);
/* Set the correct file uid/gid's */ /* Set the correct file uid/gid's */
loop_through_files(TAG_BASENAMES, fileaction_setowngrp); loop_through_files(TAG_BASENAMES, fileaction_setowngrp);
} }
@ -161,7 +165,7 @@ int rpm_main(int argc, char **argv)
strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm); strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm);
printf("Release : %-30sBuild Date: %s\n", rpm_getstr(TAG_RELEASE, 0), bdatestring); printf("Release : %-30sBuild Date: %s\n", rpm_getstr(TAG_RELEASE, 0), bdatestring);
printf("Install date: %-30sBuild Host: %s\n", "(not installed)", rpm_getstr(TAG_BUILDHOST, 0)); printf("Install date: %-30sBuild Host: %s\n", "(not installed)", rpm_getstr(TAG_BUILDHOST, 0));
printf("Group : %-30sSource RPM: %s\n", rpm_getstr(TAG_GROUP, 0), rpm_getstr(TAG_SOURCERPM, 0)); printf("Group : %-30sSource RPM: %s\n", rpm_getstr(TAG_GROUP, 0), source_rpm);
printf("Size : %-33dLicense: %s\n", rpm_getint(TAG_SIZE, 0), rpm_getstr(TAG_LICENSE, 0)); printf("Size : %-33dLicense: %s\n", rpm_getint(TAG_SIZE, 0), rpm_getstr(TAG_LICENSE, 0));
printf("URL : %s\n", rpm_getstr(TAG_URL, 0)); printf("URL : %s\n", rpm_getstr(TAG_URL, 0));
printf("Summary : %s\n", rpm_getstr(TAG_SUMMARY, 0)); printf("Summary : %s\n", rpm_getstr(TAG_SUMMARY, 0));
@ -194,10 +198,15 @@ int rpm_main(int argc, char **argv)
return 0; return 0;
} }
static void extract_cpio_gz(int fd) static void extract_cpio(int fd, const char *source_rpm)
{ {
archive_handle_t *archive_handle; archive_handle_t *archive_handle;
if (source_rpm != NULL) {
/* Binary rpm (it was built from some SRPM), install to root */
xchdir("/");
} /* else: SRPM, install to current dir */
/* Initialize */ /* Initialize */
archive_handle = init_handle(); archive_handle = init_handle();
archive_handle->seek = seek_by_read; archive_handle->seek = seek_by_read;
@ -215,7 +224,6 @@ static void extract_cpio_gz(int fd)
archive_handle->src_fd = fd; archive_handle->src_fd = fd;
/*archive_handle->offset = 0; - init_handle() did it */ /*archive_handle->offset = 0; - init_handle() did it */
xchdir("/"); /* Install RPM's to root */
setup_unzip_on_fd(archive_handle->src_fd /*, fail_if_not_detected: 1*/); setup_unzip_on_fd(archive_handle->src_fd /*, fail_if_not_detected: 1*/);
while (get_header_cpio(archive_handle) == EXIT_SUCCESS) while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
continue; continue;

8
include/usage.h
View File

@ -3810,13 +3810,13 @@
"\n -A inet" IF_FEATURE_IPV6("{6}") " Select address family" \ "\n -A inet" IF_FEATURE_IPV6("{6}") " Select address family" \
#define rpm_trivial_usage \ #define rpm_trivial_usage \
"-i -q[ildc]p PACKAGE.rpm" "-i PACKAGE.rpm; rpm -qp[ildc] PACKAGE.rpm"
#define rpm_full_usage "\n\n" \ #define rpm_full_usage "\n\n" \
"Manipulate RPM packages\n" \ "Manipulate RPM packages\n" \
"\nOptions:" \ "\nCommands:" \
"\n -i Install package" \ "\n -i Install package" \
"\n -q Query package" \ "\n -qp Query package" \
"\n -p Query uninstalled package" \ "\nOptions:" \
"\n -i Show information" \ "\n -i Show information" \
"\n -l List contents" \ "\n -l List contents" \
"\n -d List documents" \ "\n -d List documents" \