projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the configuration option NOPUBLICSEQ.
[mmh]
/
uip
/
mhparam.c
diff --git
a/uip/mhparam.c
b/uip/mhparam.c
index
f92a3ec
..
dc122ad
100644
(file)
--- a/
uip/mhparam.c
+++ b/
uip/mhparam.c
@@
-12,7
+12,6
@@
#include <h/mh.h>
extern char *mhlibdir;
#include <h/mh.h>
extern char *mhlibdir;
-extern char *mhetcdir;
static struct swit switches[] = {
#define COMPSW 0
static struct swit switches[] = {
#define COMPSW 0
@@
-84,31
+83,30
@@
main(int argc, char **argv)
char *cp, buf[BUFSIZ], **argp;
char **arguments, *comps[MAXARGS];
char *cp, buf[BUFSIZ], **argp;
char **arguments, *comps[MAXARGS];
- invo_name = r1bindex (argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
/* read user profile/context */
context_read();
- arguments = getarguments (invo_name, argc, argv, 1);
+ arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
while ((cp = *argp++)) {
if (*cp == '-') {
argp = arguments;
while ((cp = *argp++)) {
if (*cp == '-') {
- switch (smatch (++cp, switches)) {
+ switch (smatch(++cp, switches)) {
case AMBIGSW:
case AMBIGSW:
- ambigsw (cp, switches);
- done (1);
+ ambigsw(cp, switches);
+ done(1);
case UNKWNSW:
case UNKWNSW:
- adios (NULL, "-%s unknown", cp);
+ adios(NULL, "-%s unknown", cp);
case HELPSW:
case HELPSW:
- snprintf (buf, sizeof(buf), "%s [profile-components] [switches]",
- invo_name);
- print_help (buf, switches, 1);
- done (1);
+ snprintf(buf, sizeof(buf), "%s [profile-components] [switches]", invo_name);
+ print_help(buf, switches, 1);
+ done(1);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done(1);
case COMPSW:
components = 1;
case COMPSW:
components = 1;
@@
-138,7
+136,7
@@
main(int argc, char **argv)
if (components >= 0)
advise(NULL, "-%scomponents ignored with -all",
if (components >= 0)
advise(NULL, "-%scomponents ignored with -all",
- components ? "" : "no");
+ components ? "" : "no");
/* print all entries in context/profile list */
for (np = m_defs; np; np = np->n_next)
/* print all entries in context/profile list */
for (np = m_defs; np; np = np->n_next)
@@
-153,7
+151,7
@@
main(int argc, char **argv)
** value (as determined after context is read).
*/
for (ps = procs; ps->p_name; ps++)
** value (as determined after context is read).
*/
for (ps = procs; ps->p_name; ps++)
- printf ("%s: %s\n", ps->p_name,
+ printf("%s: %s\n", ps->p_name,
*ps->p_field ? *ps->p_field : "");
} else {
*ps->p_field ? *ps->p_field : "");
} else {
@@
-163,9
+161,9
@@
main(int argc, char **argv)
for (i = 0; i < compp; i++) {
register char *value;
for (i = 0; i < compp; i++) {
register char *value;
- value = context_find (comps[i]);
+ value = context_find(comps[i]);
if (!value)
if (!value)
- value = p_find (comps[i]);
+ value = p_find(comps[i]);
if (value) {
if (components)
printf("%s: ", comps[i]);
if (value) {
if (components)
printf("%s: ", comps[i]);
@@
-176,7
+174,7
@@
main(int argc, char **argv)
}
}
}
}
- done (missed);
+ done(missed);
return 1;
}
return 1;
}
@@
-187,7
+185,7
@@
p_find(char *str)
struct proc *ps;
for (ps = procs; ps->p_name; ps++)
struct proc *ps;
for (ps = procs; ps->p_name; ps++)
- if (!mh_strcasecmp (ps->p_name, str))
+ if (!mh_strcasecmp(ps->p_name, str))
return (*ps->p_field);
return NULL;
return (*ps->p_field);
return NULL;