X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fdist.c;h=70e515eb611d31aa7e27240cca6fa8ec4cb98c85;hb=43d85eaa38c25385082958d831fc926c5e619eac;hp=58ca45e5f1f7f408c4b69d07420e177f6340a925;hpb=017a82124bf2ea39ced5aa4c8f969c18b3c2fb90;p=mmh diff --git a/uip/dist.c b/uip/dist.c index 58ca45e..70e515e 100644 --- a/uip/dist.c +++ b/uip/dist.c @@ -3,9 +3,14 @@ * dist.c -- re-distribute a message * * $Id$ + * + * This code is Copyright (c) 2002, by the authors of nmh. See the + * COPYRIGHT file in the root directory of the nmh distribution for + * complete copyright information. */ #include +#include #include static struct swit switches[] = { @@ -191,14 +196,7 @@ main (int argc, char **argv) if (file && (msg || folder)) adios (NULL, "can't mix files and folders/msgs"); - if (form) { - if ((in = open (etcpath (form), O_RDONLY)) == NOTOK) - adios (form, "unable to open form file"); - } else { - if ((in = open (etcpath (distcomps), O_RDONLY)) == NOTOK) - adios (distcomps, "unable to open default components file"); - form = distcomps; - } + in = open_form(&form, distcomps); try_it_again: strncpy (drft, m_draft (dfolder, dmsg, NOUSE, &isdf), sizeof(drft));