X-Git-Url: https://git.saurik.com/apple/file_cmds.git/blobdiff_plain/44a7a5ab64e9df65e241260d76d3dac1160b3360..39aaa94bf0a1c68b3fe15e3622c96766f0f22ff2:/mtree/create.c

diff --git a/mtree/create.c b/mtree/create.c
index 7487de1..66992a7 100644
--- a/mtree/create.c
+++ b/mtree/create.c
@@ -1,5 +1,3 @@
-/*	$NetBSD: create.c,v 1.16 1998/08/30 03:20:09 nathanw Exp $	*/
-
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -12,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,236 +27,459 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: create.c,v 1.16 1998/08/30 03:20:09 nathanw Exp $");
-#endif
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/create.c,v 1.37 2005/03/29 11:44:17 tobez Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fts.h>
 #include <grp.h>
+#ifndef __APPLE__
+#ifdef ENABLE_MD5
+#include <md5.h>
+#endif
+#ifdef ENABLE_SHA1
+#include <sha.h>
+#endif
+#ifdef ENABLE_RMD160
+#include <ripemd.h>
+#endif
+#ifdef ENABLE_SHA256
+#include <sha256.h>
+#endif
+#endif /* !__APPLE__ */
 #include <pwd.h>
+#include <stdint.h>
 #include <stdio.h>
-#include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <vis.h>
 #include "mtree.h"
 #include "extern.h"
 
+#ifdef __APPLE__
+#include "commoncrypto.h"
+#endif /* __APPLE__ */
+
 #define	INDENTNAMELEN	15
 #define	MAXLINELEN	80
 
-extern int crc_total, ftsoptions;
-extern int dflag, sflag;
-extern u_short keys;
-extern char fullpath[MAXPATHLEN];
-
 static gid_t gid;
 static uid_t uid;
 static mode_t mode;
+static u_long flags = 0xffffffff;
+static char *xattrs = kNone;
+static char *acl = kNone;
 
-static int	dsort __P((const FTSENT **, const FTSENT **));
-static void	output __P((int *, const char *, ...));
-static int	statd __P((FTS *, FTSENT *, uid_t *, gid_t *, mode_t *));
-static void	statf __P((FTSENT *));
+static int	dsort(const FTSENT **, const FTSENT **);
+static void	output(int, int *, const char *, ...) __printflike(3, 4);
+static int	statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, u_long *, char **, char **);
+static void	statf(int, FTSENT *);
 
 void
-cwalk()
+cwalk(void)
 {
 	FTS *t;
 	FTSENT *p;
-	time_t clock;
-	char *argv[2], host[MAXHOSTNAMELEN + 1];
+	time_t cl;
+	char *argv[2], host[MAXHOSTNAMELEN];
+	char dot[] = ".";
+	int indent = 0;
+	char *path;
 
-	(void)time(&clock);
-	(void)gethostname(host, sizeof(host));
-	host[sizeof(host) - 1] = '\0';
-	(void)printf(
-	    "#\t   user: %s\n#\tmachine: %s\n#\t   tree: %s\n#\t   date: %s",
-	    getlogin(), host, fullpath, ctime(&clock));
+	if (!nflag) {
+		(void)time(&cl);
+		(void)gethostname(host, sizeof(host));
+		(void)printf(
+		    "#\t   user: %s\n#\tmachine: %s\n",
+		    getlogin(), host);
+		(void)printf(
+		    "#\t   tree: %s\n#\t   date: %s",
+		    fullpath, ctime(&cl));
+	}
 
-	argv[0] = ".";
+	argv[0] = dot;
 	argv[1] = NULL;
 	if ((t = fts_open(argv, ftsoptions, dsort)) == NULL)
-		mtree_err("fts_open: %s", strerror(errno));
-	while ((p = fts_read(t)) != NULL)
+		err(1, "fts_open()");
+	while ((p = fts_read(t))) {
+		if (iflag)
+			indent = p->fts_level * 4;
+		if (check_excludes(p->fts_name, p->fts_path)) {
+			fts_set(t, p, FTS_SKIP);
+			continue;
+		}
 		switch(p->fts_info) {
 		case FTS_D:
-			(void)printf("\n# %s\n", p->fts_path);
-			statd(t, p, &uid, &gid, &mode);
-			statf(p);
+			if (!dflag)
+				(void)printf("\n");
+			if (!nflag) {
+				path = escape_path(p->fts_path);
+				(void)printf("# %s\n", path);
+				free(path);
+			}
+			statd(t, p, &uid, &gid, &mode, &flags, &xattrs, &acl);
+			statf(indent, p);
 			break;
 		case FTS_DP:
-			if (p->fts_level > 0)
-				(void)printf("# %s\n..\n\n", p->fts_path);
+			if (!nflag && (p->fts_level > 0)) {
+				path = escape_path(p->fts_path);
+				(void)printf("%*s# %s\n", indent, "", path);
+				free(path);
+			}
+			(void)printf("%*s..\n", indent, "");
+			if (!dflag)
+				(void)printf("\n");
 			break;
 		case FTS_DNR:
 		case FTS_ERR:
 		case FTS_NS:
-			(void)fprintf(stderr,
-			    "mtree: %s: %s\n", p->fts_path, strerror(errno));
+			warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
 			break;
 		default:
 			if (!dflag)
-				statf(p);
+				statf(indent, p);
 			break;
-			
+
 		}
+	}
 	(void)fts_close(t);
 	if (sflag && keys & F_CKSUM)
-		(void)fprintf(stderr,
-		    "mtree: %s checksum: %u\n", fullpath, crc_total);
+		warnx("%s checksum: %lu", fullpath, (unsigned long)crc_total);
 }
 
 static void
