aboutsummaryrefslogtreecommitdiffstats
path: root/ptx/ptx.c
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2016-10-23 00:24:25 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2016-10-23 00:24:25 +0000
commitab1717bb35d85041e0184f79daa1313a1306dc01 (patch)
treefa0739f76b49b902269f8f7c1e1c7c5ea30c0556 /ptx/ptx.c
parentaa7798c94fa57f6c00fab4393c9fe91334864371 (diff)
downloadsrc-ab1717bb35d85041e0184f79daa1313a1306dc01.tar.gz
src-ab1717bb35d85041e0184f79daa1313a1306dc01.zip
Import heirloom doctools snapshot 20161016vendor/heirloom-doctools/20161016
Notes
Notes: svn path=/vendor/heirloom-doctools/dist/; revision=307809 svn path=/vendor/heirloom-doctools/20161016/; revision=307810; tag=vendor/heirloom-doctools/20161016
Diffstat (limited to 'ptx/ptx.c')
-rw-r--r--ptx/ptx.c31
1 files changed, 11 insertions, 20 deletions
diff --git a/ptx/ptx.c b/ptx/ptx.c
index 1a07f3d5179c..26f1c13f73ca 100644
--- a/ptx/ptx.c
+++ b/ptx/ptx.c
@@ -76,6 +76,8 @@ static const char sccsid[] USED = "@(#)/usr/ucb/ptx.sl 1.5 (gritter) 11/6/05";
#include <unistd.h>
#include <locale.h>
#include <limits.h>
+#include "global.h"
+
#define DEFLTX LIBDIR "/eign"
#define TILDE 0177
#define SORT "sort"
@@ -87,17 +89,6 @@ static const char sccsid[] USED = "@(#)/usr/ucb/ptx.sl 1.5 (gritter) 11/6/05";
#define isabreak(c) (btable[c])
-#ifdef __GLIBC__
-#ifdef _IO_getc_unlocked
-#undef getc
-#define getc(f) _IO_getc_unlocked(f)
-#endif
-#ifdef _IO_putc_unlocked
-#undef putc
-#define putc(c, f) _IO_putc_unlocked(c, f)
-#endif
-#endif
-
#define getline xxgetline
static int status;
@@ -125,7 +116,7 @@ static int wlen;
static int rflag;
static int halflen;
static wchar_t *strtbufp, *endbufp;
-static char *empty = "";
+static const char *empty = "";
static char *infile;
static FILE *inptr /*= stdin*/;
@@ -149,8 +140,8 @@ static void cmpline(const wchar_t *);
static int cmpword(const wchar_t *, const wchar_t *, const wchar_t *);
static void putline(const wchar_t *, const wchar_t *);
static void getsort(void);
-static wchar_t *rtrim(const wchar_t *, const wchar_t *, int);
-static wchar_t *ltrim(const wchar_t *, const wchar_t *, int);
+static const wchar_t *rtrim(const wchar_t *, const wchar_t *, int);
+static const wchar_t *ltrim(const wchar_t *, const wchar_t *, int);
static void putout(const wchar_t *, const wchar_t *);
static void onintr(int);
static int hash(const wchar_t *, const wchar_t *);
@@ -236,7 +227,7 @@ main(int argc,char **argv)
int pid;
wchar_t *pend;
- char *xfile;
+ const char *xfile;
FILE *xptr;
setlocale(LC_CTYPE, "");
@@ -543,7 +534,7 @@ getsort(void)
{
register int c;
register wchar_t *tilde = NULL, *linep, *ref;
- wchar_t *p1a,*p1b,*p2a,*p2b,*p3a,*p3b,*p4a,*p4b;
+ const wchar_t *p1a,*p1b,*p2a,*p2b,*p3a,*p3b,*p4a,*p4b;
int w;
if((sortptr = fopen(sortfile,"r")) == NULL)
@@ -618,7 +609,7 @@ getsort(void)
}
}
-static wchar_t *
+static const wchar_t *
rtrim(const wchar_t *a,const wchar_t *c,int d)
{
const wchar_t *b,*x;
@@ -628,10 +619,10 @@ rtrim(const wchar_t *a,const wchar_t *c,int d)
b = x;
if(b<c&&!iswspace(b[0]))
b++;
- return((wchar_t *)b);
+ return(b);
}
-static wchar_t *
+static const wchar_t *
ltrim(const wchar_t *c,const wchar_t *b,int d)
{
const wchar_t *a,*x;
@@ -641,7 +632,7 @@ ltrim(const wchar_t *c,const wchar_t *b,int d)
a = x;
if(a>c&&!iswspace(a[-1]))
a--;
- return((wchar_t *)a);
+ return(a);
}
static void