Page MenuHomeFreeBSD
Differential D35813

Makefile.inc1 release bsd.own.mk: Introduce and use TAR_CMD
ClosedPublic
Actions

Authored by jrtc27 on Jul 14 2022, 12:13 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 7, 4:20 PM
Unknown Object (File)
Feb 24 2025, 10:33 AM
Unknown Object (File)
Feb 18 2025, 7:23 PM
Unknown Object (File)
Feb 11 2025, 12:20 AM
Unknown Object (File)
Feb 10 2025, 11:39 PM
Unknown Object (File)
Feb 10 2025, 12:37 PM
Unknown Object (File)
Jan 27 2025, 3:04 AM
Unknown Object (File)
Jan 27 2025, 12:33 AM
View All 62 Files
Subscribers
bdrewery
delphij

Details

Reviewers
brooks
emaste
imp
delphij
gjb
Group Reviewers
releng
Commits
rGfcf120815897: Makefile.inc1 release bsd.own.mk: Introduce and use TAR_CMD
Summary

Our uses of tar rely on BSDisms, and so do not work in environments
where GNU tar is the default tar. Providing a TAR_CMD variable like
some other commands allows it to be overridden to use bsdtar in such
cases.

Obtained from: CheriBSD

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
24 lines
release/
4 lines
share/
mk/
2 lines

Diff 108213

View Options

Makefile.inc1

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Linescap_openlog(cap_channel_t *chan, const char *ident, int logopt, int facility)
nvl = nvlist_create(0); nvl = nvlist_create(0);
nvlist_add_string(nvl, "cmd", "openlog"); nvlist_add_string(nvl, "cmd", "openlog");
if (ident != NULL) { if (ident != NULL) {
nvlist_add_string(nvl, "ident", ident); nvlist_add_string(nvl, "ident", ident);
} }
nvlist_add_number(nvl, "logopt", logopt); nvlist_add_number(nvl, "logopt", logopt);
nvlist_add_number(nvl, "facility", facility); nvlist_add_number(nvl, "facility", facility);
if (logopt & LOG_PERROR) {
nvlist_add_descriptor(nvl, "stderr", STDERR_FILENO);
}
nvl = cap_xfer_nvlist(chan, nvl); nvl = cap_xfer_nvlist(chan, nvl);
if (nvl == NULL) { if (nvl == NULL) {
return; return;
} }
nvlist_destroy(nvl); nvlist_destroy(nvl);
} }
void void
Show All 27 Linescap_setlogmask(cap_channel_t *chan, int maskpri)
return (omask); return (omask);
} }
/* /*
* Service functions. * Service functions.
*/ */
static char *LogTag; static char *LogTag;
static int prev_stderr = -1;
static void static void
slog_vsyslog(const nvlist_t *limits __unused, const nvlist_t *nvlin, slog_vsyslog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
nvlist_t *nvlout __unused) nvlist_t *nvlout __unused)
{ {
syslog(nvlist_get_number(nvlin, "priority"), "%s", syslog(nvlist_get_number(nvlin, "priority"), "%s",
nvlist_get_string(nvlin, "message")); nvlist_get_string(nvlin, "message"));
} }
static void static void
slog_openlog(const nvlist_t *limits __unused, const nvlist_t *nvlin, slog_openlog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
nvlist_t *nvlout __unused) nvlist_t *nvlout __unused)
{ {
const char *ident; const char *ident;
uint64_t logopt;
int stderr_fd;
ident = dnvlist_get_string(nvlin, "ident", NULL); ident = dnvlist_get_string(nvlin, "ident", NULL);
if (ident != NULL) { if (ident != NULL) {
free(LogTag); free(LogTag);
LogTag = strdup(ident); LogTag = strdup(ident);
} }
openlog(LogTag, nvlist_get_number(nvlin, "logopt"), logopt = nvlist_get_number(nvlin, "logopt");
nvlist_get_number(nvlin, "facility")); if (logopt & LOG_PERROR) {
stderr_fd = dnvlist_get_descriptor(nvlin, "stderr", -1);
if (prev_stderr == -1)
prev_stderr = dup(STDERR_FILENO);
if (prev_stderr != -1)
(void)dup2(stderr_fd, STDERR_FILENO);
} else if (prev_stderr != -1) {
(void)dup2(prev_stderr, STDERR_FILENO);
close(prev_stderr);
prev_stderr = -1;
} }
openlog(LogTag, logopt, nvlist_get_number(nvlin, "facility"));
}
static void static void
slog_closelog(const nvlist_t *limits __unused, const nvlist_t *nvlin __unused, slog_closelog(const nvlist_t *limits __unused, const nvlist_t *nvlin __unused,
nvlist_t *nvlout __unused) nvlist_t *nvlout __unused)
{ {
closelog(); closelog();
free(LogTag); free(LogTag);
LogTag = NULL; LogTag = NULL;
if (prev_stderr != -1) {
(void)dup2(prev_stderr, STDERR_FILENO);
close(prev_stderr);
prev_stderr = -1;
} }
}
static void static void
slog_setlogmask(const nvlist_t *limits __unused, const nvlist_t *nvlin, slog_setlogmask(const nvlist_t *limits __unused, const nvlist_t *nvlin,
nvlist_t *nvlout) nvlist_t *nvlout)
{ {
int omask; int omask;
omask = setlogmask(nvlist_get_number(nvlin, "maskpri")); omask = setlogmask(nvlist_get_number(nvlin, "maskpri"));
Show All 15 Lines if (strcmp(cmd, "vsyslog") == 0) {
slog_setlogmask(limits, nvlin, nvlout); slog_setlogmask(limits, nvlin, nvlout);
} else { } else {
return (EINVAL); return (EINVAL);
} }
return (0); return (0);
} }
CREATE_SERVICE("system.syslog", NULL, syslog_command, CASPER_SERVICE_STDIO); CREATE_SERVICE("system.syslog", NULL, syslog_command, 0);
View Options

