64d7e9308
Bernhard Reutner-Fischer
2006-09-11
Subject
- 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). Saves a few bytes: $ size busybox.old busybox text data bss dec hex filename 839676 8780 243592 1092048 1
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/gzip.c +1 -1archival/unzip.c +1 -1miscutils/crontab.c +1 -1miscutils/mt.c +1 -1miscutils/rx.c +1 -1networking/vconfig.c +1 -1util-linux/mkfs_minix.c +2 -2
archival/gzip.c+1 -1
| @@ -1206,7 +1206,7 @@ int gzip_main(int argc, char **argv) | |
| inFileNum = STDIN_FILENO; | |
| outFileNum = STDOUT_FILENO; | |
| } else { | |
| - | inFileNum = xopen3(argv[i], O_RDONLY, 0); |
| + | inFileNum = xopen(argv[i], O_RDONLY); |
| if (fstat(inFileNum, &statBuf) < 0) | |
| bb_perror_msg_and_die("%s", argv[i]); | |
| time_stamp = statBuf.st_ctime; | |
archival/unzip.c+1 -1
| @@ -333,7 +333,7 @@ int unzip_main(int argc, char **argv) | |
| overwrite = o_always; | |
| case 'y': /* Open file and fall into unzip */ | |
| 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 */ | |
| if (verbosity == v_normal) { | |
| printf(" inflating: %s\n", dst_fn); | |
miscutils/crontab.c+1 -1
| @@ -266,7 +266,7 @@ static int GetReplaceStream(const char *user, const char *file) | |
| exit(0); | |
| bb_default_error_retval = 0; | |
| - | fd = xopen3(file, O_RDONLY, 0); |
| + | fd = xopen(file, O_RDONLY); |
| buf[0] = 0; | |
| write(filedes[1], buf, 1); | |
| while ((n = read(fd, buf, sizeof(buf))) > 0) { | |
miscutils/mt.c+1 -1
| @@ -101,7 +101,7 @@ int mt_main(int argc, char **argv) | |
| break; | |
| } | |
| - | fd = xopen3(file, mode, 0); |
| + | fd = xopen(file, mode); |
| switch (code->value) { | |
| case MTTELL: | |
miscutils/rx.c+1 -1
| @@ -262,7 +262,7 @@ int rx_main(int argc, char **argv) | |
| bb_show_usage(); | |
| 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); | |
| if (tcgetattr(ttyfd, &tty) < 0) | |
networking/vconfig.c+1 -1
| @@ -118,7 +118,7 @@ int vconfig_main(int argc, char **argv) | |
| /* Don't bother closing the filedes. It will be closed on cleanup. */ | |
| /* 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)); | |
util-linux/mkfs_minix.c+2 -2
| @@ -292,7 +292,7 @@ static int get_size(const char *file) | |
| int fd; | |
| long size; | |
| - | fd = xopen3(file, O_RDWR, 0); |
| + | fd = xopen(file, O_RDWR); |
| if (ioctl(fd, BLKGETSIZE, &size) >= 0) { | |
| close(fd); | |
| return (size * 512); | |
| @@ -805,7 +805,7 @@ goodbye: | |
| tmp += dirsize; | |
| *(short *) tmp = 2; | |
| strcpy(tmp + 2, ".badblocks"); | |
| - | DEV = xopen3(device_name, O_RDWR, 0); |
| + | DEV = xopen(device_name, O_RDWR); |
| if (fstat(DEV, &statbuf) < 0) | |
| bb_error_msg_and_die("unable to stat %s", device_name); | |
| if (!S_ISBLK(statbuf.st_mode)) | |