-statf(p)
-	FTSENT *p;
+statf(int indent, FTSENT *p)
 {
 	struct group *gr;
 	struct passwd *pw;
-	u_int32_t len, val;
-	int fd, indent;
+	uint32_t val;
+	off_t len;
+	int fd, offset;
+	char *fflags;
+	char *escaped_name;
+
+	escaped_name = calloc(1, p->fts_namelen * 4  +  1);
+	if (escaped_name == NULL)
+		errx(1, "statf(): calloc() failed");
+	strvis(escaped_name, p->fts_name, VIS_WHITE | VIS_OCTAL | VIS_GLOB);
 
-	if (S_ISDIR(p->fts_statp->st_mode))
-		indent = printf("%s", p->fts_name); 
+	if (iflag || S_ISDIR(p->fts_statp->st_mode))
+		offset = printf("%*s%s", indent, "", escaped_name);
 	else
-		indent = printf("    %s", p->fts_name);
+		offset = printf("%*s    %s", indent, "", escaped_name);
 
-	if (indent > INDENTNAMELEN)
-		indent = MAXLINELEN;
+	free(escaped_name);
+
+	if (offset > (INDENTNAMELEN + indent))
+		offset = MAXLINELEN;
 	else
-		indent += printf("%*s", INDENTNAMELEN - indent, "");
+		offset += printf("%*s", (INDENTNAMELEN + indent) - offset, "");
 
-	if (!S_ISREG(p->fts_statp->st_mode))
-		output(&indent, "type=%s", inotype(p->fts_statp->st_mode));
-	if (keys & (F_UID | F_UNAME) && p->fts_statp->st_uid != uid) {
-		if (keys & F_UNAME && (pw = getpwuid(p->fts_statp->st_uid)))
-			output(&indent, "uname=%s", pw->pw_name);
-		else /* if (keys & F_UID) */
-			output(&indent, "uid=%u", p->fts_statp->st_uid);
+	if (!S_ISREG(p->fts_statp->st_mode) && !dflag)
+		output(indent, &offset, "type=%s", inotype(p->fts_statp->st_mode));
+	if (p->fts_statp->st_uid != uid) {
+		if (keys & F_UNAME) {
+			pw = getpwuid(p->fts_statp->st_uid);
+			if (pw != NULL)
+				output(indent, &offset, "uname=%s", pw->pw_name);
+			else if (wflag)
+				warnx("Could not get uname for uid=%u",
+				    p->fts_statp->st_uid);
+			else
+				errx(1,
+				    "Could not get uname for uid=%u",
+				    p->fts_statp->st_uid);
+		}
+		if (keys & F_UID)
+			output(indent, &offset, "uid=%u", p->fts_statp->st_uid);
 	}
-	if (keys & (F_GID | F_GNAME) && p->fts_statp->st_gid != gid) {
-		if (keys & F_GNAME && (gr = getgrgid(p->fts_statp->st_gid)))
-			output(&indent, "gname=%s", gr->gr_name);
-		else /* if (keys & F_GID) */
-			output(&indent, "gid=%u", p->fts_statp->st_gid);
+	if (p->fts_statp->st_gid != gid) {
+		if (keys & F_GNAME) {
+			gr = getgrgid(p->fts_statp->st_gid);
+			if (gr != NULL)
+				output(indent, &offset, "gname=%s", gr->gr_name);
+			else if (wflag)
+				warnx("Could not get gname for gid=%u",
+				    p->fts_statp->st_gid);
+			else
+				errx(1,
+				    "Could not get gname for gid=%u",
+				    p->fts_statp->st_gid);
+		}
+		if (keys & F_GID)
+			output(indent, &offset, "gid=%u", p->fts_statp->st_gid);
 	}
 	if (keys & F_MODE && (p->fts_statp->st_mode & MBITS) != mode)
-		output(&indent, "mode=%#o", p->fts_statp->st_mode & MBITS);
+		output(indent, &offset, "mode=%#o", p->fts_statp->st_mode & MBITS);
 	if (keys & F_NLINK && p->fts_statp->st_nlink != 1)
-		output(&indent, "nlink=%u", p->fts_statp->st_nlink);
-	if (keys & F_SIZE && S_ISREG(p->fts_statp->st_mode))
-		output(&indent, "size=%qd", p->fts_statp->st_size);
+		output(indent, &offset, "nlink=%u", p->fts_statp->st_nlink);
+	if (keys & F_SIZE)
+		output(indent, &offset, "size=%jd",
+		    (intmax_t)p->fts_statp->st_size);
 	if (keys & F_TIME)
-		output(&indent, "time=%ld.%ld",
-		    p->fts_statp->st_mtimespec.tv_sec,
+		output(indent, &offset, "time=%ld.%09ld",
+		    (long)p->fts_statp->st_mtimespec.tv_sec,
 		    p->fts_statp->st_mtimespec.tv_nsec);
 	if (keys & F_CKSUM && S_ISREG(p->fts_statp->st_mode)) {
 		if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0 ||
 		    crc(fd, &val, &len))
-			mtree_err("%s: %s", p->fts_accpath, strerror(errno));
+			err(1, "%s", p->fts_accpath);
 		(void)close(fd);
-		output(&indent, "cksum=%lu", val);
+		output(indent, &offset, "cksum=%lu", (unsigned long)val);
+	}
+#ifdef ENABLE_MD5
+	if (keys & F_MD5 && S_ISREG(p->fts_statp->st_mode)) {
+		char *digest, buf[33];
+
+		digest = MD5File(p->fts_accpath, buf);
+		if (!digest)
+			err(1, "%s", p->fts_accpath);
+		output(indent, &offset, "md5digest=%s", digest);
+	}
+#endif /* ENABLE_MD5 */
+#ifdef ENABLE_SHA1
+	if (keys & F_SHA1 && S_ISREG(p->fts_statp->st_mode)) {
+		char *digest, buf[41];
+
+		digest = SHA1_File(p->fts_accpath, buf);
+		if (!digest)
+			err(1, "%s", p->fts_accpath);
+		output(indent, &offset, "sha1digest=%s", digest);
 	}
+#endif /* ENABLE_SHA1 */
+#ifdef ENABLE_RMD160
+	if (keys & F_RMD160 && S_ISREG(p->fts_statp->st_mode)) {
+		char *digest, buf[41];
+
+		digest = RIPEMD160_File(p->fts_accpath, buf);
+		if (!digest)
+			err(1, "%s", p->fts_accpath);
+		output(indent, &offset, "ripemd160digest=%s", digest);
+	}
+#endif /* ENABLE_RMD160 */
+#ifdef ENABLE_SHA256
+	if (keys & F_SHA256 && S_ISREG(p->fts_statp->st_mode)) {
+		char *digest, buf[kSHA256NullTerminatedBuffLen];
+
+		digest = SHA256_File(p->fts_accpath, buf);
+		if (!digest)
+			err(1, "%s", p->fts_accpath);
+		output(indent, &offset, "sha256digest=%s", digest);
+	}
+#endif /* ENABLE_SHA256 */
 	if (keys & F_SLINK &&
-	    (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE))
-		output(&indent, "link=%s", rlink(p->fts_accpath));
+	    (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
+		char visbuf[MAXPATHLEN * 4];
+		char *s = rlink(p->fts_accpath);
+		strvis(visbuf, s, VIS_WHITE | VIS_OCTAL);
+		output(indent, &offset, "link=%s", visbuf);
+	}
+	if (keys & F_FLAGS && p->fts_statp->st_flags != flags) {
+		fflags = flags_to_string(p->fts_statp->st_flags);
+		output(indent, &offset, "flags=%s", fflags);
+		free(fflags);
+	}
+	if (keys & F_BTIME) {
+		output(indent, &offset, "btime=%ld.%09ld",
+		       p->fts_statp->st_birthtimespec.tv_sec,
+		       p->fts_statp->st_birthtimespec.tv_nsec);
+	}
+	// only check access time on regular files, as traversing a folder will update its access time
+	if (keys & F_ATIME && S_ISREG(p->fts_statp->st_mode)) {
+		output(indent, &offset, "atime=%ld.%09ld",
+		       p->fts_statp->st_atimespec.tv_sec,
+		       p->fts_statp->st_atimespec.tv_nsec);
+	}
+	if (keys & F_CTIME) {
+		output(indent, &offset, "ctime=%ld.%09ld",
+		       p->fts_statp->st_ctimespec.tv_sec,
+		       p->fts_statp->st_ctimespec.tv_nsec);
+	}
+	// date added to parent folder is only supported for files and directories
+	if (keys & F_PTIME && (S_ISREG(p->fts_statp->st_mode) ||
+			       S_ISDIR(p->fts_statp->st_mode))) {
+		int supported;
+		struct timespec ptimespec = ptime(p->fts_accpath, &supported);
+		if (supported) {
+			output(indent, &offset, "ptime=%ld.%09ld",
+			       ptimespec.tv_sec,
+			       ptimespec.tv_nsec);
+		}
+	}
+	if (keys & F_XATTRS) {
+		char *digest, buf[kSHA256NullTerminatedBuffLen];
+		
+		digest = SHA256_Path_XATTRs(p->fts_accpath, buf);
+		if (digest && (strcmp(digest, xattrs) != 0)) {
+			output(indent, &offset, "xattrsdigest=%s", digest);
+		}
+	}
+	if (keys & F_INODE) {
+		output(indent, &offset, "inode=%llu", p->fts_statp->st_ino);
+	}
+	if (keys & F_ACL) {
+		char *digest, buf[kSHA256NullTerminatedBuffLen];
+		
+		digest = SHA256_Path_ACL(p->fts_accpath, buf);
+		if (digest && (strcmp(digest, acl) != 0)) {
+			output(indent, &offset, "acldigest=%s", digest);
+		}
+	}
+	
 	(void)putchar('\n');
 }
 
 #define	MAXGID	5000
 #define	MAXUID	5000
 #define	MAXMODE	MBITS + 1
+#define	MAXFLAGS 256
+#define	MAXS 16
 
 static int
-statd(t, parent, puid, pgid, pmode)
-	FTS *t;
-	FTSENT *parent;
-	uid_t *puid;
-	gid_t *pgid;
-	mode_t *pmode;
+statd(FTS *t, FTSENT *parent, uid_t *puid, gid_t *pgid, mode_t *pmode, u_long *pflags, char **pxattrs, char **pacl)
 {
 	FTSENT *p;
 	gid_t sgid;
 	uid_t suid;
 	mode_t smode;
+	u_long sflags;
 	struct group *gr;
 	struct passwd *pw;
-	gid_t savegid;
-	uid_t saveuid;
-	mode_t savemode;
-	u_short maxgid, maxuid, maxmode, g[MAXGID], u[MAXUID], m[MAXMODE];
+	gid_t savegid = *pgid;
+	uid_t saveuid = *puid;
+	mode_t savemode = *pmode;
+	u_long saveflags = *pflags;
+	char *savexattrs = *pxattrs;
+	char *saveacl = *pacl;
+	u_short maxgid, maxuid, maxmode, maxflags;
+	u_short g[MAXGID], u[MAXUID], m[MAXMODE], f[MAXFLAGS];
+	char *fflags;
+	static int first = 1;
 
-	savegid = 0;
-	saveuid = 0;
-	savemode = 0;
 	if ((p = fts_children(t, 0)) == NULL) {
 		if (errno)
-			mtree_err("%s: %s", RP(parent), strerror(errno));
+			err(1, "%s", RP(parent));
 		return (1);
 	}
 
-	memset(g, 0, sizeof(g));
-	memset(u, 0, sizeof(u));
-	memset(m, 0, sizeof(m));
+	bzero(g, sizeof(g));
+	bzero(u, sizeof(u));
+	bzero(m, sizeof(m));
+	bzero(f, sizeof(f));
 
-	maxuid = maxgid = maxmode = 0;
+	maxuid = maxgid = maxmode = maxflags = 0;
 	for (; p; p = p->fts_link) {
-		smode = p->fts_statp->st_mode & MBITS;
-		if (smode < MAXMODE && ++m[smode] > maxmode) {
-			savemode = smode;
-			maxmode = m[smode];
-		}
-		sgid = p->fts_statp->st_gid;
-		if (sgid < MAXGID && ++g[sgid] > maxgid) {
-			savegid = sgid;
-			maxgid = g[sgid];
-		}
-		suid = p->fts_statp->st_uid;
-		if (suid < MAXUID && ++u[suid] > maxuid) {
-			saveuid = suid;
-			maxuid = u[suid];
+		if (!dflag || (dflag && S_ISDIR(p->fts_statp->st_mode))) {
+			smode = p->fts_statp->st_mode & MBITS;
+			if (smode < MAXMODE && ++m[smode] > maxmode) {
+				savemode = smode;
+				maxmode = m[smode];
+			}
+			sgid = p->fts_statp->st_gid;
+			if (sgid < MAXGID && ++g[sgid] > maxgid) {
+				savegid = sgid;
+				maxgid = g[sgid];
+			}
+			suid = p->fts_statp->st_uid;
+			if (suid < MAXUID && ++u[suid] > maxuid) {
+				saveuid = suid;
+				maxuid = u[suid];
+			}
+			
+			/*
+			 * XXX
+			 * note that we don't count the most common xattr/acl digest
+			 * so set will always the default value (none)
+			 */
+
+			/*
+			 * XXX
+			 * note that the below will break when file flags
+			 * are extended beyond the first 4 bytes of each
+			 * half word of the flags
+			 */
+#define FLAGS2IDX(f) ((f & 0xf) | ((f >> 12) & 0xf0))
+			sflags = p->fts_statp->st_flags;
+			if (FLAGS2IDX(sflags) < MAXFLAGS &&
+			    ++f[FLAGS2IDX(sflags)] > maxflags) {
+				saveflags = sflags;
+				maxflags = f[FLAGS2IDX(sflags)];
+			}
 		}
 	}
-	(void)printf("/set type=file");
-	if (keys & F_GID)
-		(void)printf(" gid=%u", savegid);
-	if (keys & F_GNAME) {
-		if ((gr = getgrgid(savegid)) != NULL)
-			(void)printf(" gname=%s", gr->gr_name);
-		else
-			(void)printf(" gid=%u", savegid);
-	}
-	if (keys & F_UNAME) {
-		if ((pw = getpwuid(saveuid)) != NULL)
-			(void)printf(" uname=%s", pw->pw_name);
+	/*
+	 * If the /set record is the same as the last one we do not need to output
+	 * a new one.  So first we check to see if anything changed.  Note that we
+	 * always output a /set record for the first directory.
+	 */
+	if ((((keys & F_UNAME) | (keys & F_UID)) && (*puid != saveuid)) ||
+	    (((keys & F_GNAME) | (keys & F_GID)) && (*pgid != savegid)) ||
+	    ((keys & F_MODE) && (*pmode != savemode)) ||
+	    ((keys & F_FLAGS) && (*pflags != saveflags)) ||
+	    (first)) {
+		first = 0;
+		if (dflag)
+			(void)printf("/set type=dir");
 		else
-			(void)printf(" uid=%u", saveuid);
+			(void)printf("/set type=file");
+		if (keys & F_UNAME) {
+			pw = getpwuid(saveuid);
+			if (pw != NULL)
+				(void)printf(" uname=%s", pw->pw_name);
+			else if (wflag)
+				warnx( "Could not get uname for uid=%u", saveuid);
+			else
+				errx(1, "Could not get uname for uid=%u", saveuid);
+		}
+		if (keys & F_UID)
+			(void)printf(" uid=%lu", (u_long)saveuid);
+		if (keys & F_GNAME) {
+			gr = getgrgid(savegid);
+			if (gr != NULL)
+				(void)printf(" gname=%s", gr->gr_name);
+			else if (wflag)
+				warnx("Could not get gname for gid=%u", savegid);
+			else
+				errx(1, "Could not get gname for gid=%u", savegid);
+		}
+		if (keys & F_GID)
+			(void)printf(" gid=%lu", (u_long)savegid);
+		if (keys & F_MODE)
+			(void)printf(" mode=%#o", savemode);
+		if (keys & F_NLINK)
+			(void)printf(" nlink=1");
+		if (keys & F_FLAGS) {
+			fflags = flags_to_string(saveflags);
+			(void)printf(" flags=%s", fflags);
+			free(fflags);
+		}
+		if (keys & F_XATTRS)
+			(void)printf(" xattrsdigest=%s", savexattrs);
+		if (keys & F_ACL)
+			(void)printf(" acldigest=%s", saveacl);
+		(void)printf("\n");
+		*puid = saveuid;
+		*pgid = savegid;
+		*pmode = savemode;
+		*pflags = saveflags;
+		*pxattrs = savexattrs;
+		*pacl = saveacl;
 	}
-	if (keys & F_UID)
-		(void)printf(" uid=%u", saveuid);
-	if (keys & F_MODE)
-		(void)printf(" mode=%#o", savemode);
-	if (keys & F_NLINK)
-		(void)printf(" nlink=1");
-	(void)printf("\n");
-	*puid = saveuid;
-	*pgid = savegid;
-	*pmode = savemode;
 	return (0);
 }
 
 static int
-dsort(a, b)
-	const FTSENT **a, **b;
+dsort(const FTSENT **a, const FTSENT **b)
 {
 	if (S_ISDIR((*a)->fts_statp->st_mode)) {
 		if (!S_ISDIR((*b)->fts_statp->st_mode))
@@ -272,35 +489,20 @@ dsort(a, b)
 	return (strcmp((*a)->fts_name, (*b)->fts_name));
 }
 
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 void
-#if __STDC__
-output(int *offset, const char *fmt, ...)
-#else
-output(offset, fmt, va_alist)
-	int *offset;
-	char *fmt;
-        va_dcl
-#endif
+output(int indent, int *offset, const char *fmt, ...)
 {
 	va_list ap;
 	char buf[1024];
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	(void)vsnprintf(buf, sizeof(buf), fmt, ap);
 	va_end(ap);
 
 	if (*offset + strlen(buf) > MAXLINELEN - 3) {
-		(void)printf(" \\\n%*s", INDENTNAMELEN, "");
-		*offset = INDENTNAMELEN;
+		(void)printf(" \\\n%*s", INDENTNAMELEN + indent, "");
+		*offset = INDENTNAMELEN + indent;
 	}
 	*offset += printf(" %s", buf) + 1;
 }