From 4d88254732cbaf0f187324c9d7c61a05cc1c35d0 Mon Sep 17 00:00:00 2001
From: Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Date: Fri, 18 Jan 1991 02:23:04 -0800
Subject: [PATCH] new version

SCCS-vsn: usr.bin/ar/ar.c 5.6
SCCS-vsn: include/ar.h 5.2
---
 usr/src/include/ar.h    |  37 +-
 usr/src/usr.bin/ar/ar.c | 915 ++++++++--------------------------------
 2 files changed, 192 insertions(+), 760 deletions(-)

diff --git a/usr/src/include/ar.h b/usr/src/include/ar.h
index f68dcb5922..f39ddf91c4 100644
--- a/usr/src/include/ar.h
+++ b/usr/src/include/ar.h
@@ -1,22 +1,29 @@
-/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
  *
- *	@(#)ar.h	5.1 (Berkeley) %G%
+ * This code is derived from software contributed to Berkeley by
+ * Hugh Smith at The University of Guelph.
+ *
+ *	@(#)ar.h	5.2 (Berkeley) %G%
  */
 
-#define	ARMAG	"!<arch>\n"
-#define	SARMAG	8
+/* Pre-4BSD archives had these magic numbers in them. */
+#define	OARMAG1	0177555
+#define	OARMAG2	0177545
 
-#define	ARFMAG	"`\n"
+#define	ARMAG		"!<arch>\n"	/* ar "magic number" */
+#define	SARMAG		8		/* strlen(ARMAG); */
+
+#define	AR_EFMT1	"#1/"		/* extended format #1 */
 
 struct ar_hdr {
-	char	ar_name[16];
-	char	ar_date[12];
-	char	ar_uid[6];
-	char	ar_gid[6];
-	char	ar_mode[8];
-	char	ar_size[10];
-	char	ar_fmag[2];
+	char ar_name[16];		/* name */
+	char ar_date[12];		/* modification time */
+	char ar_uid[6];			/* user id */
+	char ar_gid[6];			/* group id */
+	char ar_mode[8];		/* octal file permissions */
+	char ar_size[10];		/* size in bytes */
+#define	ARFMAG	"`\n"
+	char ar_fmag[2];		/* consistency check */
 };
diff --git a/usr/src/usr.bin/ar/ar.c b/usr/src/usr.bin/ar/ar.c
index 33ec0e0a1b..6b5d352ef4 100644
--- a/usr/src/usr.bin/ar/ar.c
+++ b/usr/src/usr.bin/ar/ar.c
@@ -1,780 +1,205 @@
-/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Hugh Smith at The University of Guelph.
+ *
+ * %sccs.include.redist.c%
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)ar.c	5.5 (Berkeley) %G%";
-#endif not lint
-
 #ifndef lint
 char copyright[] =
-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
  All rights reserved.\n";
-#endif not lint
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)ar.c	5.6 (Berkeley) %G%";
+#endif /* not lint */
 
-/*
- * ar - portable (ascii) format version
- */
 #include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/time.h>
+#include <sys/errno.h>
+#include <dirent.h>
 #include <stdio.h>
 #include <ar.h>
-#include "pathnames.h"
+#include <paths.h>
+#include "archive.h"
 
-struct	stat	stbuf;
-struct	ar_hdr	arbuf;
-struct	lar_hdr {
-	char	lar_name[16];
-	long	lar_date;
-	u_short	lar_uid;
-	u_short	lar_gid;
-	u_short	lar_mode;
-	long	lar_size;
-} larbuf;
-
-#define	SKIP	1
-#define	IODD	2
-#define	OODD	4
-#define	HEAD	8
-
-char	*man	=	{ "mrxtdpq" };
-char	*opt	=	{ "uvnbailo" };
-
-int	signum[] = {SIGHUP, SIGINT, SIGQUIT, 0};
-int	sigdone();
-long	lseek();
-int	rcmd();
-int	dcmd();
-int	xcmd();
-int	tcmd();
-int	pcmd();
-int	mcmd();
-int	qcmd();
-int	(*comfun)();
-char	flg[26];
-char	**namv;
-int	namc;
-char	*arnam;
-char	*ponam;
-char	*tmp0nam = _PATH_TMP1;
-char	*tmp1nam = _PATH_TMP2;
-char	*tmp2nam = _PATH_TMP3;
-char	*tfnam;
-char	*tf1nam;
-char	*tf2nam;
-char	*file;
-char	name[16];
-int	af;
-int	tf;
-int	tf1;
-int	tf2;
-int	qf;
-int	bastate;
-char	buf[MAXBSIZE];
-int	truncate;			/* ok to truncate argument filenames */
-
-char	*trim();
-char	*mktemp();
-char	*ctime();
+CHDR chdr;
+u_int options;
+char *archive, *envtmp, *posname;
 
