emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- convert a few xopen3(,,0) into xopen(,). Also peruse the fact that xopen defaults to 0777 on it's own, so we don't need to xopen3(,,0777).

Browse Source 
Saves a few bytes:
$ size busybox.old busybox                                text    data     bss     dec     hex filename
 839676    8780  243592 1092048  10a9d0 busybox.old
 839660    8780  243592 1092032  10a9c0 busybox
$ make CC=gcc-4.2-HEAD bloatcheck
function                                             old     new   delta
static.vconfig_main                                  281     279      -2
static.rx_main                                      1076    1074      -2
static.mt_main                                       294     292      -2
static.gzip_main                                     753     751      -2
static.mkfs_minix_main                              4034    4030      -4
static.unzip_main                                   1771    1766      -5
static.crontab_main                                 1513    1507      -6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/7 up/down: 0/-23)             Total: -23 bytes
This commit is contained in:
Bernhard Reutner-Fischer 2006-09-11 16:01:40 +00:00
parent 57b56674a3
commit 64d7e93081
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archival/gzip.c
View File

@ -1206,7 +1206,7 @@ int gzip_main(int argc, char **argv)
inFileNum = STDIN_FILENO; inFileNum = STDIN_FILENO;
outFileNum = STDOUT_FILENO; outFileNum = STDOUT_FILENO;
} else { } else {
inFileNum = xopen3(argv[i], O_RDONLY, 0); inFileNum = xopen(argv[i], O_RDONLY);
if (fstat(inFileNum, &statBuf) < 0) if (fstat(inFileNum, &statBuf) < 0)
bb_perror_msg_and_die("%s", argv[i]); bb_perror_msg_and_die("%s", argv[i]);
time_stamp = statBuf.st_ctime; time_stamp = statBuf.st_ctime;

2
archival/unzip.c
View File

@ -333,7 +333,7 @@ int unzip_main(int argc, char **argv)
overwrite = o_always; overwrite = o_always;
case 'y': /* Open file and fall into unzip */ case 'y': /* Open file and fall into unzip */
unzip_create_leading_dirs(dst_fn); unzip_create_leading_dirs(dst_fn);
dst_fd = xopen3(dst_fn, O_WRONLY | O_CREAT | O_TRUNC, 0777); dst_fd = xopen(dst_fn, O_WRONLY | O_CREAT | O_TRUNC);
case -1: /* Unzip */ case -1: /* Unzip */
if (verbosity == v_normal) { if (verbosity == v_normal) {
printf(" inflating: %s\n", dst_fn); printf(" inflating: %s\n", dst_fn);

2
miscutils/crontab.c
View File

@ -266,7 +266,7 @@ static int GetReplaceStream(const char *user, const char *file)
exit(0); exit(0);
bb_default_error_retval = 0; bb_default_error_retval = 0;
fd = xopen3(file, O_RDONLY, 0); fd = xopen(file, O_RDONLY);
buf[0] = 0; buf[0] = 0;
write(filedes[1], buf, 1); write(filedes[1], buf, 1);
while ((n = read(fd, buf, sizeof(buf))) > 0) { while ((n = read(fd, buf, sizeof(buf))) > 0) {

2
miscutils/mt.c
View File

@ -101,7 +101,7 @@ int mt_main(int argc, char **argv)
break; break;
} }
fd = xopen3(file, mode, 0); fd = xopen(file, mode);
switch (code->value) { switch (code->value) {
case MTTELL: case MTTELL:

2
miscutils/rx.c
View File

@ -262,7 +262,7 @@ int rx_main(int argc, char **argv)
bb_show_usage(); bb_show_usage();
fn = argv[1]; fn = argv[1];
ttyfd = xopen3(CURRENT_TTY, O_RDWR, 0); ttyfd = xopen(CURRENT_TTY, O_RDWR);
filefd = xopen3(fn, O_RDWR|O_CREAT|O_TRUNC, 0666); filefd = xopen3(fn, O_RDWR|O_CREAT|O_TRUNC, 0666);
if (tcgetattr(ttyfd, &tty) < 0) if (tcgetattr(ttyfd, &tty) < 0)

2
networking/vconfig.c
View File

@ -118,7 +118,7 @@ int vconfig_main(int argc, char **argv)
/* Don't bother closing the filedes. It will be closed on cleanup. */ /* Don't bother closing the filedes. It will be closed on cleanup. */
/* Will die if 802.1q is not present */ /* Will die if 802.1q is not present */
xopen3(conf_file_name, O_RDONLY, 0); xopen(conf_file_name, O_RDONLY);
memset(&ifr, 0, sizeof(struct vlan_ioctl_args)); memset(&ifr, 0, sizeof(struct vlan_ioctl_args));

4
util-linux/mkfs_minix.c
View File

@ -292,7 +292,7 @@ static int get_size(const char *file)
int fd; int fd;
long size; long size;
fd = xopen3(file, O_RDWR, 0); fd = xopen(file, O_RDWR);
if (ioctl(fd, BLKGETSIZE, &size) >= 0) { if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
close(fd); close(fd);
return (size * 512); return (size * 512);
@ -805,7 +805,7 @@ goodbye:
tmp += dirsize; tmp += dirsize;
*(short *) tmp = 2; *(short *) tmp = 2;
strcpy(tmp + 2, ".badblocks"); strcpy(tmp + 2, ".badblocks");
DEV = xopen3(device_name, O_RDWR, 0); DEV = xopen(device_name, O_RDWR);
if (fstat(DEV, &statbuf) < 0) if (fstat(DEV, &statbuf) < 0)
bb_error_msg_and_die("unable to stat %s", device_name); bb_error_msg_and_die("unable to stat %s", device_name);
if (!S_ISBLK(statbuf.st_mode)) if (!S_ISBLK(statbuf.st_mode))