new vi

1 files changed, 28 insertions, 53 deletions

diff --git a/usr.bin/vi/ex/ex_preserve.c b/usr.bin/vi/ex/ex_preserve.c
index 7bef07ec240..5614c88d753 100644
--- a/usr.bin/vi/ex/ex_preserve.c
+++ b/usr.bin/vi/ex/ex_preserve.c
@@ -1,102 +1,75 @@
 /*-
  * Copyright (c) 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 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_preserve.c	8.14 (Berkeley) 8/17/94";
+static const char sccsid[] = "@(#)ex_preserve.c	10.12 (Berkeley) 4/27/96";
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/queue.h>
-#include <sys/time.h>
 
 #include <bitstring.h>
 #include <errno.h>
 #include <limits.h>
-#include <signal.h>
 #include <stdio.h>
 #include <string.h>
-#include <termios.h>
-
-#include "compat.h"
-#include <db.h>
-#include <regex.h>
 
-#include "vi.h"
-#include "excmd.h"
+#include "../common/common.h"
 
 /*
  * ex_preserve -- :pre[serve]
  *	Push the file to recovery.
+ *
+ * PUBLIC: int ex_preserve __P((SCR *, EXCMD *));
  */
 int
-ex_preserve(sp, ep, cmdp)
+ex_preserve(sp, cmdp)
 	SCR *sp;
-	EXF *ep;
-	EXCMDARG *cmdp;
+	EXCMD *cmdp;
 {
 	recno_t lno;
 
-	if (!F_ISSET(ep, F_RCV_ON)) {
-		msgq(sp, M_ERR, "Preservation of this file not possible");
+	NEEDFILE(sp, cmdp);
+
+	if (!F_ISSET(sp->ep, F_RCV_ON)) {
+		msgq(sp, M_ERR, "142|Preservation of this file not possible");
 		return (1);
 	}
 
 	/* If recovery not initialized, do so. */
-	if (F_ISSET(ep, F_FIRSTMODIFY) && rcv_init(sp, ep))
+	if (F_ISSET(sp->ep, F_FIRSTMODIFY) && rcv_init(sp))
 		return (1);
 
 	/* Force the file to be read in, in case it hasn't yet. */
-	if (file_lline(sp, ep, &lno))
+	if (db_last(sp, &lno))
 		return (1);
 
 	/* Sync to disk. */
-	if (rcv_sync(sp, ep, RCV_SNAPSHOT))
+	if (rcv_sync(sp, RCV_SNAPSHOT))
 		return (1);
 
-	msgq(sp, M_INFO, "File preserved");
+	msgq(sp, M_INFO, "143|File preserved");
 	return (0);
 }
 
 /*
  * ex_recover -- :rec[over][!] file
+ *	Recover the file.
  *
- * Recover the file.
+ * PUBLIC: int ex_recover __P((SCR *, EXCMD *));
  */
 int
-ex_recover(sp, ep, cmdp)
+ex_recover(sp, cmdp)
 	SCR *sp;
-	EXF *ep;
-	EXCMDARG *cmdp;
+	EXCMD *cmdp;
 {
 	ARGS *ap;
 	FREF *frp;
@@ -110,7 +83,7 @@ ex_recover(sp, ep, cmdp)
 	 * Check for modifications.  Autowrite did not historically
 	 * affect :recover.
 	 */
-	if (file_m2(sp, ep, F_ISSET(cmdp, E_FORCE)))
+	if (file_m2(sp, FL_ISSET(cmdp->iflags, E_C_FORCE)))
 		return (1);
 
 	/* Get a file structure for the file. */
@@ -121,8 +94,10 @@ ex_recover(sp, ep, cmdp)
 	F_SET(frp, FR_RECOVER);
 
 	/* Switch files. */
-	if (file_init(sp, frp, NULL, F_ISSET(cmdp, E_FORCE)))
+	if (file_init(sp, frp, NULL, FS_SETALT |
+	    (FL_ISSET(cmdp->iflags, E_C_FORCE) ? FS_FORCE : 0)))
 		return (1);
-	F_SET(sp, S_FSWITCH);
+
+	F_SET(sp, SC_FSWITCH);
 	return (0);
 }