release/Makefile

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Linescap_openlog(cap_channel_t *chan, const char *ident, int logopt, int facility)
nvl = nvlist_create(0); nvl = nvlist_create(0);
nvlist_add_string(nvl, "cmd", "openlog"); nvlist_add_string(nvl, "cmd", "openlog");
if (ident != NULL) { if (ident != NULL) {
nvlist_add_string(nvl, "ident", ident); nvlist_add_string(nvl, "ident", ident);
} }
nvlist_add_number(nvl, "logopt", logopt); nvlist_add_number(nvl, "logopt", logopt);
nvlist_add_number(nvl, "facility", facility); nvlist_add_number(nvl, "facility", facility);
if (logopt & LOG_PERROR) {
nvlist_add_descriptor(nvl, "stderr", STDERR_FILENO);
}
nvl = cap_xfer_nvlist(chan, nvl); nvl = cap_xfer_nvlist(chan, nvl);
if (nvl == NULL) { if (nvl == NULL) {
return; return;
} }
nvlist_destroy(nvl); nvlist_destroy(nvl);
} }
void void
Show All 27 Linescap_setlogmask(cap_channel_t *chan, int maskpri)
return (omask); return (omask);
} }
/* /*
* Service functions. * Service functions.
*/ */
static char *LogTag; static char *LogTag;
static int prev_stderr = -1;
static void static void
slog_vsyslog(const nvlist_t *limits __unused, const nvlist_t *nvlin, slog_vsyslog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
nvlist_t *nvlout __unused) nvlist_t *nvlout __unused)
{ {
syslog(nvlist_get_number(nvlin, "priority"), "%s", syslog(nvlist_get_number(nvlin, "priority"), "%s",
nvlist_get_string(nvlin, "message")); nvlist_get_string(nvlin, "message"));
} }
static void static void
slog_openlog(const nvlist_t *limits __unused, const nvlist_t *nvlin, slog_openlog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
nvlist_t *nvlout __unused) nvlist_t *nvlout __unused)
{ {
const char *ident; const char *ident;
uint64_t logopt;
int stderr_fd;
ident = dnvlist_get_string(nvlin, "ident", NULL); ident = dnvlist_get_string(nvlin, "ident", NULL);
if (ident != NULL) { if (ident != NULL) {
free(LogTag); free(LogTag);
LogTag = strdup(ident); LogTag = strdup(ident);
} }
openlog(LogTag, nvlist_get_number(nvlin, "logopt"), logopt = nvlist_get_number(nvlin, "logopt");
nvlist_get_number(nvlin, "facility")); if (logopt & LOG_PERROR) {
stderr_fd = dnvlist_get_descriptor(nvlin, "stderr", -1);
if (prev_stderr == -1)
prev_stderr = dup(STDERR_FILENO);
if (prev_stderr != -1)
(void)dup2(stderr_fd, STDERR_FILENO);
} else if (prev_stderr != -1) {
(void)dup2(prev_stderr, STDERR_FILENO);
close(prev_stderr);
prev_stderr = -1;
} }
openlog(LogTag, logopt, nvlist_get_number(nvlin, "facility"));
}
static void static void
slog_closelog(const nvlist_t *limits __unused, const nvlist_t *nvlin __unused, slog_closelog(const nvlist_t *limits __unused, const nvlist_t *nvlin __unused,
nvlist_t *nvlout __unused) nvlist_t *nvlout __unused)
{ {
closelog(); closelog();
free(LogTag); free(LogTag);
LogTag = NULL; LogTag = NULL;
if (prev_stderr != -1) {
(void)dup2(prev_stderr, STDERR_FILENO);
close(prev_stderr);
prev_stderr = -1;
} }
}
static void static void
slog_setlogmask(const nvlist_t *limits __unused, const nvlist_t *nvlin, slog_setlogmask(const nvlist_t *limits __unused, const nvlist_t *nvlin,
nvlist_t *nvlout) nvlist_t *nvlout)
{ {
int omask; int omask;
omask = setlogmask(nvlist_get_number(nvlin, "maskpri")); omask = setlogmask(nvlist_get_number(nvlin, "maskpri"));
Show All 15 Lines if (strcmp(cmd, "vsyslog") == 0) {
slog_setlogmask(limits, nvlin, nvlout); slog_setlogmask(limits, nvlin, nvlout);
} else { } else {
return (EINVAL); return (EINVAL);
} }
return (0); return (0);
} }
CREATE_SERVICE("system.syslog", NULL, syslog_command, CASPER_SERVICE_STDIO); CREATE_SERVICE("system.syslog", NULL, syslog_command, 0);
View Options

