new vi

1 files changed, 26 insertions, 55 deletions

diff --git a/usr.bin/vi/ex/ex_mkexrc.c b/usr.bin/vi/ex/ex_mkexrc.c
index 158fb23344e..0eb15d408cf 100644
--- a/usr.bin/vi/ex/ex_mkexrc.c
+++ b/usr.bin/vi/ex/ex_mkexrc.c
@@ -1,74 +1,45 @@
 /*-
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1992, 1993, 1994, 1995, 1996
+ *	Keith Bostic.  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
- *    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
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, 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.
+ * See the LICENSE file for redistribution information.
  */
 
+#include "config.h"
+
 #ifndef lint
-static char sccsid[] = "@(#)ex_mkexrc.c	8.14 (Berkeley) 8/17/94";
+static const char sccsid[] = "@(#)ex_mkexrc.c	10.11 (Berkeley) 3/6/96";
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 
 #include <bitstring.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <termios.h>
 #include <unistd.h>
 
-#include "compat.h"
-#include <db.h>
-#include <regex.h>
-#include <pathnames.h>
-
-#include "vi.h"
-#include "excmd.h"
+#include "../common/common.h"
+#include "pathnames.h"
 
 /*
  * ex_mkexrc -- :mkexrc[!] [file]
  *
  * Create (or overwrite) a .exrc file with the current info.
+ *
+ * PUBLIC: int ex_mkexrc __P((SCR *, EXCMD *));
  */
 int
-ex_mkexrc(sp, ep, cmdp)
+ex_mkexrc(sp, cmdp)
 	SCR *sp;
-	EXF *ep;
-	EXCMDARG *cmdp;
+	EXCMD *cmdp;
 {
 	struct stat sb;
 	FILE *fp;
@@ -87,44 +58,44 @@ ex_mkexrc(sp, ep, cmdp)
 		abort();
 	}
 
-	if (!F_ISSET(cmdp, E_FORCE) && !stat(fname, &sb)) {
-		msgq(sp, M_ERR,
-		    "%s exists, not written; use ! to override", fname);
+	if (!FL_ISSET(cmdp->iflags, E_C_FORCE) && !stat(fname, &sb)) {
+		msgq_str(sp, M_ERR, fname,
+		    "137|%s exists, not written; use ! to override");
 		return (1);
 	}
 
 	/* Create with max permissions of rw-r--r--. */
 	if ((fd = open(fname, O_CREAT | O_TRUNC | O_WRONLY,
 	    S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0) {
-		msgq(sp, M_SYSERR, fname);
+		msgq_str(sp, M_SYSERR, fname, "%s");
 		return (1);
 	}
 
 	if ((fp = fdopen(fd, "w")) == NULL) {
 		sverrno = errno;
 		(void)close(fd);
-		errno = sverrno;
 		goto e2;
 	}
 
-	if (abbr_save(sp, fp) || ferror(fp))
+	if (seq_save(sp, fp, "abbreviate ", SEQ_ABBREV) || ferror(fp))
 		goto e1;
-	if (map_save(sp, fp) || ferror(fp))
+	if (seq_save(sp, fp, "map ", SEQ_COMMAND) || ferror(fp))
+		goto e1;
+	if (seq_save(sp, fp, "map! ", SEQ_INPUT) || ferror(fp))
 		goto e1;
 	if (opts_save(sp, fp) || ferror(fp))
 		goto e1;
-#ifndef NO_DIGRAPH
-	digraph_save(sp, fd);
-#endif
-	if (fclose(fp))
+	if (fclose(fp)) {
+		sverrno = errno;
 		goto e2;
+	}
 
-	msgq(sp, M_INFO, "New .exrc file: %s. ", fname);
+	msgq_str(sp, M_INFO, fname, "138|New exrc file: %s");
 	return (0);
 
 e1:	sverrno = errno;
 	(void)fclose(fp);
-	errno = sverrno;
-e2:	msgq(sp, M_ERR, "%s: incomplete: %s", fname, strerror(errno));
+e2:	errno = sverrno;
+	msgq_str(sp, M_SYSERR, fname, "%s");
 	return (1);
 }