Created function open_form() to open form file or fallback to default

components file, with error handling. Replaced duplicated code with call
to this function.

diff --git a/h/utils.h b/h/utils.h
index 3eda9d3fbf7b9aab29c466a08297401beae0b18d..92fdabac40dbb534a43ada73145c25561ee11108 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -18,3 +18,4 @@ struct msgs_array {
 };
 
 void app_msgarg(struct msgs_array *, char *);
+int open_form(char **, char *);

diff --git a/sbr/utils.c b/sbr/utils.c
index 8aba5b6ad63036e45e6cfbc0bd69e47fe2c937eb..64df443b22455688012af8890d7190d104783515 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -12,6 +12,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <stdlib.h>
+#include <fcntl.h>
 #include <errno.h>
 
 /*
@@ -184,3 +185,19 @@ app_msgarg(struct msgs_array *msgs, char *cp)
                msgs->msgs = mh_xrealloc(msgs->msgs, (msgs->max+=MAXMSGS)*sizeof(*msgs->msgs));
        msgs->msgs[msgs->size++] = cp;
 }
+
+/* Open a form or components file */
+int
+open_form(char **form, char *def)
+{
+       int in;
+       if (*form) {
+               if ((in = open (etcpath (*form), O_RDONLY)) == NOTOK)
+                       adios (*form, "unable to open form file");
+       } else {
+               if ((in = open (etcpath (def), O_RDONLY)) == NOTOK)
+                       adios (def, "unable to open default components file");
+               *form = def;
+       }
+       return in;
+}

diff --git a/uip/comp.c b/uip/comp.c
index 1aca23a7855508254ffa57265b2ffa78cb7d28e7..8fced484def5a5be30089c3d19a2ecd1fcd8ef09 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -10,6 +10,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <fcntl.h>
 
 static struct swit switches[] = {
@@ -227,19 +228,8 @@ main (int argc, char **argv)
 
        if ((in = open (form = getcpy (m_name (mp->lowsel)), O_RDONLY)) == NOTOK)
            adios (form, "unable to open message");
-    } else {
-       /*
-        * Open a component or forms file
-        */
-       if (form) {
-           if ((in = open (etcpath (form), O_RDONLY)) == NOTOK)
-               adios (form, "unable to open form file");
-       } else {
-           if ((in = open (etcpath (components), O_RDONLY)) == NOTOK)
-               adios (components, "unable to open default components file");
-           form = components;
-       }
-    }
+    } else
+       in = open_form(&form, components);
 
 try_it_again:
     strncpy (drft, m_draft (dfolder, file, use, &isdf), sizeof(drft));

diff --git a/uip/dist.c b/uip/dist.c
index 4b6ce6979b525dd9f79437e7148d5cf2ba33f310..70e515eb611d31aa7e27240cca6fa8ec4cb98c85 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -10,6 +10,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <fcntl.h>
 
 static struct swit switches[] = {
@@ -195,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));

diff --git a/uip/forw.c b/uip/forw.c
index 319cc3980be6d24e9b43558884b3902aaeec46c6..93870b1af0c5c91e9cf1bc9738adb7536de5ccf4 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -393,16 +393,8 @@ try_it_again:
        if (!form)
            form = digestcomps;
        in = build_form (form, digest, volume, issue);
-    } else {
-       if (form) {
-           if ((in = open (etcpath (form), O_RDONLY)) == NOTOK)
-               adios (form, "unable to open form file");
-       } else {
-           if ((in = open (etcpath (forwcomps), O_RDONLY)) == NOTOK)
-               adios (forwcomps, "unable to open default components file");
-           form = forwcomps;
-       }
-    }
+    } else
+       in = open_form(&form, forwcomps);
 
     if ((out = creat (drft, m_gmprot ())) == NOTOK)
        adios (drft, "unable to create");