projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged mhlsbr.c into mhl.c.
[mmh]
/
uip
/
ap.c
diff --git
a/uip/ap.c
b/uip/ap.c
index
ad3c998
..
b49cdc2
100644
(file)
--- a/
uip/ap.c
+++ b/
uip/ap.c
@@
-9,29
+9,26
@@
#include <h/mh.h>
#include <h/addrsbr.h>
#include <h/fmt_scan.h>
#include <h/mh.h>
#include <h/addrsbr.h>
#include <h/fmt_scan.h>
-#include <h/mts.h>
#define NADDRS 100
#define WIDTH 78
#define WBUFSIZ BUFSIZ
#define NADDRS 100
#define WIDTH 78
#define WBUFSIZ BUFSIZ
-#define FORMAT "%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
+#define FORMAT "=%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
static struct swit switches[] = {
#define FORMSW 0
{ "form formatfile", 0 },
static struct swit switches[] = {
#define FORMSW 0
{ "form formatfile", 0 },
-#define FMTSW 1
- { "format string", 5 },
-#define NORMSW 2
+#define NORMSW 1
{ "normalize", 0 },
{ "normalize", 0 },
-#define NNORMSW 3
+#define NNORMSW 2
{ "nonormalize", 0 },
{ "nonormalize", 0 },
-#define WIDTHSW 4
+#define WIDTHSW 3
{ "width columns", 0 },
{ "width columns", 0 },
-#define VERSIONSW 5
+#define VERSIONSW 4
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 6
+#define HELPSW 5
{ "help", 0 },
{ NULL, 0 }
};
{ "help", 0 },
{ NULL, 0 }
};
@@
-56,7
+53,7
@@
main(int argc, char **argv)
{
int addrp = 0, normalize = AD_HOST;
int width = 0, status = 0;
{
int addrp = 0, normalize = AD_HOST;
int width = 0, status = 0;
- char *cp, *form = NULL, *format = NULL, *nfs;
+ char *cp, *form = NULL, *nfs;
char buf[BUFSIZ], **argp;
char **arguments, *addrs[NADDRS];
char buf[BUFSIZ], **argp;
char **arguments, *addrs[NADDRS];
@@
-68,7
+65,6
@@
main(int argc, char **argv)
/* read user profile/context */
context_read();
/* read user profile/context */
context_read();
- mts_init(invo_name);
arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
@@
-93,12
+89,6
@@
main(int argc, char **argv)
case FORMSW:
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s", argp[-2]);
case FORMSW:
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s", argp[-2]);
- format = NULL;
- continue;
- case FMTSW:
- if (!(format = *argp++) || *format == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- form = NULL;
continue;
case WIDTHSW:
continue;
case WIDTHSW:
@@
-126,7
+116,7
@@
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, FORMAT);
+ nfs = new_fs(form, FORMAT);
if (width == 0) {
if ((width = sc_width()) < WIDTH / 2)
if (width == 0) {
if ((width = sc_width()) < WIDTH / 2)