 @@ -1,14 +1,14 @@
-/*	$NetBSD: gzip.c,v 1.117 2021/06/24 07:16:49 simonb Exp $	*/
+/*	$NetBSD: gzip.c,v 1.118 2022/01/22 14:00:45 christos Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2015, 2017
  *    Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -21,27 +21,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008,\
 , 2010, 2011, 2015, 2017 Matthew R. Green.  All rights reserved.");
-__RCSID("$NetBSD: gzip.c,v 1.117 2021/06/24 07:16:49 simonb Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.118 2022/01/22 14:00:45 christos Exp $");
 #endif /* not lint */
 /*
  * gzip.c -- GPL free gzip using zlib.
+ *
  * RFC 1950 covers the zlib format
  * RFC 1951 covers the deflate format
  * RFC 1952 covers the gzip format
+ *
  * TODO:
  *	- use mmap where possible
  *	- handle some signals better (remove outfile?)
  *	- make bzip2/compress -v/-t/-l support work as well as possible
 @@ -55,26 +55,27 @@ __RCSID("$NetBSD: gzip.c,v 1.117 2021/06
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <zlib.h>
 #include <fts.h>
 #include <libgen.h>
 #include <stdarg.h>
 #include <getopt.h>
 #include <time.h>
 #include <paths.h>
 #ifndef PRIdOFF
 #define PRIdOFF PRId64
 #endif
 /* what type of file are we dealing with */
 enum filetype {
 	FT_GZIP,
 #ifndef NO_BZIP2_SUPPORT
 	FT_BZIP2,
 #endif
 #ifndef NO_COMPRESS_SUPPORT
 	FT_Z,
 @@ -1698,39 +1699,59 @@ file_uncompress(char *file, char *outfil
 	maybe_warnx("%s: unexpected end of file", file);
     lose:
 	if (fd != -1)
 		close(fd);
 	if (zfd != -1 && zfd != STDOUT_FILENO)
 		close(fd);
 	return -1;
+}
 #ifndef SMALL
 static void
 check_siginfo(void)
+{
 	static int ttyfd = -2;
 	char buf[2048];
 	int n;
 	if (print_info == 0)
 		return;
 	if (infile) {
-		if (infile_total) {
+	if (!infile)
-			int pcent = (int)((100.0 * infile_current) / infile_total);
+		goto out;
-			fprintf(stderr, "%s: done %llu/%llu bytes %d%%\n",
+	if (ttyfd == -2)
-				infile, (unsigned long long)infile_current,
+		ttyfd = open(_PATH_TTY, O_RDWR | O_CLOEXEC);
 				(unsigned long long)infile_total, pcent);
-		} else
+	if (ttyfd == -1)
-			fprintf(stderr, "%s: done %llu bytes\n",
+		goto out;
 				infile, (unsigned long long)infile_current);
 	if (infile_total) {
 		const double pcent = (100.0 * infile_current) / infile_total;
 		n = snprintf(buf, sizeof(buf),
 		    "%s: %s: done %ju/%ju bytes (%3.2f%%)\n",
 		    getprogname(), infile, (uintmax_t)infile_current,
 		    (uintmax_t)infile_total, pcent);
 	} else {
 		n = snprintf(buf, sizeof(buf), "%s: %s: done %ju bytes\n",
 		    getprogname(), infile, (uintmax_t)infile_current);
+	}
 	if (n <= 0)
 		goto out;
 	write(ttyfd, buf, (size_t)n);
 out:
 	print_info = 0;
+}
 static off_t
 cat_fd(unsigned char * prepend, size_t count, off_t *gsizep, int fd)
+{
 	char buf[BUFLEN];
 	off_t in_tot;
 	ssize_t w;
 	in_tot = count;
 	w = write_retry(STDOUT_FILENO, prepend, count);
 	if (w == -1 || (size_t)w != count) {
 @@ -1873,42 +1894,42 @@ out:
+}
 static void
 handle_stdout(void)
+{
 	off_t gsize;
 #ifndef SMALL
 	off_t usize;
 	struct stat sb;
 	time_t systime;
 	uint32_t mtime;
 	int ret;
-	infile_set("(stdout)", 0);
+	infile_set("<stdout>", 0);
 	if (fflag == 0 && isatty(STDOUT_FILENO)) {
 		maybe_warnx("standard output is a terminal -- ignoring");
 		return;
+	}
 	/* If stdin is a file use its mtime, otherwise use current time */
 	ret = fstat(STDIN_FILENO, &sb);
 	if (ret < 0) {
 		maybe_warn("Can't stat stdin");
 		return;
+	}
 	if (S_ISREG(sb.st_mode)) {
-		infile_set("(stdout)", sb.st_size);
+		infile_set("<stdout>", sb.st_size);
 		mtime = (uint32_t)sb.st_mtime;
 	} else {
 		systime = time(NULL);
 		if (systime == -1) {
 			maybe_warn("time");
 			return;
+		}
 		mtime = (uint32_t)systime;
+	}
 	usize =
 #endif
 		gz_compress(STDIN_FILENO, STDOUT_FILENO, &gsize, "", mtime);