2002-12-10 00:17:22 +00:00
|
|
|
/* vi: set sw=4 ts=4: */
|
|
|
|
/*
|
|
|
|
* Mini rpm applet for busybox
|
|
|
|
*
|
|
|
|
* Copyright (C) 2001,2002 by Laurence Anderson
|
|
|
|
*
|
2010-08-16 18:14:46 +00:00
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
2002-12-10 00:17:22 +00:00
|
|
|
*/
|
|
|
|
|
2007-05-26 19:00:18 +00:00
|
|
|
#include "libbb.h"
|
2002-12-10 02:09:12 +00:00
|
|
|
#include "unarchive.h"
|
2010-05-06 14:19:19 +00:00
|
|
|
#include "rpm.h"
|
2002-12-10 02:09:12 +00:00
|
|
|
|
2006-12-22 15:03:50 +00:00
|
|
|
#define RPM_CHAR_TYPE 1
|
|
|
|
#define RPM_INT8_TYPE 2
|
|
|
|
#define RPM_INT16_TYPE 3
|
|
|
|
#define RPM_INT32_TYPE 4
|
|
|
|
/* #define RPM_INT64_TYPE 5 ---- These aren't supported (yet) */
|
|
|
|
#define RPM_STRING_TYPE 6
|
|
|
|
#define RPM_BIN_TYPE 7
|
|
|
|
#define RPM_STRING_ARRAY_TYPE 8
|
|
|
|
#define RPM_I18NSTRING_TYPE 9
|
2002-12-10 00:17:22 +00:00
|
|
|
|
2006-12-22 15:03:50 +00:00
|
|
|
#define TAG_NAME 1000
|
|
|
|
#define TAG_VERSION 1001
|
|
|
|
#define TAG_RELEASE 1002
|
|
|
|
#define TAG_SUMMARY 1004
|
|
|
|
#define TAG_DESCRIPTION 1005
|
|
|
|
#define TAG_BUILDTIME 1006
|
|
|
|
#define TAG_BUILDHOST 1007
|
|
|
|
#define TAG_SIZE 1009
|
|
|
|
#define TAG_VENDOR 1011
|
|
|
|
#define TAG_LICENSE 1014
|
|
|
|
#define TAG_PACKAGER 1015
|
|
|
|
#define TAG_GROUP 1016
|
|
|
|
#define TAG_URL 1020
|
|
|
|
#define TAG_PREIN 1023
|
|
|
|
#define TAG_POSTIN 1024
|
|
|
|
#define TAG_FILEFLAGS 1037
|
|
|
|
#define TAG_FILEUSERNAME 1039
|
|
|
|
#define TAG_FILEGROUPNAME 1040
|
|
|
|
#define TAG_SOURCERPM 1044
|
|
|
|
#define TAG_PREINPROG 1085
|
|
|
|
#define TAG_POSTINPROG 1086
|
|
|
|
#define TAG_PREFIXS 1098
|
|
|
|
#define TAG_DIRINDEXES 1116
|
|
|
|
#define TAG_BASENAMES 1117
|
|
|
|
#define TAG_DIRNAMES 1118
|
2010-05-06 14:19:19 +00:00
|
|
|
|
2006-12-22 15:03:50 +00:00
|
|
|
#define RPMFILE_CONFIG (1 << 0)
|
|
|
|
#define RPMFILE_DOC (1 << 1)
|
2002-12-10 00:17:22 +00:00
|
|
|
|
|
|
|
enum rpm_functions_e {
|
|
|
|
rpm_query = 1,
|
|
|
|
rpm_install = 2,
|
|
|
|
rpm_query_info = 4,
|
|
|
|
rpm_query_package = 8,
|
|
|
|
rpm_query_list = 16,
|
|
|
|
rpm_query_list_doc = 32,
|
|
|
|
rpm_query_list_config = 64
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct {
|
2004-01-30 22:54:20 +00:00
|
|
|
uint32_t tag; /* 4 byte tag */
|
|
|
|
uint32_t type; /* 4 byte type */
|
|
|
|
uint32_t offset; /* 4 byte offset */
|
|
|
|
uint32_t count; /* 4 byte count */
|
2002-12-10 00:17:22 +00:00
|
|
|
} rpm_index;
|
|
|
|
|
|
|
|
static void *map;
|
|
|
|
static rpm_index **mytags;
|
|
|
|
static int tagcount;
|
|
|
|
|
2010-05-06 14:56:38 +00:00
|
|
|
static void extract_cpio(int fd, const char *source_rpm);
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static rpm_index **rpm_gettags(int fd, int *num_tags);
|
|
|
|
static int bsearch_rpmtag(const void *key, const void *item);
|
2006-12-22 15:03:50 +00:00
|
|
|
static char *rpm_getstr(int tag, int itemindex);
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static int rpm_getint(int tag, int itemindex);
|
|
|
|
static int rpm_getcount(int tag);
|
|
|
|
static void fileaction_dobackup(char *filename, int fileref);
|
|
|
|
static void fileaction_setowngrp(char *filename, int fileref);
|
|
|
|
static void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref));
|
2002-12-10 00:17:22 +00:00
|
|
|
|
2007-10-11 10:05:36 +00:00
|
|
|
int rpm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
2002-12-10 00:17:22 +00:00
|
|
|
int rpm_main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
int opt = 0, func = 0, rpm_fd, offset;
|
2006-12-22 15:03:50 +00:00
|
|
|
const int pagesize = getpagesize();
|
2002-12-10 00:17:22 +00:00
|
|
|
|
|
|
|
while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
|
|
|
|
switch (opt) {
|
2006-12-22 15:03:50 +00:00
|
|
|
case 'i': /* First arg: Install mode, with q: Information */
|
|
|
|
if (!func) func = rpm_install;
|
2002-12-10 00:17:22 +00:00
|
|
|
else func |= rpm_query_info;
|
|
|
|
break;
|
2006-12-22 15:03:50 +00:00
|
|
|
case 'q': /* First arg: Query mode */
|
|
|
|
if (func) bb_show_usage();
|
|
|
|
func = rpm_query;
|
2002-12-10 00:17:22 +00:00
|
|
|
break;
|
2006-12-22 15:03:50 +00:00
|
|
|
case 'p': /* Query a package */
|
2002-12-10 00:17:22 +00:00
|
|
|
func |= rpm_query_package;
|
|
|
|
break;
|
2006-12-22 15:03:50 +00:00
|
|
|
case 'l': /* List files in a package */
|
2002-12-10 00:17:22 +00:00
|
|
|
func |= rpm_query_list;
|
|
|
|
break;
|
2006-12-22 15:03:50 +00:00
|
|
|
case 'd': /* List doc files in a package (implies list) */
|
2002-12-10 00:17:22 +00:00
|
|
|
func |= rpm_query_list;
|
|
|
|
func |= rpm_query_list_doc;
|
|
|
|
break;
|
2006-12-22 15:03:50 +00:00
|
|
|
case 'c': /* List config files in a package (implies list) */
|
2002-12-10 00:17:22 +00:00
|
|
|
func |= rpm_query_list;
|
|
|
|
func |= rpm_query_list_config;
|
|
|
|
break;
|
|
|
|
default:
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_show_usage();
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
}
|
2006-12-22 15:03:50 +00:00
|
|
|
argv += optind;
|
2008-11-01 12:54:56 +00:00
|
|
|
//argc -= optind;
|
2010-01-04 13:15:38 +00:00
|
|
|
if (!argv[0]) {
|
|
|
|
bb_show_usage();
|
|
|
|
}
|
2006-12-22 15:03:50 +00:00
|
|
|
|
|
|
|
while (*argv) {
|
2010-05-06 14:56:38 +00:00
|
|
|
const char *source_rpm;
|
|
|
|
|
2006-12-22 15:03:50 +00:00
|
|
|
rpm_fd = xopen(*argv++, O_RDONLY);
|
|
|
|
mytags = rpm_gettags(rpm_fd, &tagcount);
|
|
|
|
if (!mytags)
|
|
|
|
bb_error_msg_and_die("error reading rpm header");
|
|
|
|
offset = xlseek(rpm_fd, 0, SEEK_CUR);
|
|
|
|
/* Mimimum is one page */
|
|
|
|
map = mmap(0, offset > pagesize ? (offset + offset % pagesize) : pagesize, PROT_READ, MAP_PRIVATE, rpm_fd, 0);
|
2002-12-10 00:17:22 +00:00
|
|
|
|
2010-05-06 14:56:38 +00:00
|
|
|
source_rpm = rpm_getstr(TAG_SOURCERPM, 0);
|
|
|
|
|
2002-12-10 00:17:22 +00:00
|
|
|
if (func & rpm_install) {
|
2006-12-22 15:03:50 +00:00
|
|
|
/* Backup any config files */
|
|
|
|
loop_through_files(TAG_BASENAMES, fileaction_dobackup);
|
|
|
|
/* Extact the archive */
|
2010-05-06 14:56:38 +00:00
|
|
|
extract_cpio(rpm_fd, source_rpm);
|
2006-12-22 15:03:50 +00:00
|
|
|
/* Set the correct file uid/gid's */
|
|
|
|
loop_through_files(TAG_BASENAMES, fileaction_setowngrp);
|
|
|
|
}
|
|
|
|
else if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) {
|
|
|
|
if (!(func & (rpm_query_info|rpm_query_list))) {
|
|
|
|
/* If just a straight query, just give package name */
|
|
|
|
printf("%s-%s-%s\n", rpm_getstr(TAG_NAME, 0), rpm_getstr(TAG_VERSION, 0), rpm_getstr(TAG_RELEASE, 0));
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
if (func & rpm_query_info) {
|
|
|
|
/* Do the nice printout */
|
|
|
|
time_t bdate_time;
|
2010-01-09 18:10:49 +00:00
|
|
|
struct tm *bdate_ptm;
|
2002-12-10 00:17:22 +00:00
|
|
|
char bdatestring[50];
|
2010-05-06 14:19:19 +00:00
|
|
|
const char *p;
|
|
|
|
|
|
|
|
p = rpm_getstr(TAG_PREFIXS, 0);
|
|
|
|
if (!p) p = "(not relocateable)";
|
|
|
|
printf("Name : %-29sRelocations: %s\n", rpm_getstr(TAG_NAME, 0), p);
|
|
|
|
p = rpm_getstr(TAG_VENDOR, 0);
|
|
|
|
if (!p) p = "(none)";
|
|
|
|
printf("Version : %-34sVendor: %s\n", rpm_getstr(TAG_VERSION, 0), p);
|
2006-12-22 15:03:50 +00:00
|
|
|
bdate_time = rpm_getint(TAG_BUILDTIME, 0);
|
2010-01-09 18:10:49 +00:00
|
|
|
bdate_ptm = localtime(&bdate_time);
|
|
|
|
strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm);
|
2006-12-22 15:03:50 +00:00
|
|
|
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));
|
2010-05-06 14:56:38 +00:00
|
|
|
printf("Group : %-30sSource RPM: %s\n", rpm_getstr(TAG_GROUP, 0), source_rpm);
|
2006-12-22 15:03:50 +00:00
|
|
|
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("Summary : %s\n", rpm_getstr(TAG_SUMMARY, 0));
|
|
|
|
printf("Description :\n%s\n", rpm_getstr(TAG_DESCRIPTION, 0));
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
if (func & rpm_query_list) {
|
|
|
|
int count, it, flags;
|
2006-12-22 15:03:50 +00:00
|
|
|
count = rpm_getcount(TAG_BASENAMES);
|
2002-12-10 00:17:22 +00:00
|
|
|
for (it = 0; it < count; it++) {
|
2006-12-22 15:03:50 +00:00
|
|
|
flags = rpm_getint(TAG_FILEFLAGS, it);
|
|
|
|
switch (func & (rpm_query_list_doc|rpm_query_list_config)) {
|
|
|
|
case rpm_query_list_doc:
|
|
|
|
if (!(flags & RPMFILE_DOC)) continue;
|
|
|
|
break;
|
|
|
|
case rpm_query_list_config:
|
|
|
|
if (!(flags & RPMFILE_CONFIG)) continue;
|
|
|
|
break;
|
|
|
|
case rpm_query_list_doc|rpm_query_list_config:
|
|
|
|
if (!(flags & (RPMFILE_CONFIG|RPMFILE_DOC))) continue;
|
|
|
|
break;
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
2006-12-22 15:03:50 +00:00
|
|
|
printf("%s%s\n",
|
|
|
|
rpm_getstr(TAG_DIRNAMES, rpm_getint(TAG_DIRINDEXES, it)),
|
|
|
|
rpm_getstr(TAG_BASENAMES, it));
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-12-22 15:03:50 +00:00
|
|
|
free(mytags);
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-05-06 14:56:38 +00:00
|
|
|
static void extract_cpio(int fd, const char *source_rpm)
|
2007-04-16 22:32:04 +00:00
|
|
|
{
|
2002-12-10 00:17:22 +00:00
|
|
|
archive_handle_t *archive_handle;
|
|
|
|
|
2010-05-06 14:56:38 +00:00
|
|
|
if (source_rpm != NULL) {
|
|
|
|
/* Binary rpm (it was built from some SRPM), install to root */
|
|
|
|
xchdir("/");
|
|
|
|
} /* else: SRPM, install to current dir */
|
|
|
|
|
2007-06-08 13:05:39 +00:00
|
|
|
/* Initialize */
|
2002-12-10 00:17:22 +00:00
|
|
|
archive_handle = init_handle();
|
2006-10-08 12:49:22 +00:00
|
|
|
archive_handle->seek = seek_by_read;
|
2002-12-10 00:17:22 +00:00
|
|
|
archive_handle->action_data = data_extract_all;
|
2010-05-06 14:19:19 +00:00
|
|
|
#if 0 /* For testing (rpm -i only lists the files in internal cpio): */
|
|
|
|
archive_handle->action_header = header_list;
|
|
|
|
archive_handle->action_data = data_skip;
|
|
|
|
#endif
|
2009-09-17 00:43:14 +00:00
|
|
|
archive_handle->ah_flags = ARCHIVE_RESTORE_DATE | ARCHIVE_CREATE_LEADING_DIRS
|
2008-10-16 13:29:13 +00:00
|
|
|
/* compat: overwrite existing files.
|
|
|
|
* try "rpm -i foo.src.rpm" few times in a row -
|
|
|
|
* standard rpm will not complain.
|
|
|
|
* (TODO? real rpm creates "file;1234" and then renames it) */
|
2009-09-17 00:43:14 +00:00
|
|
|
| ARCHIVE_UNLINK_OLD;
|
2002-12-10 00:17:22 +00:00
|
|
|
archive_handle->src_fd = fd;
|
2008-06-28 05:04:09 +00:00
|
|
|
/*archive_handle->offset = 0; - init_handle() did it */
|
2004-03-15 08:29:22 +00:00
|
|
|
|
2010-05-06 14:19:19 +00:00
|
|
|
setup_unzip_on_fd(archive_handle->src_fd /*, fail_if_not_detected: 1*/);
|
2006-12-22 15:03:50 +00:00
|
|
|
while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
|
2007-06-08 13:05:39 +00:00
|
|
|
continue;
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static rpm_index **rpm_gettags(int fd, int *num_tags)
|
2002-12-10 00:17:22 +00:00
|
|
|
{
|
2010-05-06 14:19:19 +00:00
|
|
|
/* We should never need more than 200 (shrink via realloc later) */
|
2008-11-01 12:54:56 +00:00
|
|
|
rpm_index **tags = xzalloc(200 * sizeof(tags[0]));
|
2002-12-10 00:17:22 +00:00
|
|
|
int pass, tagindex = 0;
|
|
|
|
|
2006-12-22 15:03:50 +00:00
|
|
|
xlseek(fd, 96, SEEK_CUR); /* Seek past the unused lead */
|
|
|
|
|
|
|
|
/* 1st pass is the signature headers, 2nd is the main stuff */
|
|
|
|
for (pass = 0; pass < 2; pass++) {
|
2010-05-06 14:19:19 +00:00
|
|
|
struct rpm_header header;
|
2002-12-10 00:17:22 +00:00
|
|
|
rpm_index *tmpindex;
|
|
|
|
int storepos;
|
|
|
|
|
2006-12-22 15:03:50 +00:00
|
|
|
xread(fd, &header, sizeof(header));
|
2010-05-06 14:19:19 +00:00
|
|
|
if (header.magic_and_ver != htonl(RPM_HEADER_MAGICnVER))
|
|
|
|
return NULL; /* Invalid magic, or not version 1 */
|
2002-12-10 00:17:22 +00:00
|
|
|
header.size = ntohl(header.size);
|
|
|
|
header.entries = ntohl(header.entries);
|
2010-05-06 14:19:19 +00:00
|
|
|
storepos = xlseek(fd, 0, SEEK_CUR) + header.entries * 16;
|
2002-12-10 00:17:22 +00:00
|
|
|
|
|
|
|
while (header.entries--) {
|
2008-11-01 12:54:56 +00:00
|
|
|
tmpindex = tags[tagindex++] = xmalloc(sizeof(*tmpindex));
|
|
|
|
xread(fd, tmpindex, sizeof(*tmpindex));
|
2006-12-22 15:03:50 +00:00
|
|
|
tmpindex->tag = ntohl(tmpindex->tag);
|
|
|
|
tmpindex->type = ntohl(tmpindex->type);
|
|
|
|
tmpindex->count = ntohl(tmpindex->count);
|
2002-12-10 00:17:22 +00:00
|
|
|
tmpindex->offset = storepos + ntohl(tmpindex->offset);
|
2008-07-08 05:14:36 +00:00
|
|
|
if (pass == 0)
|
2006-12-22 15:03:50 +00:00
|
|
|
tmpindex->tag -= 743;
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
2010-05-06 14:19:19 +00:00
|
|
|
storepos = xlseek(fd, header.size, SEEK_CUR); /* Seek past store */
|
2006-12-22 15:03:50 +00:00
|
|
|
/* Skip padding to 8 byte boundary after reading signature headers */
|
2008-07-08 05:14:36 +00:00
|
|
|
if (pass == 0)
|
2010-05-06 14:19:19 +00:00
|
|
|
xlseek(fd, (-storepos) & 0x7, SEEK_CUR);
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
2010-05-06 14:19:19 +00:00
|
|
|
/* realloc tags to save space */
|
|
|
|
tags = xrealloc(tags, tagindex * sizeof(tags[0]));
|
2002-12-10 00:17:22 +00:00
|
|
|
*num_tags = tagindex;
|
2010-05-06 14:19:19 +00:00
|
|
|
/* All done, leave the file at the start of the gzipped cpio archive */
|
|
|
|
return tags;
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static int bsearch_rpmtag(const void *key, const void *item)
|
2002-12-10 00:17:22 +00:00
|
|
|
{
|
2006-01-30 18:33:12 +00:00
|
|
|
int *tag = (int *)key;
|
2002-12-10 00:17:22 +00:00
|
|
|
rpm_index **tmp = (rpm_index **) item;
|
2006-01-30 18:33:12 +00:00
|
|
|
return (*tag - tmp[0]->tag);
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static int rpm_getcount(int tag)
|
2002-12-10 00:17:22 +00:00
|
|
|
{
|
|
|
|
rpm_index **found;
|
2006-01-30 18:33:12 +00:00
|
|
|
found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
|
2006-12-22 15:03:50 +00:00
|
|
|
if (!found)
|
|
|
|
return 0;
|
|
|
|
return found[0]->count;
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
|
2006-12-22 15:03:50 +00:00
|
|
|
static char *rpm_getstr(int tag, int itemindex)
|
2002-12-10 00:17:22 +00:00
|
|
|
{
|
|
|
|
rpm_index **found;
|
2006-01-30 18:33:12 +00:00
|
|
|
found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
|
2006-12-22 15:03:50 +00:00
|
|
|
if (!found || itemindex >= found[0]->count)
|
|
|
|
return NULL;
|
2010-05-06 14:19:19 +00:00
|
|
|
if (found[0]->type == RPM_STRING_TYPE
|
|
|
|
|| found[0]->type == RPM_I18NSTRING_TYPE
|
|
|
|
|| found[0]->type == RPM_STRING_ARRAY_TYPE
|
|
|
|
) {
|
2002-12-10 00:17:22 +00:00
|
|
|
int n;
|
2009-09-23 21:15:43 +00:00
|
|
|
char *tmpstr = (char *) map + found[0]->offset;
|
2010-05-06 14:19:19 +00:00
|
|
|
for (n = 0; n < itemindex; n++)
|
2006-12-22 15:03:50 +00:00
|
|
|
tmpstr = tmpstr + strlen(tmpstr) + 1;
|
2002-12-10 00:17:22 +00:00
|
|
|
return tmpstr;
|
2006-12-22 15:03:50 +00:00
|
|
|
}
|
|
|
|
return NULL;
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static int rpm_getint(int tag, int itemindex)
|
2002-12-10 00:17:22 +00:00
|
|
|
{
|
|
|
|
rpm_index **found;
|
2006-12-22 15:03:50 +00:00
|
|
|
int *tmpint; /* NB: using int8_t* would be easier to code */
|
|
|
|
|
2005-04-23 01:43:07 +00:00
|
|
|
/* gcc throws warnings here when sizeof(void*)!=sizeof(int) ...
|
|
|
|
* it's ok to ignore it because tag won't be used as a pointer */
|
2006-01-30 18:33:12 +00:00
|
|
|
found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
|
2006-12-22 15:03:50 +00:00
|
|
|
if (!found || itemindex >= found[0]->count)
|
|
|
|
return -1;
|
|
|
|
|
2009-09-23 21:15:43 +00:00
|
|
|
tmpint = (int *) ((char *) map + found[0]->offset);
|
2006-12-22 15:03:50 +00:00
|
|
|
|
2002-12-10 00:17:22 +00:00
|
|
|
if (found[0]->type == RPM_INT32_TYPE) {
|
2006-12-22 15:03:50 +00:00
|
|
|
tmpint = (int *) ((char *) tmpint + itemindex*4);
|
|
|
|
/*return ntohl(*tmpint);*/
|
|
|
|
/* int can be != int32_t */
|
|
|
|
return ntohl(*(int32_t*)tmpint);
|
|
|
|
}
|
|
|
|
if (found[0]->type == RPM_INT16_TYPE) {
|
|
|
|
tmpint = (int *) ((char *) tmpint + itemindex*2);
|
|
|
|
/* ??? read int, and THEN ntohs() it?? */
|
|
|
|
/*return ntohs(*tmpint);*/
|
|
|
|
return ntohs(*(int16_t*)tmpint);
|
|
|
|
}
|
|
|
|
if (found[0]->type == RPM_INT8_TYPE) {
|
|
|
|
tmpint = (int *) ((char *) tmpint + itemindex);
|
|
|
|
/* ??? why we don't read byte here??? */
|
|
|
|
/*return ntohs(*tmpint);*/
|
|
|
|
return *(int8_t*)tmpint;
|
|
|
|
}
|
|
|
|
return -1;
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static void fileaction_dobackup(char *filename, int fileref)
|
2002-12-10 00:17:22 +00:00
|
|
|
{
|
|
|
|
struct stat oldfile;
|
|
|
|
int stat_res;
|
|
|
|
char *newname;
|
2006-12-22 15:03:50 +00:00
|
|
|
if (rpm_getint(TAG_FILEFLAGS, fileref) & RPMFILE_CONFIG) {
|
|
|
|
/* Only need to backup config files */
|
|
|
|
stat_res = lstat(filename, &oldfile);
|
|
|
|
if (stat_res == 0 && S_ISREG(oldfile.st_mode)) {
|
|
|
|
/* File already exists - really should check MD5's etc to see if different */
|
2006-09-09 12:24:19 +00:00
|
|
|
newname = xasprintf("%s.rpmorig", filename);
|
2002-12-10 00:17:22 +00:00
|
|
|
copy_file(filename, newname, FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS);
|
|
|
|
remove_file(filename, FILEUTILS_RECUR | FILEUTILS_FORCE);
|
|
|
|
free(newname);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static void fileaction_setowngrp(char *filename, int fileref)
|
2002-12-10 00:17:22 +00:00
|
|
|
{
|
2008-10-16 13:29:13 +00:00
|
|
|
/* real rpm warns: "user foo does not exist - using <you>" */
|
|
|
|
struct passwd *pw = getpwnam(rpm_getstr(TAG_FILEUSERNAME, fileref));
|
|
|
|
int uid = pw ? pw->pw_uid : getuid(); /* or euid? */
|
|
|
|
struct group *gr = getgrnam(rpm_getstr(TAG_FILEGROUPNAME, fileref));
|
|
|
|
int gid = gr ? gr->gr_gid : getgid();
|
2006-10-03 19:02:20 +00:00
|
|
|
chown(filename, uid, gid);
|
2002-12-10 00:17:22 +00:00
|
|
|
}
|
|
|
|
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 17:35:13 +00:00
|
|
|
static void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref))
|
2002-12-10 00:17:22 +00:00
|
|
|
{
|
|
|
|
int count = 0;
|
2006-12-22 15:03:50 +00:00
|
|
|
while (rpm_getstr(filetag, count)) {
|
|
|
|
char* filename = xasprintf("%s%s",
|
|
|
|
rpm_getstr(TAG_DIRNAMES, rpm_getint(TAG_DIRINDEXES, count)),
|
|
|
|
rpm_getstr(TAG_BASENAMES, count));
|
2002-12-10 00:17:22 +00:00
|
|
|
fileaction(filename, count++);
|
|
|
|
free(filename);
|
|
|
|
}
|
|
|
|
}
|