X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0509728c8a506f287fa3483d8e8ffaf8fb66d41d..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/mhbuild.c diff --git a/uip/mhbuild.c b/uip/mhbuild.c index b39cc809..3b17f356 100644 --- a/uip/mhbuild.c +++ b/uip/mhbuild.c @@ -14,8 +14,8 @@ #include #include #include -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #include "mhfree.h" #include "mhoutsbr.h" @@ -117,8 +117,7 @@ main (int argc, char **argv) if (cp[0] == '-' && cp[1] == '\0') { if (compfile) adios (NULL, "cannot specify both standard input and a file"); - else - compfile = cp; + compfile = cp; listsw = 0; /* turn off -list if using standard in/out */ verbosw = 0; /* turn off -verbose listings */ break; @@ -282,8 +281,7 @@ main (int argc, char **argv) } if (compfile) adios (NULL, "only one composition file allowed"); - else - compfile = cp; + compfile = cp; } /* @@ -291,7 +289,7 @@ main (int argc, char **argv) */ if ((cp = getenv ("MHBUILD"))) { if ((fp = fopen (cp, "r"))) { - readconfig ((struct node **) 0, fp, cp, 0); + readconfig(NULL, fp, cp, 0); fclose (fp); } else { admonish ("", "unable to read $MHBUILD profile (%s)", cp); @@ -302,7 +300,7 @@ main (int argc, char **argv) * Read the standard profile setup */ if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) { - readconfig ((struct node **) 0, fp, cp, 0); + readconfig(NULL, fp, cp, 0); fclose (fp); }