git: 086f09087713 - main - ar: diff reduction against ELF Tool Chain
Ed Maste
emaste at FreeBSD.org
Fri Aug 13 14:40:06 UTC 2021
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=086f09087713e3af0a28d296a2372071b72211ef
commit 086f09087713e3af0a28d296a2372071b72211ef
Author: Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-08-12 19:37:25 +0000
Commit: Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-08-13 14:39:44 +0000
ar: diff reduction against ELF Tool Chain
Drop exit status from bsdar_errc. ELF Tool Chain always returns
EXIT_FAILURE in bsdar_errc.
Recommit of one part of d20e9e02db3d / review D31496.
Obtained from: ELF Tool Chain
Sponsored by: The FreeBSD Foundation
---
usr.bin/ar/acpyacc.y | 34 +++++++++++++---------------
usr.bin/ar/ar.c | 25 +++++++++------------
usr.bin/ar/ar.h | 5 ++---
usr.bin/ar/read.c | 4 ++--
usr.bin/ar/util.c | 4 ++--
usr.bin/ar/write.c | 62 ++++++++++++++++++++++++----------------------------
6 files changed, 59 insertions(+), 75 deletions(-)
diff --git a/usr.bin/ar/acpyacc.y b/usr.bin/ar/acpyacc.y
index 5d4eb9fb6b37..f6bfbd7957b5 100644
--- a/usr.bin/ar/acpyacc.y
+++ b/usr.bin/ar/acpyacc.y
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sysexits.h>
#include <unistd.h>
#include "ar.h"
@@ -250,7 +249,7 @@ arscp_open(char *fname)
int r;
if ((a = archive_read_new()) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed");
+ bsdar_errc(bsdar, 0, "archive_read_new failed");
archive_read_support_format_ar(a);
AC(archive_read_open_filename(a, fname, DEF_BLKSZ));
if ((r = archive_read_next_header(a, &entry)))
@@ -277,15 +276,15 @@ arscp_create(char *in, char *out)
/* Delete previously created temporary archive, if any. */
if (tmpac) {
if (unlink(tmpac) < 0)
- bsdar_errc(bsdar, EX_IOERR, errno, "unlink failed");
+ bsdar_errc(bsdar, errno, "unlink failed");
free(tmpac);
}
tmpac = strdup(TEMPLATE);
if (tmpac == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "strdup failed");
+ bsdar_errc(bsdar, errno, "strdup failed");
if ((ofd = mkstemp(tmpac)) < 0)
- bsdar_errc(bsdar, EX_IOERR, errno, "mkstemp failed");
+ bsdar_errc(bsdar, errno, "mkstemp failed");
if (in) {
/*
@@ -308,8 +307,7 @@ arscp_create(char *in, char *out)
* (archive with only global header)
*/
if ((a = archive_write_new()) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, 0,
- "archive_write_new failed");
+ bsdar_errc(bsdar, 0, "archive_write_new failed");
archive_write_set_format_ar_svr4(a);
AC(archive_write_open_fd(a, ofd));
AC(archive_write_close(a));
@@ -350,7 +348,7 @@ arscp_copy(int ifd, int ofd)
}
}
if (munmap(p, sb.st_size) < 0)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "munmap failed");
+ bsdar_errc(bsdar, errno, "munmap failed");
if (bytes > 0)
return (1);
@@ -439,8 +437,7 @@ arscp_dir(char *archive, struct list *list, char *rlt)
if (rlt) {
out = stdout;
if ((stdout = fopen(rlt, "w")) == NULL)
- bsdar_errc(bsdar, EX_IOERR, errno,
- "fopen %s failed", rlt);
+ bsdar_errc(bsdar, errno, "fopen %s failed", rlt);
}
bsdar->filename = archive;
@@ -457,8 +454,7 @@ arscp_dir(char *archive, struct list *list, char *rlt)
if (rlt) {
if (fclose(stdout) == EOF)
- bsdar_errc(bsdar, EX_IOERR, errno,
- "fclose %s failed", rlt);
+ bsdar_errc(bsdar, errno, "fclose %s failed", rlt);
stdout = out;
free(rlt);
}
@@ -490,7 +486,7 @@ arscp_save(void)
if (target) {
if (rename(tmpac, target) < 0)
- bsdar_errc(bsdar, EX_IOERR, errno, "rename failed");
+ bsdar_errc(bsdar, errno, "rename failed");
/*
* mkstemp creates temp files with mode 0600, here we
* set target archive mode per process umask.
@@ -498,7 +494,7 @@ arscp_save(void)
mask = umask(0);
umask(mask);
if (chmod(target, 0666 & ~mask) < 0)
- bsdar_errc(bsdar, EX_IOERR, errno, "chmod failed");
+ bsdar_errc(bsdar, errno, "chmod failed");
free(tmpac);
free(target);
tmpac = NULL;
@@ -520,7 +516,7 @@ arscp_clear(void)
if (target) {
new_target = strdup(target);
if (new_target == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "strdup failed");
+ bsdar_errc(bsdar, errno, "strdup failed");
arscp_create(NULL, new_target);
}
}
@@ -537,7 +533,7 @@ arscp_end(int eval)
free(target);
if (tmpac) {
if (unlink(tmpac) == -1)
- bsdar_errc(bsdar, EX_IOERR, errno, "unlink %s failed",
+ bsdar_errc(bsdar, errno, "unlink %s failed",
tmpac);
free(tmpac);
}
@@ -568,7 +564,7 @@ arscp_mlist(struct list *list, char *str)
l = malloc(sizeof(*l));
if (l == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "malloc failed");
+ bsdar_errc(bsdar, errno, "malloc failed");
l->str = str;
l->next = list;
@@ -610,12 +606,12 @@ arscp_mlist2argv(struct list *list)
n = arscp_mlist_len(list);
argv = malloc(n * sizeof(*argv));
if (argv == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "malloc failed");
+ bsdar_errc(bsdar, errno, "malloc failed");
/* Note that module names are stored in reverse order in mlist. */
for(i = n - 1; i >= 0; i--, list = list->next) {
if (list == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "invalid mlist");
+ bsdar_errc(bsdar, errno, "invalid mlist");
argv[i] = list->str;
}
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index b131163342a6..aceb4d7f8487 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -162,8 +162,7 @@ main(int argc, char **argv)
if (*argv[1] != '-') {
len = strlen(argv[1]) + 2;
if ((p = malloc(len)) == NULL)
- bsdar_errc(bsdar, EXIT_FAILURE, errno,
- "malloc failed");
+ bsdar_errc(bsdar, errno, "malloc failed");
*p = '-';
(void)strlcpy(p + 1, argv[1], len - 1);
argv[1] = p;
@@ -263,24 +262,20 @@ main(int argc, char **argv)
bsdar_usage();
if (bsdar->options & AR_A && bsdar->options & AR_B)
- bsdar_errc(bsdar, EXIT_FAILURE, 0,
+ bsdar_errc(bsdar, 0,
"only one of -a and -[bi] options allowed");
if (bsdar->options & AR_J && bsdar->options & AR_Z)
- bsdar_errc(bsdar, EXIT_FAILURE, 0,
- "only one of -j and -z options allowed");
+ bsdar_errc(bsdar, 0, "only one of -j and -z options allowed");
if (bsdar->options & AR_S && bsdar->options & AR_SS)
- bsdar_errc(bsdar, EXIT_FAILURE, 0,
- "only one of -s and -S options allowed");
+ bsdar_errc(bsdar, 0, "only one of -s and -S options allowed");
if (bsdar->options & (AR_A | AR_B)) {
if (*argv == NULL)
- bsdar_errc(bsdar, EXIT_FAILURE, 0,
- "no position operand specified");
+ bsdar_errc(bsdar, 0, "no position operand specified");
if ((bsdar->posarg = basename(*argv)) == NULL)
- bsdar_errc(bsdar, EXIT_FAILURE, errno,
- "basename failed");
+ bsdar_errc(bsdar, errno, "basename failed");
argc--;
argv++;
}
@@ -370,8 +365,8 @@ set_mode(struct bsdar *bsdar, char opt)
{
if (bsdar->mode != '\0' && bsdar->mode != opt)
- bsdar_errc(bsdar, EXIT_FAILURE, 0,
- "Can't specify both -%c and -%c", opt, bsdar->mode);
+ bsdar_errc(bsdar, 0, "Can't specify both -%c and -%c", opt,
+ bsdar->mode);
bsdar->mode = opt;
}
@@ -380,8 +375,8 @@ only_mode(struct bsdar *bsdar, const char *opt, const char *valid_modes)
{
if (strchr(valid_modes, bsdar->mode) == NULL)
- bsdar_errc(bsdar, EXIT_FAILURE, 0,
- "Option %s is not permitted in mode -%c", opt, bsdar->mode);
+ bsdar_errc(bsdar, 0, "Option %s is not permitted in mode -%c",
+ opt, bsdar->mode);
}
static void
diff --git a/usr.bin/ar/ar.h b/usr.bin/ar/ar.h
index 21b3a669a943..321680fed804 100644
--- a/usr.bin/ar/ar.h
+++ b/usr.bin/ar/ar.h
@@ -54,7 +54,7 @@
*/
#define AC(CALL) do { \
if ((CALL)) \
- bsdar_errc(bsdar, EXIT_FAILURE, archive_errno(a), "%s", \
+ bsdar_errc(bsdar, archive_errno(a), "%s", \
archive_error_string(a)); \
} while (0)
@@ -114,8 +114,7 @@ struct bsdar {
TAILQ_HEAD(, ar_obj) v_obj; /* object(member) list */
};
-void bsdar_errc(struct bsdar *, int _eval, int _code,
- const char *fmt, ...) __dead2;
+void bsdar_errc(struct bsdar *, int _code, const char *fmt, ...) __dead2;
void bsdar_warnc(struct bsdar *, int _code, const char *fmt, ...);
int ar_mode_d(struct bsdar *bsdar);
int ar_mode_m(struct bsdar *bsdar);
diff --git a/usr.bin/ar/read.c b/usr.bin/ar/read.c
index 04130b859c32..15044ab57a93 100644
--- a/usr.bin/ar/read.c
+++ b/usr.bin/ar/read.c
@@ -88,7 +88,7 @@ read_archive(struct bsdar *bsdar, char mode)
int exitcode, flags, r, i;
if ((a = archive_read_new()) == NULL)
- bsdar_errc(bsdar, EXIT_FAILURE, 0, "archive_read_new failed");
+ bsdar_errc(bsdar, 0, "archive_read_new failed");
archive_read_support_format_ar(a);
AC(archive_read_open_filename(a, bsdar->filename, DEF_BLKSZ));
@@ -122,7 +122,7 @@ read_archive(struct bsdar *bsdar, char mode)
if (*av == NULL)
continue;
if ((bname = basename(*av)) == NULL)
- bsdar_errc(bsdar, EXIT_FAILURE, errno,
+ bsdar_errc(bsdar, errno,
"basename failed");
if (strcmp(bname, name) != 0)
continue;
diff --git a/usr.bin/ar/util.c b/usr.bin/ar/util.c
index 1823c5eba84a..b130d6195e47 100644
--- a/usr.bin/ar/util.c
+++ b/usr.bin/ar/util.c
@@ -77,12 +77,12 @@ bsdar_verrc(struct bsdar *bsdar, int code, const char *fmt, va_list ap)
}
void
-bsdar_errc(struct bsdar *bsdar, int eval, int code, const char *fmt, ...)
+bsdar_errc(struct bsdar *bsdar, int code, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
bsdar_verrc(bsdar, code, fmt, ap);
va_end(ap);
- exit(eval);
+ exit(EXIT_FAILURE);
}
diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c
index 4177f57d064a..3c4b20e305da 100644
--- a/usr.bin/ar/write.c
+++ b/usr.bin/ar/write.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sysexits.h>
#include <unistd.h>
#include "ar.h"
@@ -133,7 +132,7 @@ create_obj_from_file(struct bsdar *bsdar, const char *name, time_t mtime)
obj = malloc(sizeof(struct ar_obj));
if (obj == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "malloc failed");
+ bsdar_errc(bsdar, errno, "malloc failed");
if ((obj->fd = open(name, O_RDONLY, 0)) < 0) {
bsdar_warnc(bsdar, errno, "can't open file: %s", name);
free(obj);
@@ -142,17 +141,17 @@ create_obj_from_file(struct bsdar *bsdar, const char *name, time_t mtime)
tmpname = strdup(name);
if (tmpname == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "strdup failed");
+ bsdar_errc(bsdar, errno, "strdup failed");
if ((bname = basename(tmpname)) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "basename failed");
+ bsdar_errc(bsdar, errno, "basename failed");
if (bsdar->options & AR_TR && strlen(bname) > _TRUNCATE_LEN) {
if ((obj->name = malloc(_TRUNCATE_LEN + 1)) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "malloc failed");
+ bsdar_errc(bsdar, errno, "malloc failed");
(void)strncpy(obj->name, bname, _TRUNCATE_LEN);
obj->name[_TRUNCATE_LEN] = '\0';
} else
if ((obj->name = strdup(bname)) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "strdup failed");
+ bsdar_errc(bsdar, errno, "strdup failed");
free(tmpname);
if (fstat(obj->fd, &sb) < 0) {
@@ -205,14 +204,14 @@ create_obj_from_file(struct bsdar *bsdar, const char *name, time_t mtime)
goto giveup;
}
if (close(obj->fd) < 0)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "close failed: %s",
+ bsdar_errc(bsdar, errno, "close failed: %s",
obj->name);
return (obj);
giveup:
if (close(obj->fd) < 0)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "close failed: %s",
+ bsdar_errc(bsdar, errno, "close failed: %s",
obj->name);
free(obj->name);
free(obj);
@@ -242,7 +241,7 @@ static void
insert_obj(struct bsdar *bsdar, struct ar_obj *obj, struct ar_obj *pos)
{
if (obj == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, 0, "try to insert a null obj");
+ bsdar_errc(bsdar, 0, "try to insert a null obj");
if (pos == NULL || obj == pos)
/*
@@ -285,13 +284,13 @@ read_objs(struct bsdar *bsdar, const char *archive, int checkargv)
int i, r, find;
if ((a = archive_read_new()) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed");
+ bsdar_errc(bsdar, 0, "archive_read_new failed");
archive_read_support_format_ar(a);
AC(archive_read_open_filename(a, archive, DEF_BLKSZ));
for (;;) {
r = archive_read_next_header(a, &entry);
if (r == ARCHIVE_FATAL)
- bsdar_errc(bsdar, EX_DATAERR, archive_errno(a), "%s",
+ bsdar_errc(bsdar, archive_errno(a), "%s",
archive_error_string(a));
if (r == ARCHIVE_EOF)
break;
@@ -322,7 +321,7 @@ read_objs(struct bsdar *bsdar, const char *archive, int checkargv)
if (*av == NULL)
continue;
if ((bname = basename(*av)) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno,
+ bsdar_errc(bsdar, errno,
"basename failed");
if (strcmp(bname, name) != 0)
continue;
@@ -339,8 +338,7 @@ read_objs(struct bsdar *bsdar, const char *archive, int checkargv)
if (size > 0) {
if ((buff = malloc(size)) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno,
- "malloc failed");
+ bsdar_errc(bsdar, errno, "malloc failed");
if (archive_read_data(a, buff, size) != (ssize_t)size) {
bsdar_warnc(bsdar, archive_errno(a), "%s",
archive_error_string(a));
@@ -352,10 +350,10 @@ read_objs(struct bsdar *bsdar, const char *archive, int checkargv)
obj = malloc(sizeof(struct ar_obj));
if (obj == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "malloc failed");
+ bsdar_errc(bsdar, errno, "malloc failed");
obj->maddr = buff;
if ((obj->name = strdup(name)) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "strdup failed");
+ bsdar_errc(bsdar, errno, "strdup failed");
obj->size = size;
obj->uid = archive_entry_uid(entry);
obj->gid = archive_entry_gid(entry);
@@ -476,8 +474,7 @@ write_archive(struct bsdar *bsdar, char mode)
TAILQ_FOREACH_SAFE(obj, &bsdar->v_obj, objs, obj_temp) {
if ((bname = basename(*av)) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno,
- "basename failed");
+ bsdar_errc(bsdar, errno, "basename failed");
if (bsdar->options & AR_TR) {
if (strncmp(bname, obj->name, _TRUNCATE_LEN))
continue;
@@ -605,7 +602,7 @@ write_data(struct bsdar *bsdar, struct archive *a, const void *buf, size_t s)
while (s > 0) {
written = archive_write_data(a, buf, s);
if (written < 0)
- bsdar_errc(bsdar, EX_SOFTWARE, archive_errno(a), "%s",
+ bsdar_errc(bsdar, archive_errno(a), "%s",
archive_error_string(a));
buf = (const char *)buf + written;
s -= written;
@@ -629,8 +626,8 @@ write_objs(struct bsdar *bsdar)
uint32_t nr32;
if (elf_version(EV_CURRENT) == EV_NONE)
- bsdar_errc(bsdar, EX_SOFTWARE, 0,
- "ELF library initialization failed: %s", elf_errmsg(-1));
+ bsdar_errc(bsdar, 0, "ELF library initialization failed: %s",
+ elf_errmsg(-1));
bsdar->rela_off = 0;
@@ -695,7 +692,7 @@ write_objs(struct bsdar *bsdar)
}
if ((a = archive_write_new()) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_write_new failed");
+ bsdar_errc(bsdar, 0, "archive_write_new failed");
archive_write_set_format_ar_svr4(a);
@@ -710,8 +707,7 @@ write_objs(struct bsdar *bsdar)
bsdar->options & AR_S) {
entry = archive_entry_new();
if (entry == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, 0,
- "archive_entry_new failed");
+ bsdar_errc(bsdar, 0, "archive_entry_new failed");
if (w_sz == sizeof(uint64_t))
archive_entry_copy_pathname(entry, "/SYM64/");
else
@@ -737,8 +733,7 @@ write_objs(struct bsdar *bsdar)
if (bsdar->as != NULL) {
entry = archive_entry_new();
if (entry == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, 0,
- "archive_entry_new failed");
+ bsdar_errc(bsdar, 0, "archive_entry_new failed");
archive_entry_copy_pathname(entry, "//");
archive_entry_set_size(entry, bsdar->as_sz);
AC(archive_write_header(a, entry));
@@ -750,8 +745,7 @@ write_objs(struct bsdar *bsdar)
TAILQ_FOREACH(obj, &bsdar->v_obj, objs) {
entry = archive_entry_new();
if (entry == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, 0,
- "archive_entry_new failed");
+ bsdar_errc(bsdar, 0, "archive_entry_new failed");
archive_entry_copy_pathname(entry, obj->name);
archive_entry_set_uid(entry, obj->uid);
archive_entry_set_gid(entry, obj->gid);
@@ -893,7 +887,7 @@ add_to_ar_str_table(struct bsdar *bsdar, const char *name)
bsdar->as_cap = _INIT_AS_CAP;
bsdar->as_sz = 0;
if ((bsdar->as = malloc(bsdar->as_cap)) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "malloc failed");
+ bsdar_errc(bsdar, errno, "malloc failed");
}
/*
@@ -904,7 +898,7 @@ add_to_ar_str_table(struct bsdar *bsdar, const char *name)
bsdar->as_cap *= 2;
bsdar->as = realloc(bsdar->as, bsdar->as_cap);
if (bsdar->as == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "realloc failed");
+ bsdar_errc(bsdar, errno, "realloc failed");
}
strncpy(&bsdar->as[bsdar->as_sz], name, strlen(name));
bsdar->as_sz += strlen(name);
@@ -922,14 +916,14 @@ add_to_ar_sym_table(struct bsdar *bsdar, const char *name)
if (bsdar->s_so == NULL) {
if ((bsdar->s_so = malloc(_INIT_SYMOFF_CAP)) ==
NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "malloc failed");
+ bsdar_errc(bsdar, errno, "malloc failed");
bsdar->s_so_cap = _INIT_SYMOFF_CAP;
bsdar->s_cnt = 0;
}
if (bsdar->s_sn == NULL) {
if ((bsdar->s_sn = malloc(_INIT_SYMNAME_CAP)) == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "malloc failed");
+ bsdar_errc(bsdar, errno, "malloc failed");
bsdar->s_sn_cap = _INIT_SYMNAME_CAP;
bsdar->s_sn_sz = 0;
}
@@ -938,7 +932,7 @@ add_to_ar_sym_table(struct bsdar *bsdar, const char *name)
bsdar->s_so_cap *= 2;
bsdar->s_so = realloc(bsdar->s_so, bsdar->s_so_cap);
if (bsdar->s_so == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "realloc failed");
+ bsdar_errc(bsdar, errno, "realloc failed");
}
bsdar->s_so[bsdar->s_cnt] = bsdar->rela_off;
if ((uint64_t)bsdar->rela_off > bsdar->s_so_max)
@@ -953,7 +947,7 @@ add_to_ar_sym_table(struct bsdar *bsdar, const char *name)
bsdar->s_sn_cap *= 2;
bsdar->s_sn = realloc(bsdar->s_sn, bsdar->s_sn_cap);
if (bsdar->s_sn == NULL)
- bsdar_errc(bsdar, EX_SOFTWARE, errno, "realloc failed");
+ bsdar_errc(bsdar, errno, "realloc failed");
}
strncpy(&bsdar->s_sn[bsdar->s_sn_sz], name, strlen(name));
bsdar->s_sn_sz += strlen(name);
More information about the dev-commits-src-all
mailing list