projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pick: Clarified the man page with respect to -ddd.
[mmh]
/
uip
/
ap.c
diff --git
a/uip/ap.c
b/uip/ap.c
index
b49cdc2
..
c293a53
100644
(file)
--- a/
uip/ap.c
+++ b/
uip/ap.c
@@
-12,9
+12,6
@@
#define NADDRS 100
#define NADDRS 100
-#define WIDTH 78
-#define WBUFSIZ BUFSIZ
-
#define FORMAT "=%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
static struct swit switches[] = {
#define FORMAT "=%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
static struct swit switches[] = {
@@
-23,12
+20,10
@@
static struct swit switches[] = {
#define NORMSW 1
{ "normalize", 0 },
#define NNORMSW 2
#define NORMSW 1
{ "normalize", 0 },
#define NNORMSW 2
- { "nonormalize", 0 },
-#define WIDTHSW 3
- { "width columns", 0 },
-#define VERSIONSW 4
- { "version", 0 },
-#define HELPSW 5
+ { "nonormalize", 2 },
+#define VERSIONSW 3
+ { "Version", 0 },
+#define HELPSW 4
{ "help", 0 },
{ NULL, 0 }
};
{ "help", 0 },
{ NULL, 0 }
};
@@
-38,28
+33,21
@@
static struct format *fmt;
static int dat[5];
/*
static int dat[5];
/*
-** prototypes
-*/
-int sc_width(void); /* from termsbr.c */
-
-/*
** static prototypes
*/
** 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
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];
char buf[BUFSIZ], **argp;
char **arguments, *addrs[NADDRS];
-#ifdef LOCALE
setlocale(LC_ALL, "");
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
invo_name = mhbasename(argv[0]);
/* read user profile/context */
@@
-91,12
+79,6
@@
main(int argc, char **argv)
adios(NULL, "missing argument to %s", argp[-2]);
continue;
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;
case NORMSW:
normalize = AD_HOST;
continue;
@@
-116,26
+98,19
@@
main(int argc, char **argv)
adios(NULL, "usage: %s [switches] addrs ...", invo_name);
/* get new format string */
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_norm = normalize;
- fmt_compile(nfs, &fmt);
+ fmt_compile(fmtstr, &fmt);
dat[0] = 0;
dat[1] = 0;
dat[2] = 0;
dat[0] = 0;
dat[1] = 0;
dat[2] = 0;
- dat[3] = width;
+ dat[3] = BUFSIZ;
dat[4] = 0;
for (addrp = 0; addrs[addrp]; addrp++)
dat[4] = 0;
for (addrp = 0; addrs[addrp]; addrp++)
- status += process(addrs[addrp], width, normalize);
+ status += process(addrs[addrp], normalize);
done(status);
return 1;
done(status);
return 1;
@@
-149,11
+124,11
@@
struct pqpair {
static int
static int
-process(char *arg, int length, int norm)
+process(char *arg, int norm)
{
int status = 0;
register char *cp;
{
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;
register struct comp *cptr;
register struct pqpair *p, *q;
struct pqpair pq;
@@
-183,7
+158,7
@@
process(char *arg, int length, int norm)
if (cptr)
cptr->c_text = p->pq_error;
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);
fputs(buffer, stdout);
free(p->pq_text);