+/*
+ * main --
+ *	main basically uses getopt to parse options and calls the appropriate
+ *	functions.  Some hacks that let us be backward compatible with 4.3 ar
+ *	option parsing and sanity checking.
+ */
 main(argc, argv)
-char *argv[];
+	int argc;
+	char **argv;
 {
-	register i;
-	register char *cp;
+	extern int optind;
+	int c, rval;
+	char *p;
+	int (*fcall)(), append(), contents(), delete(), extract(),
+	    move(), print(), replace();
+	char *rname();
 
-	for(i=0; signum[i]; i++)
-		if(signal(signum[i], SIG_IGN) != SIG_IGN)
-			signal(signum[i], sigdone);
-	if(argc < 3)
+	if (argc < 3)
 		usage();
-	cp = argv[1];
-	for(cp = argv[1]; *cp; cp++)
-	switch(*cp) {
-	case 'o':
-	case 'l':
-	case 'v':
-	case 'u':
-	case 'n':
-	case 'a':
-	case 'b':
-	case 'c':
-	case 'i':
-		flg[*cp - 'a']++;
-		continue;
-
-	case 'r':
-		setcom(rcmd);
-		continue;
 
-	case 'd':
-		setcom(dcmd);
-		continue;
-
-	case 'x':
-		setcom(xcmd);
-		continue;
-
-	case 't':
-		setcom(tcmd);
-		continue;
-
-	case 'p':
-		setcom(pcmd);
-		continue;
-
-	case 'm':
-		setcom(mcmd);
-		continue;
-
-	case 'q':
-		setcom(qcmd);
-		continue;
-
-	default:
-		fprintf(stderr, "ar: bad option `%c'\n", *cp);
-		done(1);
-	}
-	if(flg['l'-'a']) {
-		tmp0nam = "vXXXXX";
-		tmp1nam = "v1XXXXX";
-		tmp2nam = "v2XXXXX";
-	}
-	if(flg['i'-'a'])
-		flg['b'-'a']++;
-	if(flg['a'-'a'] || flg['b'-'a']) {
-		bastate = 1;
-		ponam = trim(argv[2]);
-		argv++;
-		argc--;
-		if(argc < 3)
+	/*
+	 * Historic versions didn't require a '-' in front of the options.
+	 * Fix it, if necessary.
+	*/
+	if (*argv[1] != '-') {
+		if (!(p = malloc((u_int)(strlen(argv[1]) + 2)))) {
+			(void)fprintf(stderr, "ar: %s.\n", strerror(errno));
+			exit(1);
+		}
+		*p = '-';
+		(void)strcpy(p + 1, argv[1]);
+		argv[1] = p;
+	}
+
+	while ((c = getopt(argc, argv, "abcdilmopqrtuvx")) != EOF) {
+		switch(c) {
+		case 'a':
+			options |= AR_A;
+			break;
+		case 'b':
+		case 'i':
+			options |= AR_B;
+			break;
+		case 'c':
+			options |= AR_C;
+			break;
+		case 'd':
+			options |= AR_D;
+			fcall = delete;
+			break;
+		case 'l':		/* not documented, compatibility only */
+			envtmp = ".";
+			break;
+		case 'm':
+			options |= AR_M;
+			fcall = move;
+			break;
+		case 'o':
+			options |= AR_O;
+			break;
+		case 'p':
+			options |= AR_P;
+			fcall = print;
+			break;
+		case 'q':
+			options |= AR_Q;
+			fcall = append;
+			break;
+		case 'r':
+			options |= AR_R;
+			fcall = replace;
+			break;
+		case 't':
+			options |= AR_T;
+			fcall = contents;
+			break;
+		case 'u':
+			options |= AR_U;
+			break;
+		case 'v':
+			options |= AR_V;
+			break;
+		case 'x':
+			options |= AR_X;
+			fcall = extract;
+			break;
+		default:
 			usage();
-	}
-	arnam = argv[2];
-	namv = argv+3;
-	namc = argc-3;
-	if(comfun == 0) {
-		if(flg['u'-'a'] == 0) {
-			fprintf(stderr, "ar: one of [%s] must be specified\n", man);
-			done(1);
-		}
-		setcom(rcmd);
-	}
-	(*comfun)();
-	done(notfound());
-}
-
-setcom(fun)
-int (*fun)();
-{
-
-	if(comfun != 0) {
-		fprintf(stderr, "ar: only one of [%s] allowed\n", man);
-		done(1);
-	}
-	comfun = fun;
-}
-
-rcmd()
-{
-	register f;
-
-	init();
-	getaf();
-	while(!getdir()) {
-		bamatch();
-		if(namc == 0 || match()) {
-			f = stats();
-			if(f < 0) {
-				if(namc)
-					fprintf(stderr, "ar: cannot open %s\n", file);
-				goto cp;
-			}
-			if(flg['u'-'a'])
-				if(stbuf.st_mtime <= larbuf.lar_date) {
-					close(f);
-					goto cp;
-				}
-			mesg('r');
-			copyfil(af, -1, IODD+SKIP);
-			movefil(f);
-			continue;
 		}
-	cp:
-		mesg('c');
-		copyfil(af, tf, IODD+OODD+HEAD);
 	}
-	cleanup();
-}
 
-dcmd()
-{
+	argv += optind;
+	argc -= optind;
 
-	init();
-	if(getaf())
-		noar();
-	while(!getdir()) {
-		if(match()) {
-			mesg('d');
-			copyfil(af, -1, IODD+SKIP);
-			continue;
-		}
-		mesg('c');
-		copyfil(af, tf, IODD+OODD+HEAD);
-	}
-	install();
-}
-
-xcmd()
-{
-	register f;
-	struct timeval tv[2];
-
-	if(getaf())
-		noar();
-	while(!getdir()) {
-		if(namc == 0 || match()) {
-			f = creat(file, larbuf.lar_mode & 0777);
-			if(f < 0) {
-				fprintf(stderr, "ar: %s cannot create\n", file);
-				goto sk;
-			}
-			mesg('x');
-			copyfil(af, f, IODD);
-			close(f);
-			if (flg['o'-'a']) {
-				tv[0].tv_sec = tv[1].tv_sec = larbuf.lar_date;
-				tv[0].tv_usec = tv[1].tv_usec = 0;
-				utimes(file, tv);
-			}
-			continue;
-		}
-	sk:
-		mesg('c');
-		copyfil(af, -1, IODD+SKIP);
-		if (namc > 0  &&  !morefil())
-			done(0);
-	}
-}
-
-pcmd()
-{
-
-	if(getaf())
-		noar();
-	while(!getdir()) {
-		if(namc == 0 || match()) {
-			if(flg['v'-'a']) {
-				printf("\n<%s>\n\n", file);
-				fflush(stdout);
-			}
-			copyfil(af, 1, IODD);
-			continue;
-		}
-		copyfil(af, -1, IODD+SKIP);
-	}
-}
-
-mcmd()
-{
-
-	init();
-	if(getaf())
-		noar();
-	tf2nam = mktemp(tmp2nam);
-	close(creat(tf2nam, 0600));
-	tf2 = open(tf2nam, 2);
-	if(tf2 < 0) {
-		fprintf(stderr, "ar: cannot create third temp\n");
-		done(1);
-	}
-	while(!getdir()) {
-		bamatch();
-		if(match()) {
-			mesg('m');
-			copyfil(af, tf2, IODD+OODD+HEAD);
-			continue;
-		}
-		mesg('c');
-		copyfil(af, tf, IODD+OODD+HEAD);
-	}
-	install();
-}
-
-tcmd()
-{
-
-	if(getaf())
-		noar();
-	while(!getdir()) {
-		if(namc == 0 || match()) {
-			if(flg['v'-'a'])
-				longt();
-			printf("%s\n", trim(file));
-		}
-		copyfil(af, -1, IODD+SKIP);
+	/* One of -dmpqrtx required. */
+	if (!(options & (AR_D|AR_M|AR_P|AR_Q|AR_R|AR_T|AR_X))) {
+		(void)fprintf(stderr,
+		    "ar: one of options -dmpqrtx is required.\n");
+		usage();
 	}
-}
-
-qcmd()
-{
-	register i, f;
-
-	if (flg['a'-'a'] || flg['b'-'a']) {
-		fprintf(stderr, "ar: abi not allowed with q\n");
-		done(1);
+	/* Only one of -a and -bi. */
+	if (options & AR_A && options & AR_B) {
+		(void)fprintf(stderr,
+		    "ar: only one of -a and -[bi] options allowed.\n");
+		usage();
 	}
-	truncate++;
-	getqf();
-	for(i=0; signum[i]; i++)
-		signal(signum[i], SIG_IGN);
-	lseek(qf, 0l, 2);
-	for(i=0; i<namc; i++) {
-		file = namv[i];
-		if(file == 0)
-			continue;
-		namv[i] = 0;
-		mesg('q');
-		f = stats();
-		if(f < 0) {
-			fprintf(stderr, "ar: %s cannot open\n", file);
-			continue;
+	/* -ab require a position argument. */
+	if (options & (AR_A|AR_B)) {
+		if (!(posname = *argv++)) {
+			(void)fprintf(stderr,
+			    "ar: no position operand specified.\n");
+			usage();
 		}
-		tf = qf;
-		movefil(f);
-		qf = tf;
+		posname = rname(posname);
+	}
+	/* -d only valid with -v. */
+	if (options & AR_D && options & ~(AR_D|AR_V))
+		badoptions("-d");
+	/* -m only valid with -abiv. */
+	if (options & AR_M && options & ~(AR_A|AR_B|AR_M|AR_V))
+		badoptions("-m");
+	/* -p only valid with -v. */
+	if (options & AR_P && options & ~(AR_P|AR_V))
+		badoptions("-p");
+	/* -q only valid with -cv. */
+	if (options & AR_Q && options & ~(AR_C|AR_Q|AR_V))
+		badoptions("-q");
+	/* -r only valid with -abcuv. */
+	if (options & AR_R && options & ~(AR_A|AR_B|AR_C|AR_R|AR_U|AR_V))
+		badoptions("-r");
+	/* -t only valid with -v. */
+	if (options & AR_T && options & ~(AR_T|AR_V))
+		badoptions("-t");
+	/* -x only valid with -ouv. */
+	if (options & AR_X && options & ~(AR_O|AR_U|AR_V|AR_X))
+		badoptions("-x");
+
+	if (!(archive = *argv++)) {
+		(void)fprintf(stderr, "ar: no archive specified.\n");
+		usage();
 	}
-}
 
-init()
-{
-
-	tfnam = mktemp(tmp0nam);
-	close(creat(tfnam, 0600));
-	tf = open(tfnam, 2);
-	if(tf < 0) {
-		fprintf(stderr, "ar: cannot create temp file\n");
-		done(1);
+	/* -dmqr require a list of archive elements. */
+	if (options & (AR_D|AR_M|AR_Q|AR_R) && !*argv) {
+		(void)fprintf(stderr, "ar: no archive members specified.\n");
+		usage();
 	}
-	if (write(tf, ARMAG, SARMAG) != SARMAG)
-		wrerr();
-}
-
-getaf()
-{
-	char mbuf[SARMAG];
 
-	af = open(arnam, 0);
-	if(af < 0)
-		return(1);
-	if (read(af, mbuf, SARMAG) != SARMAG || strncmp(mbuf, ARMAG, SARMAG)) {
-		fprintf(stderr, "ar: %s not in archive format\n", arnam);
-		done(1);
-	}
-	return(0);
+	rval = (*fcall)(argv);
+	exit(rval);
 }
 
-getqf()
+badoptions(arg)
+	char *arg;
 {
-	char mbuf[SARMAG];
-
-	if ((qf = open(arnam, 2)) < 0) {
-		if(!flg['c'-'a'])
-			fprintf(stderr, "ar: creating %s\n", arnam);
-		if ((qf = creat(arnam, 0666)) < 0) {
-			fprintf(stderr, "ar: cannot create %s\n", arnam);
-			done(1);
-		}
-		if (write(qf, ARMAG, SARMAG) != SARMAG)
-			wrerr();
-	} else if (read(qf, mbuf, SARMAG) != SARMAG
-		|| strncmp(mbuf, ARMAG, SARMAG)) {
-		fprintf(stderr, "ar: %s not in archive format\n", arnam);
-		done(1);
-	}
+	(void)fprintf(stderr,
+	    "ar: illegal option combination for %s.\n", arg);
+	usage();
 }
 
 usage()
 {
-	printf("usage: ar [%s][%s] archive files ...\n", man, opt);
-	done(1);
-}
-
-noar()
-{
-
-	fprintf(stderr, "ar: %s does not exist\n", arnam);
-	done(1);
-}
-
-sigdone()
-{
-	done(100);
-}
-
-done(c)
-{
-
-	if(tfnam)
-		unlink(tfnam);
-	if(tf1nam)
-		unlink(tf1nam);
-	if(tf2nam)
-		unlink(tf2nam);
-	exit(c);
-}
-
-notfound()
-{
-	register i, n;
-
-	n = 0;
-	for(i=0; i<namc; i++)
-		if(namv[i]) {
-			fprintf(stderr, "ar: %s not found\n", namv[i]);
-			n++;
-		}
-	return(n);
-}
-
-morefil()
-{
-	register i, n;
-
-	n = 0;
-	for(i=0; i<namc; i++)
-		if(namv[i])
-			n++;
-	return(n);
-}
-
-cleanup()
-{
-	register i, f;
-
-	truncate++;
-	for(i=0; i<namc; i++) {
-		file = namv[i];
-		if(file == 0)
-			continue;
-		namv[i] = 0;
-		mesg('a');
-		f = stats();
-		if(f < 0) {
-			fprintf(stderr, "ar: %s cannot open\n", file);
-			continue;
-		}
-		movefil(f);
-	}
-	install();
-}
-
-install()
-{
-	register i;
-
-	for(i=0; signum[i]; i++)
-		signal(signum[i], SIG_IGN);
-	if(af < 0)
-		if(!flg['c'-'a'])
-			fprintf(stderr, "ar: creating %s\n", arnam);
-	close(af);
-	af = creat(arnam, 0666);
-	if(af < 0) {
-		fprintf(stderr, "ar: cannot create %s\n", arnam);
-		done(1);
-	}
-	if(tfnam) {
-		lseek(tf, 0l, 0);
-		while((i = read(tf, buf, MAXBSIZE)) > 0)
-			if (write(af, buf, i) != i)
-				wrerr();
-	}
-	if(tf2nam) {
-		lseek(tf2, 0l, 0);
-		while((i = read(tf2, buf, MAXBSIZE)) > 0)
-			if (write(af, buf, i) != i)
-				wrerr();
-	}
-	if(tf1nam) {
-		lseek(tf1, 0l, 0);
-		while((i = read(tf1, buf, MAXBSIZE)) > 0)
-			if (write(af, buf, i) != i)
-				wrerr();
-	}
-}
-
-/*
- * insert the file 'file'
- * into the temporary file
- */
-movefil(f)
-{
-	char buf[sizeof(arbuf)+1];
-
-	(void)sprintf(buf, "%-16s%-12ld%-6u%-6u%-8o%-10ld%-2s",
-	   trim(file),
-	   stbuf.st_mtime,
-	   (u_short)stbuf.st_uid,
-	   (u_short)stbuf.st_gid,
-	   stbuf.st_mode,
-	   stbuf.st_size,
-	   ARFMAG);
-	strncpy((char *)&arbuf, buf, sizeof(arbuf));
-	larbuf.lar_size = stbuf.st_size;
-	copyfil(f, tf, OODD+HEAD);
-	close(f);
-}
-
-stats()
-{
-	register f;
-
-	f = open(file, 0);
-	if(f < 0)
-		return(f);
-	if(fstat(f, &stbuf) < 0) {
-		close(f);
-		return(-1);
-	}
-	return(f);
-}
-
-/*
- * copy next file
- * size given in arbuf
- */
-copyfil(fi, fo, flag)
-{
-	register i, o;
-	int pe;
-
-	if(flag & HEAD) {
-		for (i=sizeof(arbuf.ar_name)-1; i>=0; i--) {
-			if (arbuf.ar_name[i]==' ')
-				continue;
-			else if (arbuf.ar_name[i]=='\0')
-				arbuf.ar_name[i] = ' ';
-			else
-				break;
-		}
-		if (write(fo, (char *)&arbuf, sizeof arbuf) != sizeof arbuf)
-			wrerr();
-	}
-	pe = 0;
-	while(larbuf.lar_size > 0) {
-		i = o = MAXBSIZE;
-		if(larbuf.lar_size < i) {
-			i = o = larbuf.lar_size;
-			if(i&1) {
-				buf[i] = '\n';
-				if(flag & IODD)
-					i++;
-				if(flag & OODD)
-					o++;
-			}
-		}
-		if(read(fi, buf, i) != i)
-			pe++;
-		if((flag & SKIP) == 0)
-			if (write(fo, buf, o) != o)
-				wrerr();
-		larbuf.lar_size -= MAXBSIZE;
-	}
-	if(pe)
-		phserr();
-}
-
-getdir()
-{
-	register char *cp;
-	register i;
-
-	i = read(af, (char *)&arbuf, sizeof arbuf);
-	if(i != sizeof arbuf) {
-		if(tf1nam) {
-			i = tf;
-			tf = tf1;
-			tf1 = i;
-		}
-		return(1);
-	}
-	if (strncmp(arbuf.ar_fmag, ARFMAG, sizeof(arbuf.ar_fmag))) {
-		fprintf(stderr, "ar: malformed archive (at %ld)\n", lseek(af, 0L, 1));
-		done(1);
-	}
-	cp = arbuf.ar_name + sizeof(arbuf.ar_name);
-	while (*--cp==' ')
-		;
-	*++cp = '\0';
-	strncpy(name, arbuf.ar_name, sizeof(arbuf.ar_name));
-	file = name;
-	strncpy(larbuf.lar_name, name, sizeof(larbuf.lar_name));
-	sscanf(arbuf.ar_date, "%ld", &larbuf.lar_date);
-	sscanf(arbuf.ar_uid, "%hd", &larbuf.lar_uid);
-	sscanf(arbuf.ar_gid, "%hd", &larbuf.lar_gid);
-	sscanf(arbuf.ar_mode, "%ho", &larbuf.lar_mode);
-	sscanf(arbuf.ar_size, "%ld", &larbuf.lar_size);
-	return(0);
-}
-
-match()
-{
-	register i;
-
-	for(i=0; i<namc; i++) {
-		if(namv[i] == 0)
-			continue;
-		if(strcmp(trim(namv[i]), file) == 0) {
-			file = namv[i];
-			namv[i] = 0;
-			return(1);
-		}
-	}
-	return(0);
-}
-
-bamatch()
-{
-	register f;
-
-	switch(bastate) {
-
-	case 1:
-		if(strcmp(file, ponam) != 0)
-			return;
-		bastate = 2;
-		if(flg['a'-'a'])
-			return;
-
-	case 2:
-		bastate = 0;
-		tf1nam = mktemp(tmp1nam);
-		close(creat(tf1nam, 0600));
-		f = open(tf1nam, 2);
-		if(f < 0) {
-			fprintf(stderr, "ar: cannot create second temp\n");
-			return;
-		}
-		tf1 = tf;
-		tf = f;
-	}
-}
-
-phserr()
-{
-
-	fprintf(stderr, "ar: phase error on %s\n", file);
-}
-
-mesg(c)
-{
-
-	if(flg['v'-'a'])
-		if(c != 'c' || flg['v'-'a'] > 1)
-			printf("%c - %s\n", c, file);
-}
-
-char *
-trim(s)
-char *s;
-{
-	register char *p1, *p2;
-
-	/* Strip trailing slashes */
-	for(p1 = s; *p1; p1++)
-		;
-	while(p1 > s) {
-		if(*--p1 != '/')
-			break;
-		*p1 = 0;
-	}
-
-	/* Find last component of path; do not zap the path */
-	p2 = s;
-	for(p1 = s; *p1; p1++)
-		if(*p1 == '/')
-			p2 = p1+1;
-
-	/*
-	 * Truncate name if too long, only if we are doing an 'add'
-	 * type operation. We only allow 15 cause rest of ar
-	 * isn't smart enough to deal with non-null terminated
-	 * names.  Need an exit status convention...
-	 * Need yet another new archive format...
-	 */
-	if (truncate && strlen(p2) > sizeof(arbuf.ar_name) - 1) {
-		fprintf(stderr, "ar: filename %s truncated to ", p2);
-		*(p2 + sizeof(arbuf.ar_name) - 1) = '\0';
-		fprintf(stderr, "%s\n", p2);
-	}
-	return(p2);
-}
-
-#define	IFMT	060000
-#define	ISARG	01000
-#define	LARGE	010000
-#define	SUID	04000
-#define	SGID	02000
-#define	ROWN	0400
-#define	WOWN	0200
-#define	XOWN	0100
-#define	RGRP	040
-#define	WGRP	020
-#define	XGRP	010
-#define	ROTH	04
-#define	WOTH	02
-#define	XOTH	01
-#define	STXT	01000
-
-longt()
-{
-	register char *cp;
-
-	pmode();
-	printf("%3d/%1d", larbuf.lar_uid, larbuf.lar_gid);
-	printf("%7ld", larbuf.lar_size);
-	cp = ctime(&larbuf.lar_date);
-	printf(" %-12.12s %-4.4s ", cp+4, cp+20);
-}
-
-int	m1[] = { 1, ROWN, 'r', '-' };
-int	m2[] = { 1, WOWN, 'w', '-' };
-int	m3[] = { 2, SUID, 's', XOWN, 'x', '-' };
-int	m4[] = { 1, RGRP, 'r', '-' };
-int	m5[] = { 1, WGRP, 'w', '-' };
-int	m6[] = { 2, SGID, 's', XGRP, 'x', '-' };
-int	m7[] = { 1, ROTH, 'r', '-' };
-int	m8[] = { 1, WOTH, 'w', '-' };
-int	m9[] = { 2, STXT, 't', XOTH, 'x', '-' };
-
-int	*m[] = { m1, m2, m3, m4, m5, m6, m7, m8, m9};
-
-pmode()
-{
-	register int **mp;
-
-	for (mp = &m[0]; mp < &m[9];)
-		select(*mp++);
-}
-
-select(pairp)
-int *pairp;
-{
-	register int n, *ap;
-
-	ap = pairp;
-	n = *ap++;
-	while (--n>=0 && (larbuf.lar_mode&*ap++)==0)
-		ap++;
-	putchar(*ap);
-}
-
-wrerr()
-{
-	perror("ar write error");
-	done(1);
-}
+	(void)fprintf(stderr, "usage:  ar -d [-v] archive file ...\n");
+	(void)fprintf(stderr, "\tar -m [-v] archive file ...\n");
+	(void)fprintf(stderr, "\tar -m [-abiv] position archive file ...\n");
+	(void)fprintf(stderr, "\tar -p [-v] archive [file ...]\n");
+	(void)fprintf(stderr, "\tar -q [-cv] archive file ...\n");
+	(void)fprintf(stderr, "\tar -r [-cuv] archive file ...\n");
+	(void)fprintf(stderr, "\tar -r [-abciuv] position archive file ...\n");
+	(void)fprintf(stderr, "\tar -t [-v] archive [file ...]\n");
+	(void)fprintf(stderr, "\tar -x [-ouv] archive [file ...]\n");
+	exit(1);
+}	
-- 
2.20.1