#define NADDRS 100
-#define WIDTH 78
-#define WBUFSIZ BUFSIZ
-
#define FORMAT "=%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
static struct swit switches[] = {
{ "normalize", 0 },
#define NNORMSW 2
{ "nonormalize", 0 },
-#define WIDTHSW 3
- { "width columns", 0 },
-#define VERSIONSW 4
+#define VERSIONSW 3
{ "version", 0 },
-#define HELPSW 5
+#define HELPSW 4
{ "help", 0 },
{ NULL, 0 }
};
static int dat[5];
/*
-** prototypes
-*/
-int sc_width(void); /* from termsbr.c */
-
-/*
** static prototypes
*/
-static int process(char *, int, int);
+static int process(char *, int);
int
main(int argc, char **argv)
{
int addrp = 0, normalize = AD_HOST;
- int width = 0, status = 0;
- char *cp, *form = NULL, *nfs;
+ int status = 0;
+ char *cp, *form = NULL, *fmtstr;
char buf[BUFSIZ], **argp;
char **arguments, *addrs[NADDRS];
adios(NULL, "missing argument to %s", argp[-2]);
continue;
- case WIDTHSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- width = atoi(cp);
- continue;
-
case NORMSW:
normalize = AD_HOST;
continue;
adios(NULL, "usage: %s [switches] addrs ...", invo_name);
/* get new format string */
- nfs = new_fs(form, FORMAT);
+ fmtstr = new_fs(form, FORMAT);
- if (width == 0) {
- if ((width = sc_width()) < WIDTH / 2)
- width = WIDTH / 2;
- width -= 2;
- }
- if (width > WBUFSIZ)
- width = WBUFSIZ;
fmt_norm = normalize;
- fmt_compile(nfs, &fmt);
+ fmt_compile(fmtstr, &fmt);
dat[0] = 0;
dat[1] = 0;
dat[2] = 0;
- dat[3] = width;
+ dat[3] = BUFSIZ;
dat[4] = 0;
for (addrp = 0; addrs[addrp]; addrp++)
- status += process(addrs[addrp], width, normalize);
+ status += process(addrs[addrp], normalize);
done(status);
return 1;
static int
-process(char *arg, int length, int norm)
+process(char *arg, int norm)
{
int status = 0;
register char *cp;
- char buffer[WBUFSIZ + 1], error[BUFSIZ];
+ char buffer[BUFSIZ + 1], error[BUFSIZ];
register struct comp *cptr;
register struct pqpair *p, *q;
struct pqpair pq;
if (cptr)
cptr->c_text = p->pq_error;
- fmt_scan(fmt, buffer, length, dat);
+ fmt_scan(fmt, buffer, BUFSIZ, dat);
fputs(buffer, stdout);
free(p->pq_text);