D25922.1793649306.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D25922.1793649306.diff
View Options

	Index: bin/echo/echo.c
	===================================================================
	--- bin/echo/echo.c
	+++ bin/echo/echo.c
	@@ -55,23 +55,6 @@
	#include <string.h>
	#include <unistd.h>

	-/*
	- * Report an error and exit.
	- * Use it instead of err(3) to avoid linking-in stdio.
	- */
	-static __dead2 void
	-errexit(const char prog, const char reason)
	-{
	- char *errstr = strerror(errno);
	- write(STDERR_FILENO, prog, strlen(prog));
	- write(STDERR_FILENO, ": ", 2);
	- write(STDERR_FILENO, reason, strlen(reason));
	- write(STDERR_FILENO, ": ", 2);
	- write(STDERR_FILENO, errstr, strlen(errstr));
	- write(STDERR_FILENO, "\n", 1);
	- exit(1);
	-}
	-
	int
	main(int argc, char *argv[])
	{
	@@ -80,7 +63,6 @@
	struct iovec iov, vp; /* Elements to write, current element. */
	char space[] = " ";
	char newline[] = "\n";
	- char *progname = argv[0];

	if (caph_limit_stdio() < 0 \|\| caph_enter() < 0)
	err(1, "capsicum");
	@@ -96,7 +78,7 @@
	veclen = (argc >= 2) ? (argc - 2) * 2 + 1 : 0;

	if ((vp = iov = malloc((veclen + 1) * sizeof(struct iovec))) == NULL)
	- errexit(progname, "malloc");
	+ err(1, "malloc");

	while (argv[0] != NULL) {
	size_t len;
	@@ -136,7 +118,7 @@

	nwrite = (veclen > IOV_MAX) ? IOV_MAX : veclen;
	if (writev(STDOUT_FILENO, iov, nwrite) == -1)
	- errexit(progname, "write");
	+ err(1, "write");
	iov += nwrite;
	veclen -= nwrite;
	}