share/mk/bsd.own.mk

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Linescap_openlog(cap_channel_t *chan, const char *ident, int logopt, int facility)
nvl = nvlist_create(0); nvl = nvlist_create(0);
nvlist_add_string(nvl, "cmd", "openlog"); nvlist_add_string(nvl, "cmd", "openlog");
if (ident != NULL) { if (ident != NULL) {
nvlist_add_string(nvl, "ident", ident); nvlist_add_string(nvl, "ident", ident);
} }
nvlist_add_number(nvl, "logopt", logopt); nvlist_add_number(nvl, "logopt", logopt);
nvlist_add_number(nvl, "facility", facility); nvlist_add_number(nvl, "facility", facility);
if (logopt & LOG_PERROR) {
nvlist_add_descriptor(nvl, "stderr", STDERR_FILENO);
}
nvl = cap_xfer_nvlist(chan, nvl); nvl = cap_xfer_nvlist(chan, nvl);
if (nvl == NULL) { if (nvl == NULL) {
return; return;
} }
nvlist_destroy(nvl); nvlist_destroy(nvl);
} }
void void
Show All 27 Linescap_setlogmask(cap_channel_t *chan, int maskpri)
return (omask); return (omask);
} }
/* /*
* Service functions. * Service functions.
*/ */
static char *LogTag; static char *LogTag;
static int prev_stderr = -1;
static void static void
slog_vsyslog(const nvlist_t *limits __unused, const nvlist_t *nvlin, slog_vsyslog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
nvlist_t *nvlout __unused) nvlist_t *nvlout __unused)
{ {
syslog(nvlist_get_number(nvlin, "priority"), "%s", syslog(nvlist_get_number(nvlin, "priority"), "%s",
nvlist_get_string(nvlin, "message")); nvlist_get_string(nvlin, "message"));
} }
static void static void
slog_openlog(const nvlist_t *limits __unused, const nvlist_t *nvlin, slog_openlog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
nvlist_t *nvlout __unused) nvlist_t *nvlout __unused)
{ {
const char *ident; const char *ident;
uint64_t logopt;
int stderr_fd;
ident = dnvlist_get_string(nvlin, "ident", NULL); ident = dnvlist_get_string(nvlin, "ident", NULL);
if (ident != NULL) { if (ident != NULL) {
free(LogTag); free(LogTag);
LogTag = strdup(ident); LogTag = strdup(ident);
} }
openlog(LogTag, nvlist_get_number(nvlin, "logopt"), logopt = nvlist_get_number(nvlin, "logopt");
nvlist_get_number(nvlin, "facility")); if (logopt & LOG_PERROR) {
stderr_fd = dnvlist_get_descriptor(nvlin, "stderr", -1);
if (prev_stderr == -1)
prev_stderr = dup(STDERR_FILENO);
if (prev_stderr != -1)
(void)dup2(stderr_fd, STDERR_FILENO);
} else if (prev_stderr != -1) {
(void)dup2(prev_stderr, STDERR_FILENO);
close(prev_stderr);
prev_stderr = -1;
} }
openlog(LogTag, logopt, nvlist_get_number(nvlin, "facility"));
}
static void static void
slog_closelog(const nvlist_t *limits __unused, const nvlist_t *nvlin __unused, slog_closelog(const nvlist_t *limits __unused, const nvlist_t *nvlin __unused,
nvlist_t *nvlout __unused) nvlist_t *nvlout __unused)
{ {
closelog(); closelog();
free(LogTag); free(LogTag);
LogTag = NULL; LogTag = NULL;
if (prev_stderr != -1) {
(void)dup2(prev_stderr, STDERR_FILENO);
close(prev_stderr);
prev_stderr = -1;
} }
}
static void static void
slog_setlogmask(const nvlist_t *limits __unused, const nvlist_t *nvlin, slog_setlogmask(const nvlist_t *limits __unused, const nvlist_t *nvlin,
nvlist_t *nvlout) nvlist_t *nvlout)
{ {
int omask; int omask;
omask = setlogmask(nvlist_get_number(nvlin, "maskpri")); omask = setlogmask(nvlist_get_number(nvlin, "maskpri"));
Show All 15 Lines if (strcmp(cmd, "vsyslog") == 0) {
slog_setlogmask(limits, nvlin, nvlout); slog_setlogmask(limits, nvlin, nvlout);
} else { } else {
return (EINVAL); return (EINVAL);
} }
return (0); return (0);
} }
CREATE_SERVICE("system.syslog", NULL, syslog_command, CASPER_SERVICE_STDIO); CREATE_SERVICE("system.syslog", NULL, syslog_command, 0);