aboutsummaryrefslogtreecommitdiff
path: root/contrib/nvi/ex/ex_print.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/nvi/ex/ex_print.c')
-rw-r--r--contrib/nvi/ex/ex_print.c95
1 files changed, 31 insertions, 64 deletions
diff --git a/contrib/nvi/ex/ex_print.c b/contrib/nvi/ex/ex_print.c
index 1cc2500c7753..2c9208aa6729 100644
--- a/contrib/nvi/ex/ex_print.c
+++ b/contrib/nvi/ex/ex_print.c
@@ -10,27 +10,24 @@
#include "config.h"
#ifndef lint
-static const char sccsid[] = "@(#)ex_print.c 10.18 (Berkeley) 5/12/96";
+static const char sccsid[] = "$Id: ex_print.c,v 10.25 2011/12/12 22:12:20 zy Exp $";
#endif /* not lint */
#include <sys/types.h>
#include <sys/queue.h>
+#include <sys/time.h>
#include <bitstring.h>
#include <ctype.h>
#include <limits.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
#include "../common/common.h"
-static int ex_prchars __P((SCR *, const char *, size_t *, size_t, u_int, int));
+static int ex_prchars __P((SCR *, const CHAR_T *, size_t *, size_t,
+ u_int, int));
/*
* ex_list -- :[line [,line]] l[ist] [count] [flags]
@@ -40,9 +37,7 @@ static int ex_prchars __P((SCR *, const char *, size_t *, size_t, u_int, int));
* PUBLIC: int ex_list __P((SCR *, EXCMD *));
*/
int
-ex_list(sp, cmdp)
- SCR *sp;
- EXCMD *cmdp;
+ex_list(SCR *sp, EXCMD *cmdp)
{
if (ex_print(sp, cmdp,
&cmdp->addr1, &cmdp->addr2, cmdp->iflags | E_C_LIST))
@@ -60,9 +55,7 @@ ex_list(sp, cmdp)
* PUBLIC: int ex_number __P((SCR *, EXCMD *));
*/
int
-ex_number(sp, cmdp)
- SCR *sp;
- EXCMD *cmdp;
+ex_number(SCR *sp, EXCMD *cmdp)
{
if (ex_print(sp, cmdp,
&cmdp->addr1, &cmdp->addr2, cmdp->iflags | E_C_HASH))
@@ -80,9 +73,7 @@ ex_number(sp, cmdp)
* PUBLIC: int ex_pr __P((SCR *, EXCMD *));
*/
int
-ex_pr(sp, cmdp)
- SCR *sp;
- EXCMD *cmdp;
+ex_pr(SCR *sp, EXCMD *cmdp)
{
if (ex_print(sp, cmdp, &cmdp->addr1, &cmdp->addr2, cmdp->iflags))
return (1);
@@ -98,16 +89,13 @@ ex_pr(sp, cmdp)
* PUBLIC: int ex_print __P((SCR *, EXCMD *, MARK *, MARK *, u_int32_t));
*/
int
-ex_print(sp, cmdp, fp, tp, flags)
- SCR *sp;
- EXCMD *cmdp;
- MARK *fp, *tp;
- u_int32_t flags;
+ex_print(SCR *sp, EXCMD *cmdp, MARK *fp, MARK *tp, u_int32_t flags)
{
GS *gp;
recno_t from, to;
size_t col, len;
- char *p, buf[10];
+ CHAR_T *p;
+ CHAR_T buf[10];
NEEDFILE(sp, cmdp);
@@ -122,11 +110,10 @@ ex_print(sp, cmdp, fp, tp, flags)
*/
if (LF_ISSET(E_C_HASH)) {
if (from <= 999999) {
- snprintf(buf, sizeof(buf), "%6lu ",
- (u_long)from);
+ SPRINTF(buf, SIZE(buf), L("%6u "), from);
p = buf;
} else
- p = "TOOBIG ";
+ p = L("TOOBIG ");
if (ex_prchars(sp, p, &col, 8, 0, 0))
return (1);
}
@@ -154,19 +141,15 @@ ex_print(sp, cmdp, fp, tp, flags)
* ex_ldisplay --
* Display a line without any preceding number.
*
- * PUBLIC: int ex_ldisplay __P((SCR *, const char *, size_t, size_t, u_int));
+ * PUBLIC: int ex_ldisplay __P((SCR *, const CHAR_T *, size_t, size_t, u_int));
*/
int
-ex_ldisplay(sp, p, len, col, flags)
- SCR *sp;
- const char *p;
- size_t len, col;
- u_int flags;
+ex_ldisplay(SCR *sp, const CHAR_T *p, size_t len, size_t col, u_int flags)
{
if (len > 0 && ex_prchars(sp, p, &col, len, LF_ISSET(E_C_LIST), 0))
return (1);
if (!INTERRUPTED(sp) && LF_ISSET(E_C_LIST)) {
- p = "$";
+ p = L("$");
if (ex_prchars(sp, p, &col, 1, LF_ISSET(E_C_LIST), 0))
return (1);
}
@@ -182,21 +165,19 @@ ex_ldisplay(sp, p, len, col, flags)
* PUBLIC: int ex_scprint __P((SCR *, MARK *, MARK *));
*/
int
-ex_scprint(sp, fp, tp)
- SCR *sp;
- MARK *fp, *tp;
+ex_scprint(SCR *sp, MARK *fp, MARK *tp)
{
- const char *p;
+ CHAR_T *p;
size_t col, len;
col = 0;
if (O_ISSET(sp, O_NUMBER)) {
- p = " ";
+ p = L(" ");
if (ex_prchars(sp, p, &col, 8, 0, 0))
return (1);
}
- if (db_get(sp, fp->lno, DBG_FATAL, (char **)&p, &len))
+ if (db_get(sp, fp->lno, DBG_FATAL, &p, &len))
return (1);
if (ex_prchars(sp, p, &col, fp->cno, 0, ' '))
@@ -207,7 +188,7 @@ ex_scprint(sp, fp, tp)
return (1);
if (INTERRUPTED(sp))
return (1);
- p = "[ynq]"; /* XXX: should be msg_cat. */
+ p = L("[ynq]"); /* XXX: should be msg_cat. */
if (ex_prchars(sp, p, &col, 5, 0, 0))
return (1);
(void)ex_fflush(sp);
@@ -219,14 +200,11 @@ ex_scprint(sp, fp, tp)
* Local routine to dump characters to the screen.
*/
static int
-ex_prchars(sp, p, colp, len, flags, repeatc)
- SCR *sp;
- const char *p;
- size_t *colp, len;
- u_int flags;
- int repeatc;
+ex_prchars(SCR *sp, const CHAR_T *p, size_t *colp, size_t len,
+ u_int flags, int repeatc)
{
- CHAR_T ch, *kp;
+ CHAR_T ch;
+ char *kp;
GS *gp;
size_t col, tlen, ts;
@@ -272,14 +250,10 @@ intr: *colp = col;
* PUBLIC: int ex_printf __P((SCR *, const char *, ...));
*/
int
-#ifdef __STDC__
-ex_printf(SCR *sp, const char *fmt, ...)
-#else
-ex_printf(sp, fmt, va_alist)
- SCR *sp;
- const char *fmt;
- va_dcl
-#endif
+ex_printf(
+ SCR *sp,
+ const char *fmt,
+ ...)
{
EX_PRIVATE *exp;
va_list ap;
@@ -287,11 +261,7 @@ ex_printf(sp, fmt, va_alist)
exp = EXP(sp);
-#ifdef __STDC__
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
exp->obp_len += n = vsnprintf(exp->obp + exp->obp_len,
sizeof(exp->obp) - exp->obp_len, fmt, ap);
va_end(ap);
@@ -310,9 +280,7 @@ ex_printf(sp, fmt, va_alist)
* PUBLIC: int ex_puts __P((SCR *, const char *));
*/
int
-ex_puts(sp, str)
- SCR *sp;
- const char *str;
+ex_puts(SCR *sp, const char *str)
{
EX_PRIVATE *exp;
int doflush, n;
@@ -338,8 +306,7 @@ ex_puts(sp, str)
* PUBLIC: int ex_fflush __P((SCR *sp));
*/
int
-ex_fflush(sp)
- SCR *sp;
+ex_fflush(SCR *sp)
{
EX_PRIVATE *exp;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-03 03:52:55 +0000