From 9c4549c6e4d975cb8e84cd9800ea07eea5f2167f Mon Sep 17 00:00:00 2001 From: jca Date: Mon, 4 Sep 2023 17:05:34 +0000 Subject: [PATCH] Zap #ifndef SMALL around pax format read support -DSMALL has never been used to build the ramdisks, thus the support for reading pax format archives has always been there. This is misleading, so just zap the ifdef since we want to keep read support. Went through a make release Just In Case(tm). Spotted by caspar@, ok millert@ sthen@ caspar@ --- bin/pax/tar.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/bin/pax/tar.c b/bin/pax/tar.c index 5876d5ceeb6..d3eb5daec17 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tar.c,v 1.72 2023/08/19 04:21:05 guenther Exp $ */ +/* $OpenBSD: tar.c,v 1.73 2023/09/04 17:05:34 jca Exp $ */ /* $NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $ */ /*- @@ -59,9 +59,7 @@ static u_long tar_chksm(char *, int); static char *name_split(char *, int); static int ul_oct(u_long, char *, int, int); static int ull_oct(unsigned long long, char *, int, int); -#ifndef SMALL static int rd_xheader(ARCHD *arcn, int, off_t); -#endif static uid_t uid_nobody; static uid_t uid_warn; @@ -721,14 +719,11 @@ ustar_rd(ARCHD *arcn, char *buf) if (ustar_id(buf, BLKMULT) < 0) return(-1); -#ifndef SMALL reset: -#endif memset(arcn, 0, sizeof(*arcn)); arcn->org_name = arcn->name; arcn->sb.st_nlink = 1; -#ifndef SMALL /* Process Extended headers. */ if (hd->typeflag == XHDRTYPE || hd->typeflag == GHDRTYPE) { if (rd_xheader(arcn, hd->typeflag == GHDRTYPE, @@ -745,7 +740,6 @@ reset: if (hd->typeflag == XHDRTYPE || hd->typeflag == GHDRTYPE) goto reset; } -#endif if (!arcn->nlen) { /* @@ -1190,8 +1184,6 @@ expandname(char *buf, size_t len, char **gnu_name, const char *name, return(nlen); } -#ifndef SMALL - /* shortest possible extended record: "5 a=\n" */ #define MINXHDRSZ 5 @@ -1331,4 +1323,3 @@ rd_xheader(ARCHD *arcn, int global, off_t size) return (-1); return (ret); } -#endif -- 2.20.1